ufs-community · MinsukJi-NOAA · Jul 21, 2021 · Nov 25, 2020 · Dec 1, 2020 · Dec 8, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/SamuelTrahanNOAA/fv3atm
+  branch = feature/gsl-develop-diagnostics-20210609
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -574,6 +574,7 @@ export FHCYC=24
 export FHROT=0
 export LDIAG3D=.F.
 export QDIAG3D=.F.
+export PRINT_DIFF_PGR=.false.
 export MAX_OUTPUT_FIELDS=300
 
 # Stochastic physics
@@ -615,6 +616,10 @@ export ww3gline="'glo_30m'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'
 # Regional
 export WRITE_RESTART_WITH_BCS=.false.
 
+# Diagnostics
+export PRINT_DIFF_PGR=.false.
+
+# Coupling
 export coupling_interval_fast_sec=0
 }
 
@@ -627,6 +632,8 @@ export DATM_CDEPS=false
 
 export DAYS="1"
 export FHMAX="24"
+export FDIAG="6"
+export FHZERO="6"
 export WLCLK=30
 
 # default atm/ocn/ice resolution
@@ -684,6 +691,8 @@ export INPUT_NML=input.mom6_ccpp.nml.IN
 export FIELD_TABLE="field_table"
 export DIAG_TABLE="diag_table_template"
 
+export DIAG_TABLE_ADDITIONAL=''
+
 export FHROT='0'
 export NSOUT='-1'
 export FDIAG='6'

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -8,6 +8,7 @@
 
 &diag_manager_nml
   prepend_date = .false.
+  max_output_fields = @[MAX_OUTPUT_FIELDS]
 /
 
 &fms_io_nml
@@ -107,9 +108,11 @@ deflate_level=1
 /
 
 &gfs_physics_nml
-  fhzero       = 6
+  fhzero       = @[FHZERO]
   h2o_phys     = .true.
-  ldiag3d      = .false.
+  ldiag3d      = @[LDIAG3D]
+  qdiag3d      = @[QDIAG3D]
+  print_diff_pgr = @[PRINT_DIFF_PGR]
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.

diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -8,6 +8,7 @@
 
 &diag_manager_nml
   prepend_date = .false.
+  max_output_fields = @[MAX_OUTPUT_FIELDS]
 /
 
 &fms_io_nml
@@ -107,9 +108,10 @@ deflate_level=1
 /
 
 &gfs_physics_nml
-  fhzero       = 6
+  fhzero       = @[FHZERO]
   h2o_phys     = .true.
-  ldiag3d      = .false.
+  ldiag3d        = @[LDIAG3D]
+  qdiag3d        = @[QDIAG3D]
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.

