Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/upstream/develop' into support/…
Browse files Browse the repository at this point in the history
…HAFS
  • Loading branch information
BinLiu-NOAA committed Jun 6, 2020
2 parents d589a5d + def9be1 commit 908c7d6
Show file tree
Hide file tree
Showing 188 changed files with 800 additions and 177,056 deletions.
16 changes: 4 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
if( NOT DEFINED PHYS)
set(PHYS gfs)
endif()

if (PHYS MATCHES "nam")
add_definitions(-DNAM_phys)
endif()

if(CCPP)
add_definitions(-DCCPP)
endif()

add_subdirectory(cpl)
add_subdirectory(${PHYS}physics)
add_subdirectory(gfsphysics)
add_subdirectory(ipd)
add_subdirectory(io)

Expand Down Expand Up @@ -70,7 +62,7 @@ set_property(SOURCE atmos_cubed_sphere/model/nh_utils.F90 APPEND_STRING PROPERTY
set_property(SOURCE atmos_cubed_sphere/model/fv_mapz.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "${FAST}")

target_link_libraries(fv3core PRIVATE fms)
target_link_libraries(fv3core PRIVATE ${PHYS}physics)
target_link_libraries(fv3core PRIVATE gfsphysics)
target_link_libraries(fv3core PRIVATE ipd)

target_include_directories(fv3core PRIVATE ${ESMF_MOD})
Expand All @@ -83,7 +75,7 @@ target_include_directories(fv3core PRIVATE ${ESMF_MOD})
if(CCPP)
add_subdirectory(ccpp)
add_subdirectory(ccpp/driver)
add_dependencies(${PHYS}physics ccpp ccppphys)
add_dependencies(gfsphysics ccpp ccppphys)
add_dependencies(ccppdriver ccpp ccppphys)
add_dependencies(ccppphys ccpp)

Expand Down Expand Up @@ -118,7 +110,7 @@ target_include_directories(fv3cap PRIVATE ${ESMF_MOD})

target_link_libraries(fv3cap PRIVATE fms)
target_link_libraries(fv3cap PRIVATE fv3cpl)
target_link_libraries(fv3cap PRIVATE ${PHYS}physics)
target_link_libraries(fv3cap PRIVATE gfsphysics)
target_link_libraries(fv3cap PRIVATE ipd)
target_link_libraries(fv3cap PRIVATE io)
target_link_libraries(fv3cap PRIVATE fv3core)
Expand Down
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
41 changes: 27 additions & 14 deletions atmos_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,18 @@ subroutine update_atmos_radiation_physics (Atmos)
end if

if(IPD_Control%do_ca)then
! DH* The current implementation of cellular_automata assumes that all blocksizes are the
! same, this is tested in the initialization call to cellular_automata, no need to redo *DH
call cellular_automata(IPD_Control%kdt, IPD_Data(:)%Statein, IPD_Data(:)%Coupling, IPD_Data(:)%Intdiag, &
Atm_block%nblks, IPD_Control%levs, IPD_Control%nca, IPD_Control%ncells, &
IPD_Control%nlives, IPD_Control%nfracseed, IPD_Control%nseed, &
IPD_Control%nthresh, IPD_Control%ca_global, IPD_Control%ca_sgs, &
IPD_Control%iseed_ca, IPD_Control%ca_smooth, IPD_Control%nspinup, &
Atm_block%blksz(1))
if(IPD_Control%ca_sgs)then
call cellular_automata_sgs(IPD_Control%kdt,IPD_Data(:)%Statein,IPD_Data(:)%Coupling,IPD_Data(:)%Intdiag,Atm_block%nblks,IPD_Control%levs, &
IPD_Control%nca,IPD_Control%ncells,IPD_Control%nlives,IPD_Control%nfracseed,&
IPD_Control%nseed,IPD_Control%nthresh,IPD_Control%ca_global,IPD_Control%ca_sgs,IPD_Control%iseed_ca,&
IPD_Control%ca_smooth,IPD_Control%nspinup,Atm_block%blksz(1))
endif
if(IPD_Control%ca_global)then
call cellular_automata_global(IPD_Control%kdt,IPD_Data(:)%Statein,IPD_Data(:)%Coupling,IPD_Data(:)%Intdiag,Atm_block%nblks,IPD_Control%levs, &
IPD_Control%nca_g,IPD_Control%ncells_g,IPD_Control%nlives_g,IPD_Control%nfracseed,&
IPD_Control%nseed_g,IPD_Control%nthresh,IPD_Control%ca_global,IPD_Control%ca_sgs,IPD_Control%iseed_ca,&
IPD_Control%ca_smooth,IPD_Control%nspinup,Atm_block%blksz(1),IPD_Control%nsmooth,IPD_Control%ca_amplitude)
endif
endif

!--- if coupled, assign coupled fields
Expand Down Expand Up @@ -656,12 +660,21 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
call mpp_error(FATAL, 'Logic errror: cellular_automata not compatible with non-uniform blocksizes')
end if
! *DH
call cellular_automata(IPD_Control%kdt, IPD_Data(:)%Statein, IPD_Data(:)%Coupling, IPD_Data(:)%Intdiag, &
Atm_block%nblks, IPD_Control%levs, IPD_Control%nca, IPD_Control%ncells, &
IPD_Control%nlives, IPD_Control%nfracseed, IPD_Control%nseed, &
IPD_Control%nthresh, IPD_Control%ca_global, IPD_Control%ca_sgs, &
IPD_Control%iseed_ca, IPD_Control%ca_smooth, IPD_Control%nspinup, &
Atm_block%blksz(1))
if(IPD_Control%do_ca)then
if(IPD_Control%ca_sgs)then
call cellular_automata_sgs(IPD_Control%kdt,IPD_Data(:)%Statein,IPD_Data(:)%Coupling,IPD_Data(:)%Intdiag,Atm_block%nblks,IPD_Control%levs, &
IPD_Control%nca,IPD_Control%ncells,IPD_Control%nlives,IPD_Control%nfracseed,&
IPD_Control%nseed,IPD_Control%nthresh,IPD_Control%ca_global,IPD_Control%ca_sgs,IPD_Control%iseed_ca,&
IPD_Control%ca_smooth,IPD_Control%nspinup,Atm_block%blksz(1))
endif
if(IPD_Control%ca_global)then
call cellular_automata_global(IPD_Control%kdt,IPD_Data(:)%Statein,IPD_Data(:)%Coupling,IPD_Data(:)%Intdiag,Atm_block%nblks,IPD_Control%levs, &
IPD_Control%nca_g,IPD_Control%ncells_g,IPD_Control%nlives_g,IPD_Control%nfracseed,&
IPD_Control%nseed_g,IPD_Control%nthresh,IPD_Control%ca_global,IPD_Control%ca_sgs,IPD_Control%iseed_ca,&
IPD_Control%ca_smooth,IPD_Control%nspinup,Atm_block%blksz(1),IPD_Control%nsmooth,IPD_Control%ca_amplitude)
endif

endif
endif

Atm(mytile)%flagstruct%do_skeb = IPD_Control%do_skeb
Expand Down
2 changes: 1 addition & 1 deletion ccpp/build_ccpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -eu
# List of valid/tested machines
VALID_MACHINES=( wcoss_cray wcoss_dell_p3 gaea.intel jet.intel \
hera.intel hera.gnu orion.intel \
cheyenne.intel cheyenne.intel-impi cheyenne.gnu cheyenne.pgi endeavor.intel \
cheyenne.intel cheyenne.intel-impi cheyenne.gnu endeavor.intel \
stampede.intel supermuc_phase2.intel macosx.gnu \
linux.intel linux.gnu linux.pgi )

Expand Down
2 changes: 1 addition & 1 deletion ccpp/driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ add_library(
CCPP_driver.F90
)

target_link_libraries(ccppdriver ${PHYS}physics)
target_link_libraries(ccppdriver gfsphysics)
target_link_libraries(ccppdriver ccpp)
target_link_libraries(ccppdriver ccppphys)

Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 68 files
+21 −0 .github/workflows/basic_checks.yml
+1 −1 CMakeLists.txt
+9 −37 physics/GFS_DCNV_generic.F90
+0 −77 physics/GFS_DCNV_generic.meta
+3 −3 physics/GFS_MP_generic.F90
+8 −0 physics/GFS_MP_generic.meta
+20 −13 physics/GFS_PBL_generic.F90
+8 −9 physics/GFS_PBL_generic.meta
+27 −6 physics/GFS_debug.F90
+78 −34 physics/GFS_stochastics.F90
+51 −0 physics/GFS_stochastics.meta
+9 −9 physics/GFS_suite_interstitial.F90
+1 −1 physics/GFS_suite_interstitial.meta
+105 −99 physics/GFS_surface_composites.F90
+65 −31 physics/GFS_surface_composites.meta
+9 −9 physics/GFS_surface_generic.F90
+10 −2 physics/GFS_surface_generic.meta
+6 −5 physics/cires_ugwp.F90
+15 −15 physics/dcyc2.f
+3 −70 physics/dcyc2.meta
+467 −0 physics/docs/ccppv4_doxyfile
+292 −257 physics/docs/library.bib
+46 −23 physics/docs/pdftxt/CPT_adv_suite.txt
+17 −0 physics/docs/pdftxt/GFS_OCEAN.txt
+1 −1 physics/docs/pdftxt/GFS_OZPHYS.txt
+117 −0 physics/docs/pdftxt/GFS_UGWPv0.txt
+0 −1 physics/docs/pdftxt/GFSv14_suite.txt
+0 −1 physics/docs/pdftxt/GFSv15_suite.txt
+0 −1 physics/docs/pdftxt/GFSv15_suite_TKEEDMF.txt
+127 −0 physics/docs/pdftxt/GFSv15p2_no_nsst_suite.txt
+133 −0 physics/docs/pdftxt/GFSv15p2_suite.txt
+167 −0 physics/docs/pdftxt/GFSv16beta_no_nsst_suite.txt
+176 −0 physics/docs/pdftxt/GFSv16beta_suite.txt
+150 −82 physics/docs/pdftxt/GSD_adv_suite.txt
+0 −21 physics/docs/pdftxt/UGWPv0.txt
+27 −20 physics/docs/pdftxt/all_shemes_list.txt
+15 −11 physics/docs/pdftxt/mainpage.txt
+100 −0 physics/docs/pdftxt/suite_FV3_GFS_v15p2.xml.txt
+99 −0 physics/docs/pdftxt/suite_FV3_GFS_v15p2_no_nsst.xml.txt
+100 −0 physics/docs/pdftxt/suite_FV3_GFS_v16beta.xml.txt
+97 −0 physics/docs/pdftxt/suite_FV3_GFS_v16beta_no_nsst.xml.txt
+143 −32 physics/docs/pdftxt/suite_input.nml.txt
+4 −4 physics/drag_suite.F90
+1 −0 physics/gcycle.F90
+6 −0 physics/gfdl_fv_sat_adj.F90
+4 −4 physics/gwdps.f
+18 −8 physics/lsm_ruc_sfc_sice_interstitial.F90
+50 −0 physics/lsm_ruc_sfc_sice_interstitial.meta
+5 −14 physics/m_micro.F90
+1 −1 physics/micro_mg_utils.F90
+30 −30 physics/module_MYJSFC_wrapper.F90
+10 −10 physics/module_MYJSFC_wrapper.meta
+0 −4 physics/mp_thompson.F90
+313 −143 physics/samfdeepcnv.f
+48 −0 physics/samfdeepcnv.meta
+172 −81 physics/samfshalcnv.f
+8 −0 physics/samfshalcnv.meta
+39 −39 physics/sfc_diff.f
+13 −13 physics/sfc_diff.meta
+6 −8 physics/sfc_drv_ruc.F90
+1 −1 physics/sfc_drv_ruc.meta
+16 −19 physics/sfc_nst.f
+4 −4 physics/sfc_nst.meta
+11 −7 physics/sfc_ocean.F
+15 −16 physics/sfc_sice.f
+7 −7 physics/sfc_sice.meta
+14 −1 physics/ugwp_driver_v0.F
+25 −0 tools/check_encoding.py
8 changes: 0 additions & 8 deletions ccpp/set_compilers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,6 @@ case "$MACHINE_ID" in
export F77=mpif77
export F90=mpif90
;;
cheyenne.pgi)
export CPP="mpicc -E"
export CC=mpicc
export CXX=mpicxx
export FC=mpif90
export F77=mpif77
export F90=mpif90
;;
endeavor.intel)
export CC=mpiicc
export CXX=mpiicpc
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_CPT_v0.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_CPT_v0" lib="ccppphys" ver="3">
<suite name="FV3_CPT_v0" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_RRTMGP.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_RRTMGP" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_RRTMGP" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_coupled.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_coupled" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_coupled" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_csawmg" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_csawmg" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_csawmgshoc" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_csawmgshoc" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_gfdlmp" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp_noahmp" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_gfdlmp_noahmp" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
10 changes: 8 additions & 2 deletions ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp_regional" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_gfdlmp_regional" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>fv_sat_adj</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down Expand Up @@ -61,7 +66,8 @@
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
Expand Down
10 changes: 8 additions & 2 deletions ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp_regional_c768" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_gfdlmp_regional_c768" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>fv_sat_adj</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down Expand Up @@ -61,7 +66,8 @@
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_h2ophys" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_h2ophys" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_myj.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_myj" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_myj" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_ntiedtke" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_ntiedtke" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_ozphys_2015" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_ozphys_2015" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_sas.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_sas" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_sas" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_satmedmf" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_satmedmf" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_satmedmf_coupled" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_satmedmf_coupled" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_satmedmfq" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_satmedmfq" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_shinhong" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_shinhong" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_stretched.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_stretched" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_stretched" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ysu.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_ysu" lib="ccppphys" ver="3">
<suite name="FV3_GFS_2017_ysu" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_cpld_rasmgshoc" lib="ccppphys" ver="3">
<suite name="FV3_GFS_cpld_rasmgshoc" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_cpldnst_rasmgshoc" lib="ccppphys" ver="3">
<suite name="FV3_GFS_cpldnst_rasmgshoc" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_rasmgshoc" lib="ccppphys" ver="3">
<suite name="FV3_GFS_rasmgshoc" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15" lib="ccppphys" ver="3">
<suite name="FV3_GFS_v15" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_gf.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_gf" lib="ccppphys" ver="3">
<suite name="FV3_GFS_v15_gf" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_gf_thompson" lib="ccppphys" ver="3">
<suite name="FV3_GFS_v15_gf_thompson" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_mynn.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_mynn" lib="ccppphys" ver="3">
<suite name="FV3_GFS_v15_mynn" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
Loading

0 comments on commit 908c7d6

Please sign in to comment.