Add a WAM regression test with the MULTI_GASES and MOLECULAR_DIFFUSION options on

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/XiaqiongZhou-NOAA/fv3atm
+  branch = udhmhj6
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

CMakeLists.txt

@@ -59,6 +59,7 @@ set(DEBUG           OFF CACHE BOOL "Enable DEBUG mode")
 set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
 set(INLINE_POST     OFF CACHE BOOL "Enable inline post")
 set(MULTI_GASES     OFF CACHE BOOL "Enable MULTI_GASES")
+set(MOLECULAR_DIFFUSION     OFF CACHE BOOL "Enable MOLECULAR_DIFFUSION")
 set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
 set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")
 set(REPRO           OFF CACHE BOOL "Enable REPRO mode")
@@ -83,6 +84,7 @@ message("DEBUG ............ ${DEBUG}")
 message("DEBUG_LINKMPI .... ${DEBUG_LINKMPI}")
 message("INLINE_POST ...... ${INLINE_POST}")
 message("MULTI_GASES ...... ${MULTI_GASES}")
+message("MOLECULAR_DIFFUSION ...... ${MOLECULAR_DIFFUSION}")
 message("OPENMP ........... ${OPENMP}")
 message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
 message("REPRO ............ ${REPRO}")

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

@@ -21,8 +21,8 @@ if [ $H2O_PHYS = .T. ]; then
 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
+cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_wam field_table
 
 if [ $CPLWAV = .T. ]; then
   cp  @[INPUTDATA_ROOT_WW3]/mod_def.* .

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

@@ -34,15 +34,15 @@
        ntiles   = 6,
        npz    = @[NPZ]
        grid_type = -1
-       ncnst     = 5
+       ncnst     = 11
        make_nh = @[MAKE_NH]
        fv_debug = .F.
 
        range_warn = .F.
        reset_eta = .F.
        n_sponge = -1
        nudge_qv = .T.
-       tau = 0.015
+       tau = -5.0e1
        rf_cutoff = 2.e2
        d2_bg_k1 = 0.20
        d2_bg_k2 = 0.005
@@ -58,7 +58,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
@@ -84,7 +84,8 @@
        hord_dp =  6
        hord_tr = 8
        adjust_dry_mass = .F.
-       consv_te = 1.
+       consv_te = 0.
+       do_sat_adj = .false.
        consv_am = .F.
        fill = .T.
        dwind_2d = .F.
@@ -123,9 +124,9 @@
        ldiag3d        = .false.
        fhcyc          = 24.
        nst_anl        = .true.
-       use_ufo        = .true.
+       use_ufo        = true.
        pre_rad        = .false.
-       imp_physics    = 99
+       imp_physics    = 11
        pdfcld         = .false.
        fhswr          = 3600.
        fhlwr          = 3600.
@@ -143,16 +144,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
@@ -171,8 +172,11 @@
        iopt_tbot      = 2
        iopt_stc       = 1
        debug          = .false.
+       levr           = 90
        h2o_phys       = @[H2O_PHYS]
        nstf_name      = @[NSTF_NAME]
+       oz_phys      = .F.
+       oz_phys_2015 = .T.
        cplflx         = @[CPLFLX]
        cplwav         = @[CPLWAV]
        iau_delthrs    = 6
@@ -184,6 +188,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 = .F.
+  const_vs = .F.
+  const_vg = .F.
+  const_vr = .F.
+  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'
@@ -278,6 +332,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

@@ -78,9 +78,9 @@ RUN     | regional_quilt_hafs
 RUN     | regional_quilt_netcdf_parallel                                                                                          |                                         | fv3 |
 RUN     | regional_quilt_RRTMGP                                                                                                   |                                         | 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 -DMOLECULAR_DIFFUSION=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/tests/control_wam

@@ -0,0 +1,42 @@
+###############################################################################
+#
+#  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=.T.
+export NA_INIT=0
+export EXTERNAL_IC=.F.
+export NGGPS_IC=.F.
+export MAKE_NH=.F.
+export MOUNTAIN=.T.
+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 IAER=5111
+export QUILTING=.T.
+export OUTPUT_GRID="gaussian_grid"
+export OZ_PHYS_OLD=.F.
+export OZ_PHYS_NEW=.T.
+export H2O_PHYS=.T.
+export NFHOUT=6
+export NFHMAX=24
+export NFHOUT_HF=6