diff --git a/tests/parm/diag_additional_control_dtend b/tests/parm/diag_additional_control_dtend
@@ -0,0 +1,98 @@
+# This file contains diag_table entries for 3D diagnostic tendencies from the fv3_gfs_v16 suite.
+# It should be appended to the end of the diag_table before execution of the test.
+
+# Old d*3dt variables with new names:
+
+"gfs_phys", "dtend_temp_lw",        "dtend_temp_lw",          "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_sw",        "dtend_temp_sw",          "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_pbl",       "dtend_temp_pbl",         "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_deepcnv",   "dtend_temp_deepcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_shalcnv",   "dtend_temp_shalcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_mp",        "dtend_temp_mp",          "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_orogwd",    "dtend_temp_orogwd",      "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_rdamp",     "dtend_temp_rdamp",       "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_cnvgwd",    "dtend_temp_cnvgwd",      "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_temp_phys",      "dtend_temp_phys",        "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_u_pbl",         "dtend_u_pbl",         "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_v_pbl",         "dtend_v_pbl",         "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_u_orogwd",      "dtend_u_orogwd",      "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_v_orogwd",      "dtend_v_orogwd",      "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_u_deepcnv",     "dtend_u_deepcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_v_deepcnv",     "dtend_v_deepcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_u_cnvgwd",      "dtend_u_cnvgwd",      "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_v_cnvgwd",      "dtend_v_cnvgwd",      "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_u_rdamp",       "dtend_u_rdamp",       "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_v_rdamp",       "dtend_v_rdamp",       "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_u_shalcnv",     "dtend_u_shalcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_v_shalcnv",     "dtend_v_shalcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_u_phys",        "dtend_u_phys",        "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_v_phys",        "dtend_v_phys",        "fv3_history", "all", .false., "none", 2
+
+"gfs_dyn", "dtend_temp_nophys",     "dtend_temp_nophys",      "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_u_nophys",       "dtend_u_nophys",      "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_v_nophys",       "dtend_v_nophys",      "fv3_history", "all", .false., "none", 2
+
+"gfs_phys", "dtend_qv_pbl",        "dtend_qv_pbl",         "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_qv_deepcnv",    "dtend_qv_deepcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_qv_shalcnv",    "dtend_qv_shalcnv",     "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_qv_mp",         "dtend_qv_mp",          "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_o3_pbl",        "dtend_o3_pbl",       "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_o3_prodloss",   "dtend_o3_prodloss",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_o3_o3mix",      "dtend_o3_o3mix",       "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_o3_temp",       "dtend_o3_temp",      "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_o3_o3column",   "dtend_o3_o3column",    "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_qv_phys",       "dtend_qv_phys",        "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_o3_phys",       "dtend_o3_phys",      "fv3_history", "all", .false., "none", 2
+
+"gfs_dyn",  "dtend_qv_nophys",     "dtend_qv_nophys",      "fv3_history", "all", .false., "none", 2
+"gfs_dyn",  "dtend_o3_nophys",     "dtend_o3_nophys",    "fv3_history", "all", .false., "none", 2
+
+
+# New dtend variables that were not in the d*3dt implementation:
+
+"gfs_phys", "dtend_liq_wat_pbl",  "dtend_liq_wat_pbl",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_rainwat_pbl",  "dtend_rainwat_pbl",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_ice_wat_pbl",  "dtend_ice_wat_pbl",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_snowwat_pbl",  "dtend_snowwat_pbl",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_graupel_pbl",  "dtend_graupel_pbl",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_cld_amt_pbl",  "dtend_cld_amt_pbl",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_sgs_tke_pbl",  "dtend_sgs_tke_pbl",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_cld_amt_cnvtrans",  "dtend_cld_amt_cnvtrans",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_sgs_tke_cnvtrans", "dtend_sgs_tke_cnvtrans", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_liq_wat_deepcnv", "dtend_liq_wat_deepcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_snowwat_deepcnv", "dtend_snowwat_deepcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_graupel_deepcnv", "dtend_graupel_deepcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_cld_amt_deepcnv", "dtend_cld_amt_deepcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_sgs_tke_deepcnv", "dtend_sgs_tke_deepcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_rainwat_deepcnv", "dtend_rainwat_deepcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_liq_wat_shalcnv", "dtend_liq_wat_shalcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_snowwat_shalcnv", "dtend_snowwat_shalcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_graupel_shalcnv", "dtend_graupel_shalcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_cld_amt_shalcnv", "dtend_cld_amt_shalcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_sgs_tke_shalcnv", "dtend_sgs_tke_shalcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_rainwat_shalcnv", "dtend_rainwat_shalcnv", "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_liq_wat_mp",  "dtend_liq_wat_mp",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_rainwat_mp",  "dtend_rainwat_mp",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_ice_wat_mp",  "dtend_ice_wat_mp",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_snowwat_mp",  "dtend_snowwat_mp",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_graupel_mp",  "dtend_graupel_mp",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_cld_amt_mp",  "dtend_cld_amt_mp",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_sgs_tke_mp",  "dtend_sgs_tke_mp",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_liq_wat_phys",  "dtend_liq_wat_phys",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_rainwat_phys",  "dtend_rainwat_phys",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_ice_wat_phys",  "dtend_ice_wat_phys",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_snowwat_phys",  "dtend_snowwat_phys",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_graupel_phys",  "dtend_graupel_phys",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_cld_amt_phys",  "dtend_cld_amt_phys",  "fv3_history", "all", .false., "none", 2
+"gfs_phys", "dtend_sgs_tke_phys",  "dtend_sgs_tke_phys",  "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_liq_wat_nophys",  "dtend_liq_wat_nophys",  "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_rainwat_nophys",  "dtend_rainwat_nophys",  "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_ice_wat_nophys",  "dtend_ice_wat_nophys",  "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_snowwat_nophys",  "dtend_snowwat_nophys",  "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_graupel_nophys",  "dtend_graupel_nophys",  "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_cld_amt_nophys",  "dtend_cld_amt_nophys",  "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "dtend_sgs_tke_nophys",  "dtend_sgs_tke_nophys",  "fv3_history", "all", .false., "none", 2
+
+"gfs_phys", "dtend_o3_photochem", "dtend_o3_photochem", "fv3_history", "all", .false., "none", 2
+
+
+2 −2		.gitmodules
+126 −14		atmos_model.F90
+563 −33		ccpp/data/GFS_typedefs.F90
+201 −316		ccpp/data/GFS_typedefs.meta
+65 −497		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
+1 −0		ccpp/suites/suite_FV3_CPT_v0.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_myj.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_sas.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+1 −0		ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
+1 −0		ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml
+1 −1		ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst_flake.xml
+1 −0		ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
+1 −0		ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_gf.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_ras.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15p2_coupled.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15p2_couplednsst.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15plus.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15plusras.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_coupled.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_coupled_noahmp.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_coupled_nsstNoahmp.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_coupled_nsstNoahmpUGWPv1.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_couplednsst.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v16_flake.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v16_no_nsst.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_noahmp.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_ras.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_thompson.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_ugwpv1.xml
+1 −1		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstras.xml
+1 −1		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstras_flake.xml
+1 −1		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstrasnoshal.xml
+1 −1		ccpp/suites/suite_FV3_GFSv17alpha_cpldnsstsas.xml
+1 −1		ccpp/suites/suite_FV3_GFSv17alpha_ras.xml
+1 −1		ccpp/suites/suite_FV3_GFSv17alpha_ras_flake.xml
+1 −1		ccpp/suites/suite_FV3_GFSv17alpha_sas.xml
+1 −0		ccpp/suites/suite_FV3_GSD_SAR.xml
+1 −0		ccpp/suites/suite_FV3_GSD_noah.xml
+1 −0		ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml
+1 −1		ccpp/suites/suite_FV3_GSD_v0.xml
+1 −1		ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml
+1 −0		ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+1 −0		ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
+1 −0		ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml
+1 −0		ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite_noah.xml
+1 −0		ccpp/suites/suite_FV3_HRRR.xml
+1 −0		ccpp/suites/suite_FV3_RAP.xml
+1 −0		ccpp/suites/suite_FV3_RRFS_v1alpha.xml
+1 −0		ccpp/suites/suite_FV3_RRFS_v1beta.xml
+1 −0		ccpp/suites/suite_HAFS_v0_hwrf.xml
+1 −0		ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
+0 −32		io/FV3GFS_io.F90