Fix merge conflist

BrianCurtis-NOAA · Mar 27, 2023 · 3b8e29d · 3b8e29d
2 parents 1d2c6aa + 889254a
commit 3b8e29d
Show file tree

Hide file tree

Showing 48 changed files with 8,075 additions and 6,663 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
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_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -377,6 +377,7 @@ export NSSL_INVERTCCN=.true.
 
 # Smoke
 export RRFS_SMOKE=.false.
+export SMOKE_FORECAST=0
 export RRFS_RESTART=NO
 export SEAS_OPT=2
 
@@ -761,6 +762,7 @@ export DNATS=2
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
+export SATMEDMF=.true.
 
 # P7 default mushy thermo
 export KTHERM=2

diff --git a/tests/fv3_conf/rrfs_warm_run.IN b/tests/fv3_conf/rrfs_warm_run.IN
@@ -4,29 +4,29 @@ mkdir INPUT RESTART
 OPNREQ_TEST=${OPNREQ_TEST:-false}
 SUFFIX=${RT_SUFFIX}
 
+cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
+
 if [[ "${RRFS_RESTART:-NO}" == YES ]] ; then
-    # cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
-    # rm -f INPUT/fv_core.res.*
-    # rm -f INPUT/fv_srf_wnd.res.*
-    # rm -f INPUT/fv_tracer.res.*
-    # rm -f INPUT/phy_data.*
-    # rm -f INPUT/sfc_data.*
-    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/grid_spec.nc INPUT/.
-    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/*_grid.tile*.nc INPUT/.
-    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/oro_data*.nc INPUT/.
+    cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
+    rm -f INPUT/fv_core.res.*
+    rm -f INPUT/fv_srf_wnd.res.*
+    rm -f INPUT/fv_tracer.res.*
+    rm -f INPUT/phy_data.*
+    rm -f INPUT/sfc_data.*
+    # cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/grid_spec.nc INPUT/.
+    # cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/*_grid.tile*.nc INPUT/.
+    # cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/oro_data*.nc INPUT/.
     for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
       [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE "INPUT/$RFILE_NEW"
     done
-    for x in emi_data.nc SMOKE_GBBEPx_data.nc dust12m_data.nc gfs_ctrl.nc gfs_data.nc \
-        grid.tile7.halo4.nc ; do
-      cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/$x INPUT/.
-    done
-    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/gfs_bndy.* INPUT/.
-else
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
+    # for x in emi_data.nc SMOKE_RRFS_data.nc dust12m_data.nc gfs_ctrl.nc gfs_data.nc \
+    #     grid.tile7.halo4.nc SMOKE_GBBEPx_data.nc ; do
+    #   cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/$x INPUT/.
+    # done
+    # cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/gfs_bndy.* INPUT/.
 fi
 
 for x in global_glacier.2x2.grb global_h2oprdlos.f77 global_maxice.2x2.grb \
@@ -35,6 +35,7 @@ for x in global_glacier.2x2.grb global_h2oprdlos.f77 global_maxice.2x2.grb \
   cp -f @[INPUTDATA_ROOT]/FV3_fix/"$x" .
 done
 
+cp    @[INPUTDATA_ROOT]/FV3_aeroclim/* .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/global_soilmgldas.t126.384.190.grb .
 cp    @[INPUTDATA_ROOT]/FV3_fix/seaice_newland.grb .
 

diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -129,7 +129,7 @@ deflate_level=1
   oz_phys      = .false.
   oz_phys_2015 = .true.
   lsoil_lsm    = 4
-  do_mynnedmf  = .false.
+  do_mynnedmf  = @[DO_MYNNEDMF]
   do_mynnsfclay = .false.
   icloud_bl    = 1
   bl_mynn_edmf = 1
@@ -163,12 +163,12 @@ deflate_level=1
   lwhtr        = .true.
   swhtr        = .true.
   cnvgwd       = .true.
-  shal_cnv     = .true.
+  shal_cnv     = @[SHAL_CNV]
   cal_pre      = .false.
   redrag       = .true.
   dspheat      = .true.
   hybedmf      = .false.
-  satmedmf     = .true.
+  satmedmf     = @[SATMEDMF]
   isatmedmf    = 1
   lheatstrg    = @[LHEATSTRG]
   lseaspray    = @[LSEASPRAY]

diff --git a/tests/parm/diag_table/diag_additional_rrfs_smoke b/tests/parm/diag_table/diag_additional_rrfs_smoke
@@ -19,3 +19,5 @@
 "gfs_phys",    "ebu_smoke",    "ebu_smoke",     "fv3_history",    "all",  .false.,  "none",  2
 "gfs_phys",    "smoke_ext",    "smoke_ext",     "fv3_history",    "all",  .false.,  "none",  2
 "gfs_phys",    "dust_ext",     "dust_ext",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "coarsepm",     "coarsepm",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "ext550",       "ext550",        "fv3_history",    "all",  .false.,  "none",  2
diff --git a/tests/parm/field_table/field_table_thompson_aero_tke_smoke b/tests/parm/field_table/field_table_thompson_aero_tke_smoke
@@ -73,3 +73,8 @@
            "longname",     "dust mixing ratio"
            "units",        "ug/kg"
        "profile_type", "fixed", "surface_value=1.e-7" /
+# prognostic coarsepm mixing ratio tracer
+ "TRACER", "atmos_mod", "coarsepm"
+           "longname",     "coarsepm mixing ratio"
+           "units",        "ug/kg"
+       "profile_type", "fixed", "surface_value=1.e-7" /
diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN
@@ -143,21 +143,25 @@
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
-    rrfs_smoke = @[RRFS_SMOKE]
+    rrfs_sd = @[RRFS_SMOKE]
     rrfs_smoke_debug = .false.
     seas_opt = @[SEAS_OPT]
     mix_chem = @[RRFS_SMOKE]
-    fire_turb = @[RRFS_SMOKE]
+    enh_mix = @[RRFS_SMOKE]
     dust_opt = 5
     drydep_opt = 1 
-    smoke_forecast = @[RRFS_SMOKE]
+    coarsepm_settling = 1
+    smoke_forecast = @[SMOKE_FORECAST]
     aero_ind_fdb = .false.
     aero_dir_fdb = .false.
     addsmoke_flag = 1
-    biomass_burn_opt = 1
     wetdep_ls_opt = 1    
     do_plumerise = @[RRFS_SMOKE]
     plumerisefire_frq = 60
+    dust_alpha = 0.01
+    dust_gamma = 1.3
+    wetdep_ls_alpha = 0.5
+    smoke_dir_fdb_coef = 0.33, 0.67, 0.02, 0.13, 0.85, 0.05, 0.95
     cal_pre = .false.
     cdmbgwd = @[CDMBWD]
     cnvcld = .false.

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
 fi
 
 
-BL_DATE=20230321
+BL_DATE=20230324
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}}
 

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -9,7 +9,7 @@ RUN     | control_stochy
 RUN     | control_ras                                                                                                             |                | fv3         |
 RUN     | control_p8                                                                                                              |                | fv3         |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON                      |                | fv3         |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON                      |                | fv3         |
 
 RUN     | rap_control                                                                                                             |                | fv3         |
 RUN     | rap_decomp                                                                                                              |                |             |
@@ -24,15 +24,14 @@ RUN     | hrrr_control_decomp
 RUN     | hrrr_control_restart                                                                                                    |                |             | hrrr_control
 RUN     | rrfs_v1beta                                                                                                             |                | fv3         |
 
-RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                | fv3         |
-RUN     | rrfs_smoke_conus13km_hrrr_warm                                                                                          |                | fv3         |
+RUN     | rrfs_smoke_conus13km_hrrr_warm                                                                                          |                                         | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_2threads                                                                                 |                                         |     |
+RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                                         | fv3 |
+RUN     | rrfs_smoke_conus13km_radar_tten_warm                                                                                    |                                         | fv3 |
 
-RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                | fv3         |
-RUN     | rrfs_conus13km_radar_tten_warm_2threads                                                                                 |                |             |
-
-# These two are known to not match the control:
-#RUN     | rrfs_conus13km_radar_tten_warm_decomp                                                                                   |               |             |
-#RUN     | rrfs_conus13km_radar_tten_warm_restart                                                                                  |               |             | rrfs_conus13km_radar_tten_warm
+# These two will run and not crash, but they do not match their baselines:
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_decomp                                                                                   |                                         |     |
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_restart                                                                                   |                                        |     | rrfs_smoke_conus13km_hrrr_warm
 
 ##################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                               #
@@ -52,8 +51,11 @@ RUN     | control_ras_debug
 RUN     | control_stochy_debug                                                                                                    |                | fv3         |
 RUN     | control_debug_p8                                                                                                        |                | fv3         |
 
-RUN     | rrfs_conus13km_hrrr_warm_debug                                                                                          |                | fv3         |
-RUN     | rrfs_conus13km_radar_tten_warm_debug                                                                                    |                | fv3         |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_debug                                                                                    |                                         | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_debug_2threads                                                                           |                                         |     |
+RUN     | rrfs_conus13km_hrrr_warm_debug                                                                                          |                                         | fv3 |
+# This will run and not crash, but will not match its baseline:
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_debug_decomp                                                                             |                                         |     |
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                       |                | fv3         |
 RUN     | control_wam_debug                                                                                                       |                | fv3         |

diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8
@@ -180,6 +180,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi
diff --git a/tests/tests/atmaero_control_p8_rad b/tests/tests/atmaero_control_p8_rad
@@ -175,6 +175,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi
diff --git a/tests/tests/control_2threads_p8 b/tests/tests/control_2threads_p8
@@ -166,3 +166,5 @@ export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
+
+export SATMEDMF=.true.
diff --git a/tests/tests/control_debug_p8 b/tests/tests/control_debug_p8
@@ -128,6 +128,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi
diff --git a/tests/tests/control_decomp_p8 b/tests/tests/control_decomp_p8
@@ -167,6 +167,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi
diff --git a/tests/tests/control_p8 b/tests/tests/control_p8
@@ -168,6 +168,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi
diff --git a/tests/tests/control_p8_atmlnd_sbs b/tests/tests/control_p8_atmlnd_sbs
@@ -206,6 +206,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi

diff --git a/tests/tests/control_p8_faster b/tests/tests/control_p8_faster
@@ -168,6 +168,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi
diff --git a/tests/tests/control_p8_lndp b/tests/tests/control_p8_lndp
@@ -146,6 +146,8 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export SATMEDMF=.true.
+
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   TPN=18
 fi