Add a WAM regression test with the MULTI_GASES and MOLECULAR_DIFFUSIO…

…N options on (ufs-community#714)

* Update input.nml for the MULTI_GASES RT, add the MOLECULAR_DIFFUSION option
* Add a WAM regresstion test with MULTI_GASES and MOLECULAR_DIFFUSION on
* Update UPP lib to 10.0.10
* Update intel compiler to 18.0.5.274

Co-authored-by: Wen Meng <[email protected]>
Co-authored-by: Dusan Jovic  <[email protected]>

modulefiles/ufs_common

@@ -17,7 +17,7 @@ module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3nco/2.4.1
-module load upp/10.0.9
+module load upp/10.0.10
 
 #module load gftl-shared/v1.3.0
 #module load yafyaml/v0.5.1

modulefiles/ufs_common_debug

@@ -17,7 +17,7 @@ module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3nco/2.4.1
-module load upp/10.0.9
+module load upp/10.0.10
 
 #module load gftl-shared/v1.3.0
 #module load yafyaml/v0.5.1

modulefiles/ufs_wcoss_cray

@@ -53,7 +53,7 @@ module load gfsio/1.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
 
-module load upp/10.0.9
+module load upp/10.0.10
 
 ## WCOSS Cray execution prereqs:
 module load rca

modulefiles/ufs_wcoss_cray_debug

@@ -53,7 +53,7 @@ module load gfsio/1.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
 
-module load upp/10.0.9
+module load upp/10.0.10
 
 ## WCOSS Cray execution prereqs:
 module load rca

modulefiles/ufs_wcoss_dell_p3

@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites on Venus and Mars"
 
-module load ips/18.0.1.163
+module load ips/18.0.5.274
 module load impi/18.0.1
 module load lsf/10.1
 module load python/3.6.3
@@ -15,7 +15,7 @@ module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack
 
 module load hpc/1.1.0
 module load cmake/3.20.0
-module load hpc-ips/18.0.1.163
+module load hpc-ips/18.0.5.274
 module load hpc-impi/18.0.1
 
 module load ufs_common

modulefiles/ufs_wcoss_dell_p3_debug

@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites on Venus and Mars"
 
-module load ips/18.0.1.163
+module load ips/18.0.5.274
 module load impi/18.0.1
 module load lsf/10.1
 module load python/3.6.3
@@ -15,7 +15,7 @@ module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack
 
 module load hpc/1.1.0
 module load cmake/3.20.0
-module load hpc-ips/18.0.1.163
+module load hpc-ips/18.0.5.274
 module load hpc-impi/18.0.1
 
 module load ufs_common_debug

tests/fv3_conf/multigases_run.IN → tests/fv3_conf/wam_run.IN

@@ -1,12 +1,7 @@
 
-inputdir=FV3_input_data_149
-if [ $WARM_START = .false. ]; then
- cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
- mkdir RESTART
-else
- mkdir INPUT RESTART
- cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-fi
+inputdir=FV3_input_data_L149
+mkdir INPUT RESTART
+cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT/* ./INPUT
 cp @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
 cp @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
 cp @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
@@ -20,9 +15,7 @@ if [ $H2O_PHYS = .true. ]; then
  cp @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
 fi
 cp @[INPUTDATA_ROOT]/${inputdir}/*grb .
-cp @[INPUTDATA_ROOT]/${inputdir}/*_table .
-cp @[INPUTDATA_ROOT]/${inputdir}/diag_table_multi_gases diag_table
-cp @[INPUTDATA_ROOT]/${inputdir}/field_table_multi_gases field_table
+cp @[INPUTDATA_ROOT]/${inputdir}/diag_table_wam diag_table
 
 if [ $CPLWAV = .true. ]; then
  cp @[INPUTDATA_ROOT_WW3]/mod_def.* .

tests/parm/multi_gases.nml.IN → tests/parm/wam.nml.IN

@@ -33,15 +33,15 @@
  ntiles = 6,
  npz = @[NPZ]
  grid_type = -1
- ncnst = 5
+ ncnst = 11
  make_nh = @[MAKE_NH]
  fv_debug = .false.
-
+  molecular_diffusion=.true. 
  range_warn = .false.
  reset_eta = .false.
  n_sponge = -1
  nudge_qv = .true.
- tau = 0.015
+ tau = -5.0e1
  rf_cutoff = 2.e2
  d2_bg_k1 = 0.20
  d2_bg_k2 = 0.005
@@ -57,7 +57,7 @@
  p_fac = 0.1
  k_split = 2
  n_split = 6
- nwat = 2
+ nwat = 6
  na_init = @[NA_INIT]
  d_ext = 0.0
  dnats = 0
@@ -83,7 +83,8 @@
  hord_dp = 6
  hord_tr = 8
  adjust_dry_mass = .false.
- consv_te = 1.
+ consv_te = 0.
+ do_sat_adj = .false.
  consv_am = .false.
  fill = .true.
  dwind_2d = .false.
@@ -124,7 +125,7 @@
  nst_anl = .true.
  use_ufo = .true.
  pre_rad = .false.
- imp_physics = 99
+ imp_physics = 11
  pdfcld = .false.
  fhswr = 3600.
  fhlwr = 3600.
@@ -142,16 +143,16 @@
  cal_pre = .true.
  redrag = .true.
  dspheat = .true.
- hybedmf = @[HYBEDMF]
- satmedmf = @[SATMEDMF]
+ hybedmf = .false.
+ satmedmf = .true.
  lheatstrg = @[LHEATSTRG]
  lseaspray = @[LSEASPRAY]
  random_clds = .true.
  trans_trac = .false.
  cnvcld = .true.
  imfshalcnv = 2
  imfdeepcnv = 2
- isatmedmf = @[ISATMEDMF]
+ isatmedmf = 1
  cdmbgwd = 3.5,0.25
  prslrd0 = 0.
  ivegsrc = 1
@@ -170,8 +171,11 @@
  iopt_tbot = 2
  iopt_stc = 1
  debug = .false.
+ levr = 90
  h2o_phys = @[H2O_PHYS]
  nstf_name = @[NSTF_NAME]
+ oz_phys = .false.
+ oz_phys_2015 = .true.
  cplflx = @[CPLFLX]
  cplwav = @[CPLWAV]
  iau_delthrs = 6
@@ -183,6 +187,56 @@
  lndp_type = @[LNDP_TYPE]
  n_var_lndp = @[N_VAR_LNDP]
 /
+&gfdl_cloud_microphysics_nml
+ sedi_transport = .true.
+ do_sedi_heat = .false.
+ rad_snow = .true.
+ rad_graupel = .true.
+ rad_rain = .true.
+ const_vi = .false.
+ const_vs = .false.
+ const_vg = .false.
+ const_vr = .false.
+ vi_max = 1.
+ vs_max = 2.
+ vg_max = 12.
+ vr_max = 12.
+ qi_lim = 1.
+ prog_ccn = .false.
+ do_qa = .true.
+ fast_sat_adj = .true.
+ tau_l2v = 225.
+ tau_v2l = 150.
+ tau_g2v = 900.
+ rthresh = 10.e-6 ! This is a key parameter for cloud water
+ dw_land = 0.16
+ dw_ocean = 0.10
+ ql_gen = 1.0e-3
+ ql_mlt = 1.0e-3
+ qi0_crt = 8.0E-5
+ qs0_crt = 1.0e-3
+ tau_i2s = 1000.
+ c_psaci = 0.05
+ c_pgacs = 0.01
+ rh_inc = 0.30
+ rh_inr = 0.30
+ rh_ins = 0.30
+ ccn_l = 300.
+ ccn_o = 100.
+ c_paut = 0.5
+ c_cracw = 0.8
+ use_ppm = .false.
+ use_ccn = .true.
+ mono_prof = .true.
+ z_slope_liq = .true.
+ z_slope_ice = .true.
+ de_ice = .false.
+ fix_negative = .true.
+ icloud_f = 1
+ mp_time = 150.
+ reiflag = 2
+/
+
 
 &interpolator_nml
  interp_method = 'conserve_great_circle'
@@ -245,8 +299,8 @@
  SPPT=@[SPPT],
  SPPT_TAU=21600,
  SPPT_LSCALE=500000,
- SPPT_LOGIT=.TRUE.,
- SPPT_SFCLIMIT=.TRUE.,
+ SPPT_LOGIT=.true.,
+ SPPT_SFCLIMIT=.true.,
  ISEED_SHUM=1,
  ISEED_SKEB=2,
  ISEED_SPPT=3,
@@ -277,6 +331,16 @@
  launch_level = 25
 /
 &multi_gases_nml
- ri = 287.050, 461.50, 0.0, 173.2247, 0.0, 0.0
- cpi = 1004.600, 1846.00, 0.0, 820.2391, 0.0, 0.0
+ ri= 295.3892, 461.50, 0., 0., 0., 0., 0., 173.2247, 519.674, 259.8370 ,0.,0.
+ cpi=1031.1083, 1846.00, 0., 0., 0., 0., 0., 820.2391, 1299.185, 918.0969, 0.,0.
+/
+&molecular_diffusion_nml
+ tau_visc = 1.0
+ tau_cond = 1.0
+ tau_diff = 1.0
+ md_layers = 70
+ md_tadj_layers = 0
+ md_consv_te = 1.0
+ md_wait_hr = 0.0
 /
+

tests/rt.conf

@@ -80,9 +80,9 @@ RUN | fv3_HAFS_v0_hwrf_thompson
 #RUN | fv3_HAFS_v0_hwrf | | fv3 |
 RUN | fv3_esg_HAFS_v0_hwrf_thompson | | fv3 |
 
-# Run multigases test in REPRO mode to avoid numerical instability in the deep atmosphere
-#COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DREPRO=ON | | fv3 |
-#RUN | control_multigases | | fv3 |
+# Run WAM test in REPRO mode to avoid numerical instability in the deep atmosphere
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DREPRO=ON | | fv3 |
+RUN | control_wam  | | fv3 |
 # WW3 not working on Cheyenne in the past, need to check if it works now
 # COMPILE | -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON | + wcoss_dell_p3 hera.intel orion.intel | fv3 |
 # RUN | control_atmwav | + wcoss_dell_p3 hera.intel orion.intel | fv3 |

tests/rt.sh

@@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
  TEST_35D=true
 fi
 
-BL_DATE=20211022
+BL_DATE=20211025
 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

tests/tests/control_wam

@@ -0,0 +1,43 @@
+###############################################################################
+#
+# Global control multigases test
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control multigases results with previous trunk version"
+
+export CNTL_DIR=control_wam
+
+export LIST_FILES="sfcf024.nc \
+ atmf024.nc"
+
+export_fv3
+export NPZ=149
+export NPZP=150
+export DT_ATMOS="225"
+export SYEAR="2021"
+export SMONTH="03"
+export SDAY="22"
+export SHOUR="06"
+export FHMAX=24
+export WARM_START=.true.
+export NA_INIT=0
+export EXTERNAL_IC=.false.
+export NGGPS_IC=.false.
+export MAKE_NH=.false.
+export MOUNTAIN=.true.
+export FDIAG=3
+export NSTF_NAME=0,0,1,0,5
+export INPUT_NML=wam.nml.IN
+export FV3_RUN=wam_run.IN
+export CCPP_SUITE=FV3_GFS_v16_fv3wam
+export FIELD_TABLE=field_table_wam
+export IAER=5111
+export QUILTING=.true.
+export OUTPUT_GRID="gaussian_grid"
+export OZ_PHYS_OLD=.false.
+export OZ_PHYS_NEW=.true.
+export H2O_PHYS=.true.
+export NFHOUT=6
+export NFHMAX=24
+export NFHOUT_HF=6