Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…

…r-model into thompson_mp_effr_updates
ufs-community · Jan 19, 2022 · 67ad453 · 67ad453
2 parents 068b77e + a79a7ca
commit 67ad453
Show file tree

Hide file tree

Showing 17 changed files with 3,976 additions and 3,724 deletions.
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_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/fv3_slurm.IN_s4 b/tests/fv3_conf/fv3_slurm.IN_s4
@@ -14,7 +14,7 @@ set -eux
 echo -n " $( date +%s )," >  job_timestamp.txt
 
 set +x
-MACHINE_ID = s4
+MACHINE_ID=s4
 source ./module-setup.sh
 module use $( pwd -P )
 module load modules.fv3

diff --git a/tests/fv3_conf/hafs_fv3_run.IN b/tests/fv3_conf/hafs_fv3_run.IN
@@ -6,6 +6,7 @@ for file in $(find @[INPUTDATA_ROOT]/FV3_hafs_input_data/ -maxdepth 1 -type f);
 done
 
 if [ ${CNTL_DIR} = "hafs_regional_atm" ] || \
+   [ ${CNTL_DIR} = "hafs_regional_atm_thompson_gfdlsf" ] || \
    [ ${CNTL_DIR} = "hafs_regional_atm_ocn" ] || \
    [ ${CNTL_DIR} = "hafs_regional_atm_wav" ] || \
    [ ${CNTL_DIR} = "hafs_regional_atm_ocn_wav" ] || \
@@ -20,3 +21,10 @@ elif [ ${CNTL_DIR} = "hafs_regional_1nest_atm" ] || \
 else
   echo "Error: unsupported experiments ${CNTL_DIR}"
 fi
+
+if [ ${CNTL_DIR} = "hafs_regional_atm_thompson_gfdlsf" ]; then
+  cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qsV2.dat .
+  cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qgV2.dat .
+  cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/freezeH2O.dat .
+  cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .
+fi
diff --git a/tests/parm/field_table/field_table_hafs_thompson b/tests/parm/field_table/field_table_hafs_thompson
@@ -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=3.e-6" /
+# 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 Grau water 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 - not for non-aerosol runs
+# "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) - not for non-aerosol runs
+# "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/input_regional_hafs.nml.IN b/tests/parm/input_regional_hafs.nml.IN
@@ -69,7 +69,7 @@
        nwat = @[NWAT]
        na_init = @[NA_INIT]
        d_ext = 0.0
-       dnats = 1
+       dnats = @[DNATS]
        fv_sg_adj = 300
        d2_bg = 0.
        nord =  2
@@ -93,7 +93,7 @@
        hord_tr = 8
        adjust_dry_mass = .false.
        consv_te = 0.
-       do_sat_adj = .true.
+       do_sat_adj = @[DO_SAT_ADJ]
        consv_am = .false.
        fill = .true.
        dwind_2d = .false.
@@ -158,7 +158,12 @@
        fhcyc          = @[FHCYC]
        use_ufo        = .true.
        pre_rad        = .false.
-       imp_physics    = 11
+       imp_physics    = @[IMP_PHYSICS]
+       ltaerosol      = .false.
+       lradar         = .true.
+       ttendlim       = 0.004
+       sedi_semi      = .false.
+       ext_diag_thompson = .false.
        pdfcld         = .false.
        fhswr          = @[FHSWR]
        fhlwr          = @[FHLWR]

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -145,8 +145,9 @@ RUN     | control_wam_debug
 # HAFS tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 #
-COMPILE | -DAPP=HAFSW -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON                           | - wcoss2                                | fv3 |
+COMPILE | -DAPP=HAFSW -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON                           | - wcoss2                                | fv3 |
 RUN     | hafs_regional_atm                                                                                                       | - wcoss2                                | fv3 |
