Skip to content

Commit

Permalink
Merge pull request #2 from NOAA-GSD/gsd/develop
Browse files Browse the repository at this point in the history 
updating fork
  • Loading branch information
@joeolson42
joeolson42 authored Apr 17, 2020
2 parents 762f7f4 + fadc3cd commit 344c852
Show file tree
Hide file tree
Showing 20 changed files with 1,658 additions and 671 deletions.
8 changes: 5 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,17 @@ elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
${CMAKE_CURRENT_SOURCE_DIR}/physics/cu_gf_sh.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_bl_mynn.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNPBL_wrapper.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNSFC_wrapper.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNrad_pre.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNrad_post.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_mp_thompson_make_number_concentrations.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_SF_JSFC.F90
${CMAKE_CURRENT_SOURCE_DIR}/physics/module_BL_MYJPBL.F90
PROPERTIES COMPILE_FLAGS "-r8 -ftz")

# Reduce optimization for module_sf_mynn.F90 (to avoid an apparent compiler bug with Intel 18 on Hera)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90
PROPERTIES COMPILE_FLAGS "${CMAKE_Fortran_FLAGS_OPT} -O1")
list(APPEND SCHEMES_SFX_OPT ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90)

# Replace -xHost or -xCORE-AVX2 with -xCORE-AVX-I for certain files
set(CMAKE_Fortran_FLAGS_LOPT1 ${CMAKE_Fortran_FLAGS_OPT})
string(REPLACE "-xHOST" "-xCORE-AVX-I"
Expand Down
36 changes: 22 additions & 14 deletions physics/GFS_PBL_generic.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,13 @@ subroutine GFS_PBL_generic_pre_run (im, levs, nvdiff, ntrac,
vdftra(i,k,3) = qgrs(i,k,ntiw)
vdftra(i,k,4) = qgrs(i,k,ntrw)
vdftra(i,k,5) = qgrs(i,k,ntsw)
vdftra(i,k,6) = qgrs(i,k,ntlnc)
vdftra(i,k,7) = qgrs(i,k,ntinc)
vdftra(i,k,8) = qgrs(i,k,ntoz)
vdftra(i,k,9) = qgrs(i,k,ntwa)
vdftra(i,k,10) = qgrs(i,k,ntia)
vdftra(i,k,6) = qgrs(i,k,ntgl)
vdftra(i,k,7) = qgrs(i,k,ntlnc)
vdftra(i,k,8) = qgrs(i,k,ntinc)
vdftra(i,k,9) = qgrs(i,k,ntrnc)
vdftra(i,k,10) = qgrs(i,k,ntoz)
vdftra(i,k,11) = qgrs(i,k,ntwa)
vdftra(i,k,12) = qgrs(i,k,ntia)
enddo
enddo
else
Expand All @@ -165,8 +167,10 @@ subroutine GFS_PBL_generic_pre_run (im, levs, nvdiff, ntrac,
vdftra(i,k,3) = qgrs(i,k,ntiw)
vdftra(i,k,4) = qgrs(i,k,ntrw)
vdftra(i,k,5) = qgrs(i,k,ntsw)
vdftra(i,k,6) = qgrs(i,k,ntinc)
vdftra(i,k,7) = qgrs(i,k,ntoz)
vdftra(i,k,6) = qgrs(i,k,ntgl)
vdftra(i,k,7) = qgrs(i,k,ntinc)
vdftra(i,k,8) = qgrs(i,k,ntrnc)
vdftra(i,k,9) = qgrs(i,k,ntoz)
enddo
enddo
endif
Expand Down Expand Up @@ -404,11 +408,13 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
dqdt(i,k,ntiw) = dvdftra(i,k,3)
dqdt(i,k,ntrw) = dvdftra(i,k,4)
dqdt(i,k,ntsw) = dvdftra(i,k,5)
dqdt(i,k,ntlnc) = dvdftra(i,k,6)
dqdt(i,k,ntinc) = dvdftra(i,k,7)
dqdt(i,k,ntoz) = dvdftra(i,k,8)
dqdt(i,k,ntwa) = dvdftra(i,k,9)
dqdt(i,k,ntia) = dvdftra(i,k,10)
dqdt(i,k,ntgl) = dvdftra(i,k,6)
dqdt(i,k,ntlnc) = dvdftra(i,k,7)
dqdt(i,k,ntinc) = dvdftra(i,k,8)
dqdt(i,k,ntrnc) = dvdftra(i,k,9)
dqdt(i,k,ntoz) = dvdftra(i,k,10)
dqdt(i,k,ntwa) = dvdftra(i,k,11)
dqdt(i,k,ntia) = dvdftra(i,k,12)
enddo
enddo
else
Expand All @@ -419,8 +425,10 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
dqdt(i,k,ntiw) = dvdftra(i,k,3)
dqdt(i,k,ntrw) = dvdftra(i,k,4)
dqdt(i,k,ntsw) = dvdftra(i,k,5)
dqdt(i,k,ntinc) = dvdftra(i,k,6)
dqdt(i,k,ntoz) = dvdftra(i,k,7)
dqdt(i,k,ntgl) = dvdftra(i,k,6)
dqdt(i,k,ntinc) = dvdftra(i,k,7)
dqdt(i,k,ntrnc) = dvdftra(i,k,8)
dqdt(i,k,ntoz) = dvdftra(i,k,9)
enddo
enddo
endif
Expand Down
2 changes: 2 additions & 0 deletions physics/GFS_debug.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank,omprank, blkno, 'Diag%tdomzr ', Diag%tdomzr)
call print_var(mpirank,omprank, blkno, 'Diag%tdomip ', Diag%tdomip)
call print_var(mpirank,omprank, blkno, 'Diag%tdoms ', Diag%tdoms)
! CCPP/RUC only
if (Model%lsm == Model%lsm_ruc) then
call print_var(mpirank,omprank, blkno, 'Diag%wet1 ', Sfcprop%wetness)
else
Expand Down Expand Up @@ -345,6 +346,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
if(Model%lradar) then
call print_var(mpirank,omprank, blkno, 'Diag%refl_10cm ', Diag%refl_10cm)
end if
! CCPP/MYNNPBL only
if (Model%do_mynnedmf) then
call print_var(mpirank,omprank, blkno, 'Diag%edmf_a ', Diag%edmf_a)
call print_var(mpirank,omprank, blkno, 'Diag%edmf_w ', Diag%edmf_w)
Expand Down
Loading

0 comments on commit 344c852

Please sign in to comment.