Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from dev/emc 2020/03/12 #10

Merged
merged 7 commits into from
Mar 13, 2020
Merged

Update from dev/emc 2020/03/12 #10

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
792fe71
Merge pull request #1 from NOAA-EMC/dev/emc
pjpegion Oct 14, 2019
4e2e957
Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cube…
pjpegion Nov 8, 2019
c4cfedd
zero out dissipation estimate in halo region, needed for SAR
pjpegion Nov 8, 2019
b400a5c
fix of openmp directives for dissipation estimate
pjpegion Nov 8, 2019
feaf652
Merge pull request #2 from NOAA-EMC/dev/emc
pjpegion Mar 2, 2020
371a29a
Merge pull request #7 from noaa-psd/skeb_sar
junwang-noaa Mar 11, 2020
9bacf55
Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cube…
climbfuji Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions model/dyn_core.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,10 +364,10 @@ subroutine dyn_core(npx, npy, npz, ng, sphum, nq, bdt, n_split, zvir, cp, akap,
allocate( dv(isd:ied+1,jsd:jed, npz) )
call init_ijk_mem(isd,ied+1, jsd,jed , npz, dv, 0.)
endif
!$OMP parallel do default(none) shared(is,ie,js,je,npz,diss_est)
!$OMP parallel do default(none) shared(isd,ied,jsd,jed,npz,diss_est)
do k=1,npz
do j=js,je
do i=is,ie
do j=jsd,jed
do i=isd,ied
diss_est(i,j,k) = 0.
enddo
enddo
Expand Down