+RUN     | hafs_regional_atm_thompson_gfdlsf                                                                                       | - wcoss2                                | fv3 |
 RUN     | hafs_regional_atm_ocn                                                                                                   | - wcoss2                                | fv3 |
 RUN     | hafs_regional_atm_wav                                                                                                   | - wcoss2                                | fv3 |
 RUN     | hafs_regional_atm_ocn_wav                                                                                               | - wcoss2                                | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -467,7 +467,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220112
+BL_DATE=20220113
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/tests/hafs_regional_atm_thompson_gfdlsf b/tests/tests/hafs_regional_atm_thompson_gfdlsf
@@ -0,0 +1,98 @@
+###############################################################################
+#
+#  HAFS regional atmosphere only using the Thompson microphysics scheme and GFDL surface layer scheme
+#
+###############################################################################
+
+export TEST_DESCR="Compare the results from HAFS regional atmosphere only using the Thompson microphysics scheme and GFDL surface layer scheme with previous trunk version"
+
+export CNTL_DIR=hafs_regional_atm_thompson_gfdlsf
+
+export LIST_FILES="atmf006.nc \
+                   sfcf006.nc"
+
+export_fv3
+
+export HAFS=true
+export FHMAX=6
+export RESTART_N=${FHMAX}
+export TASKS=300
+export THRD=2
+export TPN=$TPN_thrd
+export CEN_LON=-62.0
+export CEN_LAT=22.0
+export LON1=-116.90
+export LAT1=-14.45
+export LON2=-7.10
+export LAT2=58.45
+export DLON=0.1
+export DLAT=0.1
+export DT_ATMOS=180
+export IDEFLATE=1
+export NFHMAX_HF=-1
+export NFHOUT_HF=3
+export NFHOUT=3
+export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
+export OUTPUT_GRID='regional_latlon'
+export SDAY=29
+export SHOUR=00
+export SMONTH=08
+export SYEAR=2019
+export WRTTASK_PER_GROUP=60
+
+export BLOCKSIZE=40
+export CCPP_SUITE="FV3_HAFS_v0_thompson_tedmf_gfdlsf"
+export DEFLATE_LEVEL=-1
+export INPES=20
+export JNPES=12
+export NPX=721
+export NPY=601
+export NPZ=91
+export NPZP=$(($NPZ + 1))
+export K_SPLIT=2
+export N_SPLIT=5
+export NWAT=6
+export NA_INIT=1
+export EXTERNAL_IC=.true.
+export NGGPS_IC=.true.
+export MOUNTAIN=.false.
+export WARM_START=.false.
+export TARGET_LAT="22.0"
+export TARGET_LON="-62.0"
+export STRETCH_FAC=1.0001
+export REGIONAL=.true.
+export BC_UPDATE_INTERVAL=3
+export NROWS_BLEND=10
+export FULL_ZS_FILTER=.false.
+export N_ZS_FILTER=0
+export DNATS=0
+export DO_SAT_ADJ=.false.
+
+export GRID_PES="240"
+export TILE_COARSE="0"
+export NUM_TILE_TOP=1
+export NEST_REFINE="0"
+export NEST_IOFFSETS="999"
+export NEST_JOFFSETS="999"
+
+export FHCYC=0
+export FHSWR=1800
+export FHLWR=1800
+export IMP_PHYSICS=8
+export NSTF_NAME=2,0,0,0,0
+export CPLFLX=.false.
+export CPLOCN2ATM=.true.
+export CPLWAV=.false.
+export CPLWAV2ATM=.false.
+export CPL_IMP_MRG=.false.
+
+export CMEPS=false
+export RUNTYPE="startup"
+export USE_COLDSTART="false"
+
+export FIELD_TABLE=field_table_hafs_thompson
+export DIAG_TABLE=diag_table_hafs_template
+export INPUT_NML=input_regional_hafs.nml.IN
+export MODEL_CONFIGURE="model_configure_hafs_shared.IN"
+export NEMS_CONFIGURE="nems.configure.hafs_atm.IN"
+export FV3_RUN="hafs_fv3_run.IN"