ufs-community · binli2337 · Feb 24, 2022 · Sep 7, 2021 · Sep 27, 2021 · Sep 27, 2021
diff --git a/FV3 b/FV3
diff --git a/stochastic_physics b/stochastic_physics
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.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/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/fv3_conf/regional_run_stoch.IN b/tests/fv3_conf/regional_run_stoch.IN
@@ -0,0 +1,22 @@
+rm -rf INPUT RESTART
+mkdir  INPUT RESTART
+
+rsync -arv @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/. INPUT/.
+
+cp    @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
+
+if [[ $POSTAPP = 'lam' ]]; then
+    cp ${PATHRT}/parm/post_itag_fv3lam itag
+    cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT.txt
+    cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT_FH00.txt
+    cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+elif [[ $POSTAPP = 'hafs' ]]; then
+    cp ${PATHRT}/parm/post_itag_hafs itag
+    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT.txt
+    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT_FH00.txt
+    cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+fi
+
+if [ $DO_RRTMGP = .true. ]; then
+  cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+fi
diff --git a/tests/parm/diag_table/diag_table_hrrr b/tests/parm/diag_table/diag_table_hrrr
@@ -323,7 +323,6 @@
 "gfs_phys",    "sppt_wts",      "sppt_wts",      "fv3_history",  "all", .false., "none", 2
 "gfs_phys",    "skebu_wts",     "skebu_wts",     "fv3_history",  "all", .false., "none", 2
 "gfs_phys",    "skebv_wts",     "skebv_wts",     "fv3_history",  "all", .false., "none", 2
-"dynamics",    "diss_est",      "diss_est",      "fv3_history",  "all", .false., "none", 2
 "gfs_phys",    "shum_wts",      "shum_wts",      "fv3_history",  "all", .false., "none", 2
 
 #=============================================================================================
@@ -358,4 +357,4 @@
 #packing  = 1  double precision
 #         = 2  float
 #         = 4  packed 16-bit integers
-#         = 8  packed 1-byte (not tested?)
+#         = 8  packed 1-byte (not tested?)
diff --git a/tests/parm/diag_table/diag_table_hrrr_stoch b/tests/parm/diag_table/diag_table_hrrr_stoch
diff --git a/tests/parm/field_table/field_table_regional_stoch b/tests/parm/field_table/field_table_regional_stoch
@@ -0,0 +1,65 @@
+# added by FRE: sphum must be present in atmos
+# specific humidity for moist runs
+ "TRACER", "atmos_mod", "sphum"
+           "longname",     "specific humidity"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic cloud water mixing ratio
+ "TRACER", "atmos_mod", "liq_wat"
+           "longname",     "cloud water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic ice water mixing ratio
+ "TRACER", "atmos_mod", "ice_wat"
+           "longname",     "cloud ice mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic rain water mixing ratio
+ "TRACER", "atmos_mod", "rainwat"
+           "longname",     "rain water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic snow water mixing ratio
+ "TRACER", "atmos_mod", "snowwat"
+           "longname",     "snow water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic graupel mixing ratio
+ "TRACER", "atmos_mod", "graupel"
+           "longname",     "graupel mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic cloud water number concentration
+ "TRACER", "atmos_mod", "water_nc"
+           "longname",     "cloud liquid water number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic cloud ice number concentration
+ "TRACER", "atmos_mod", "ice_nc"
+           "longname",     "cloud ice water number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic rain number concentration
+ "TRACER", "atmos_mod", "rain_nc"
+           "longname",     "rain number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic ozone mixing ratio tracer
+ "TRACER", "atmos_mod", "o3mr"
+           "longname",     "ozone mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# water- and ice-friendly aerosols (Thompson)
+ "TRACER", "atmos_mod", "liq_aero"
+           "longname",     "water-friendly aerosol number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+ "TRACER", "atmos_mod", "ice_aero"
+           "longname",     "ice-friendly aerosol number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic subgrid scale turbulent kinetic energy
+ "TRACER", "atmos_mod", "sgs_tke"
+           "longname",     "subgrid scale turbulent kinetic energy"
+           "units",        "m2/s2"
+       "profile_type", "fixed", "surface_value=0.0" /
diff --git a/tests/parm/model_configure_regional_stoch.IN b/tests/parm/model_configure_regional_stoch.IN
@@ -0,0 +1,38 @@
+start_year:              2019
+start_month:             5
+start_day:               30
+start_hour:              0
+start_minute:            0
+start_second:            0
+nhours_fcst:             @[FHMAX]
+fhrot:                   @[FHROT]
+
+dt_atmos:                36
+calendar:                'julian'
+restart_interval:        @[RESTART_INTERVAL]
+output_1st_tstep_rst:    .false.
+
+quilting:                @[QUILTING]
+write_groups:            1
+write_tasks_per_group:   12
+itasks:                  @[ITASKS]
+write_dopost:            @[WRITE_DOPOST]
+num_files:               2
+filename_base:           'dyn' 'phy'
+output_file:             @[OUTPUT_FILE]
+ideflate:                @[IDEFLATE]
+
+output_grid:             'lambert_conformal'
+cen_lon:  -97.5
+cen_lat:  35.0
+stdlat1:  35.0
+stdlat2:  35.0
+nx:       837
+ny:       595
+lon1:     -109.97410429
+lat1:     26.31459843
+dx:       3000.0
+dy:       3000.0
+
+output_fh:               @[OUTPUT_FH]
+nsout:                   -1
+3 −3		atmos_model.F90
+51 −1		ccpp/data/GFS_typedefs.F90
+97 −1		ccpp/data/GFS_typedefs.meta
+65 −0		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
+84 −0		ccpp/suites/suite_FV3_RRFS_v1alpha.xml
+55 −6		stochastic_physics/stochastic_physics_wrapper.F90