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

Merge updates from master into gsd/develop #234

Merged
merged 3 commits into from
Apr 4, 2019
Merged

Merge updates from master into gsd/develop #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c079554
Update GitHub CCPP branches with Vlab master 20190329 (#229)
climbfuji Apr 1, 2019
e81555d
CMakeLists.txt: extend SIMD multi-architecture flags with CORE-AVX512…
climbfuji Apr 3, 2019
3319f40
Merge pull request #232 from climbfuji/cheyenne_jet_updates_20190402
climbfuji Apr 4, 2019
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
string(REPLACE "-xCORE-AVX2" "-xCORE-AVX-I"
CMAKE_Fortran_FLAGS_LOPT1
"${CMAKE_Fortran_FLAGS_LOPT1}")
string(REPLACE "-axSSE4.2,AVX,CORE-AVX2" "-axSSE4.2,AVX,CORE-AVX-I"
string(REPLACE "-axSSE4.2,AVX,CORE-AVX2,CORE-AVX512" "-axSSE4.2,AVX,CORE-AVX-I"
CMAKE_Fortran_FLAGS_LOPT1
"${CMAKE_Fortran_FLAGS_LOPT1}")
SET_SOURCE_FILES_PROPERTIES(./physics/radiation_aerosols.f
Expand Down
30 changes: 15 additions & 15 deletions physics/GFS_DCNV_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,31 +250,31 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, lgocart, ras, cs
do k=1,levs
do i=1,im
dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k)-save_t(i,k)) * frain
dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k)-save_qv(i,k)) * frain
! dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k)-save_qv(i,k)) * frain
du3dt(i,k) = du3dt(i,k) + (gu0(i,k)-save_u(i,k)) * frain
dv3dt(i,k) = dv3dt(i,k) + (gv0(i,k)-save_v(i,k)) * frain

upd_mf(i,k) = upd_mf(i,k) + ud_mf(i,k) * (con_g*frain)
dwn_mf(i,k) = dwn_mf(i,k) + dd_mf(i,k) * (con_g*frain)
det_mf(i,k) = det_mf(i,k) + dt_mf(i,k) * (con_g*frain)
! upd_mf(i,k) = upd_mf(i,k) + ud_mf(i,k) * (con_g*frain)
! dwn_mf(i,k) = dwn_mf(i,k) + dd_mf(i,k) * (con_g*frain)
! det_mf(i,k) = det_mf(i,k) + dt_mf(i,k) * (con_g*frain)
enddo
enddo
endif ! if (ldiag3d)

endif ! if (lssav)

!update dqdt_v to include moisture tendency due to deep convection
if (lgocart) then
do k=1,levs
do i=1,im
dqdti (i,k) = (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
upd_mfi(i,k) = upd_mfi(i,k) + ud_mf(i,k) * frain
dwn_mfi(i,k) = dwn_mfi(i,k) + dd_mf(i,k) * frain
det_mfi(i,k) = det_mfi(i,k) + dt_mf(i,k) * frain
cnvqci (i,k) = cnvqci (i,k) + (clw_ice(i,k)+clw_liquid(i,k))*frain
enddo
enddo
endif ! if (lgocart)
! if (lgocart) then
! do k=1,levs
! do i=1,im
! dqdti (i,k) = (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
! upd_mfi(i,k) = upd_mfi(i,k) + ud_mf(i,k) * frain
! dwn_mfi(i,k) = dwn_mfi(i,k) + dd_mf(i,k) * frain
! det_mfi(i,k) = det_mfi(i,k) + dt_mf(i,k) * frain
! cnvqci (i,k) = cnvqci (i,k) + (clw_ice(i,k)+clw_liquid(i,k))*frain
! enddo
! enddo
! endif ! if (lgocart)

if (isppt_deep) then
tconvtend = gt0 - save_t
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_MP_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, nt
do k=1,levs
do i=1,im
dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k)-save_t(i,k)) * frain
dq3dt(i,k) = dq3dt(i,k) + (gq0(i,k,1)-save_qv(i,k)) * frain
! dq3dt(i,k) = dq3dt(i,k) + (gq0(i,k,1)-save_qv(i,k)) * frain
enddo
enddo
endif
Expand Down
26 changes: 13 additions & 13 deletions physics/GFS_PBL_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,19 +399,19 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
! enddo
! enddo
! endif
do k=1,levs
do i=1,im
tem = dqdt(i,k,ntqv) * dtf
dq3dt(i,k) = dq3dt(i,k) + tem
enddo
enddo
if (ntoz > 0) then
do k=1,levs
do i=1,im
dq3dt_ozone(i,k) = dq3dt_ozone(i,k) + dqdt(i,k,ntoz) * dtf
enddo
enddo
endif
! do k=1,levs
! do i=1,im
! tem = dqdt(i,k,ntqv) * dtf
! dq3dt(i,k) = dq3dt(i,k) + tem
! enddo
! enddo
! if (ntoz > 0) then
! do k=1,levs
! do i=1,im
! dq3dt_ozone(i,k) = dq3dt_ozone(i,k) + dqdt(i,k,ntoz) * dtf
! enddo
! enddo
! endif
endif

endif ! end if_lssav
Expand Down
16 changes: 8 additions & 8 deletions physics/GFS_SCNV_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ subroutine GFS_SCNV_generic_pre_run (im, levs, ldiag3d, lgocart, gt0, gq0_water_
enddo
enddo
endif
if (ldiag3d .or. lgocart) then
do k=1,levs
do i=1,im
save_qv(i,k) = gq0_water_vapor(i,k)
enddo
enddo
endif
! if (ldiag3d .or. lgocart) then
! do k=1,levs
! do i=1,im
! save_qv(i,k) = gq0_water_vapor(i,k)
! enddo
! enddo
! endif

end subroutine GFS_SCNV_generic_pre_run

Expand Down Expand Up @@ -139,7 +139,7 @@ subroutine GFS_SCNV_generic_post_run (im, levs, nn, lssav, ldiag3d, lgocart, fra
do k=1,levs
do i=1,im
dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k) - save_t(i,k)) * frain
dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
! dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
enddo
enddo
endif
Expand Down
Loading