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

release/public-v2: update .gitmodules, fix linker problem in gfsphysics, update SDF for FV3_RRFS_v1beta #173

Merged
merged 10 commits into from
Oct 2, 2020
Merged

release/public-v2: update .gitmodules, fix linker problem in gfsphysics, update SDF for FV3_RRFS_v1beta #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e00f9ff
Fix linker problem in gfsphysics/CMakeLists.txt by removing physics/p…
climbfuji Aug 11, 2020
c7a3183
Update .gitmodules to point to public release branches of GFDL_atmos_…
climbfuji Sep 17, 2020
422dc16
Replace GSL drag suite with CIRES UGWP/GFS GWD in ccpp/suites/suite_F…
climbfuji Sep 23, 2020
1dae932
Update .gitmodules and submodule pointer for GFDL_atmos_cubed_sphere …
climbfuji Sep 24, 2020
de7b022
Revert change for GFDL_atmos_cubed_sphere in .gitmodules, update subm…
climbfuji Sep 24, 2020
e846caa
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Sep 25, 2020
cca4f8a
Bugfix in ccpp/CMakeLists.txt: need to wrap AVX2 flags in 'if(AVX2)' …
climbfuji Sep 25, 2020
0ee678d
From @grantfirl: change mod_name of nonphys tendencies in GFS_diagnos…
climbfuji Sep 28, 2020
7af64fc
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Sep 28, 2020
ced286c
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Oct 2, 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
10 changes: 5 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "atmos_cubed_sphere"]
path = atmos_cubed_sphere
url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere
branch = dev/emc
url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
branch = ufs-release/public-v2
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = master
branch = release/public-v5
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics.git
branch = master
url = https://github.com/NCAR/ccpp-physics
branch = release/public-v5
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Open in desktop
Submodule atmos_cubed_sphere updated 15 files
+19 −0 docs/AdvectionOperators.md
+35 −0 docs/Chapter1.md
+110 −0 docs/Chapter2.md
+63 −0 docs/Chapter3.md
+65 −0 docs/Chapter4.md
+300 −0 docs/Doxyfile
+194 −0 docs/DoxygenLayout.xml
+25 −0 docs/Links.md
+26 −0 docs/Preface.md
+73 −0 docs/appendixB.md
+34 −0 docs/appendixB1.md
+22 −0 docs/appendixB2.md
+12 −0 docs/documentation.dox
+395 −0 model/fv_control.F90
+13 −1 model/fv_regional_bc.F90
12 changes: 7 additions & 5 deletions ccpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,13 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
endif (LEGACY_INTEL)
elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
# Specify aggressive optimization flags (to be overwritten for individual files in ccpp-physics' CMakeLists.txt)
if (SIMDMULTIARCH)
set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512")
else (SIMDMULTIARCH)
set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX2")
endif (SIMDMULTIARCH)
if (AVX2)
if (SIMDMULTIARCH)
set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512")
else (SIMDMULTIARCH)
set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX2")
endif (SIMDMULTIARCH)
endif (AVX2)
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3")
endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
set (CMAKE_Fortran_FLAGS_DEFAULT_PREC "-i4 -real-size 64")
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 1 files
+0 −0 .gitmodules
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 20 files
+2 −2 .gitmodules
+3 −1 CMakeLists.txt
+12 −8 physics/cu_gf_driver.F90
+24 −2 physics/module_MYJPBL_wrapper.F90
+53 −0 physics/module_MYJPBL_wrapper.meta
+20 −48 physics/module_MYNNPBL_wrapper.F90
+13 −5 physics/module_MYNNPBL_wrapper.meta
+1 −1 physics/module_bl_mynn.F90
+5 −10 physics/moninedmf.f
+5 −13 physics/moninedmf.meta
+45 −2 physics/moninshoc.f
+70 −0 physics/moninshoc.meta
+28 −12 physics/satmedmfvdif.F
+13 −5 physics/satmedmfvdif.meta
+8 −8 physics/satmedmfvdifq.F
+13 −5 physics/satmedmfvdifq.meta
+44 −2 physics/shinhongvdif.F90
+76 −0 physics/shinhongvdif.meta
+44 −2 physics/ysuvdif.F90
+76 −0 physics/ysuvdif.meta
3 changes: 2 additions & 1 deletion ccpp/suites/suite_FV3_RRFS_v1beta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
<scheme>GFS_surface_generic_post</scheme>
<scheme>mynnedmf_wrapper</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>drag_suite</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
Expand Down
1 change: 0 additions & 1 deletion gfsphysics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ endif()
set(CCPP_SOURCES
physics/mersenne_twister.f
physics/namelist_soilveg.f
physics/physparam.f
physics/set_soilveg.f

physics/noahmp_tables.f90
Expand Down
10 changes: 5 additions & 5 deletions gfsphysics/GFS_layer/GFS_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,7 +2445,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dt3dt_nophys'
ExtDiag(idx)%desc = 'temperature tendency due to non-physics processes'
ExtDiag(idx)%unit = 'K s-1'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
Expand Down Expand Up @@ -2626,7 +2626,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'du3dt_nophys'
ExtDiag(idx)%desc = 'u momentum tendency due to non-physics processes'
ExtDiag(idx)%unit = 'm s-2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
Expand All @@ -2638,7 +2638,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dv3dt_nophys'
ExtDiag(idx)%desc = 'v momentum tendency due to non-physics processes'
ExtDiag(idx)%unit = 'm s-2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
Expand Down Expand Up @@ -2785,7 +2785,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dq3dt_nophys'
ExtDiag(idx)%desc = 'water vapor specific humidity tendency due to non-physics processes'
ExtDiag(idx)%unit = 'kg kg-1 s-1'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
Expand All @@ -2797,7 +2797,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dq3dt_o3nophys'
ExtDiag(idx)%desc = 'ozone concentration tendency due to non-physics processes'
ExtDiag(idx)%unit = 'kg kg-1 s-1'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
Expand Down