Add MERRA2 aerosol three hourly forcing to drive UFS

.gitmodules

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

tests/default_vars.sh

@@ -485,6 +485,7 @@ export SATMEDMF=.false.
 export ISATMEDMF=0
 export LRADAR=.true.
 export LTAEROSOL=.true.
+export MRAEROSOL=.false.
 
 export LSM=1
 export LANDICE=.true.
@@ -705,6 +706,7 @@ export EFFR_IN=.false.
 # Thompson MP
 export LRADAR=.false.
 export LTAEROSOL=.false.
+export MRAEROSOL=.false.
 export LTHAILAWARE=.false.
 export EXT_DIAG_THOMPSON=.false.
 export SEDI_SEMI=.true.
@@ -1855,6 +1857,7 @@ export IMP_PHYSICS=11
 export IAER=111
 export CNVGWD=.false.
 export LTAEROSOL=.false.
+export MRAEROSOL=.false.
 export CDMBWD=1.0,1.0,1.0,1.0
 export LHEATSTRG=.false.
 export LRADAR=.true.
@@ -2017,6 +2020,7 @@ export DNATS=0
 export DO_SAT_ADJ=.false.
 export LRADAR=.true.
 export LTAEROSOL=.true.
+export MRAEROSOL=.false.
 export IALB=2
 export IEMS=2
 export HYBEDMF=.false.
@@ -2163,6 +2167,7 @@ export DNATS=0
 export DO_SAT_ADJ=.false.
 export LRADAR=.true.
 export LTAEROSOL=.true.
+export MRAEROSOL=.false.
 export IALB=2
 export IEMS=2
 export HYBEDMF=.false.

tests/fv3_conf/control_run.IN

@@ -135,9 +135,15 @@ fi
 
 #merra2
 if [ $USE_MERRA2 = .true. ]; then
+if [ $IAER = 1011 ]; then
   for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
     cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
   done
+fi
+if [ $IAER = 6011 ]; then
+  ln -sf @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_40y/2021_03/MERRA2_400.inst3_3d_aer_Nv.20210322.nc4 merra2_20210322.nc
+  ln -sf @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_40y/2021_03/MERRA2_400.inst3_3d_aer_Nv.20210323.nc4 merra2_20210323.nc
+fi
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat

tests/parm/global_control.nml.IN

@@ -118,6 +118,7 @@
   imp_physics  = @[IMP_PHYSICS]
   iovr         = @[IOVR]
   ltaerosol    = @[LTAEROSOL]
+  mraerosol    = @[MRAEROSOL]
   lthailaware  = @[LTHAILAWARE]
   lradar       = @[LRADAR]
   ttendlim     = @[TTENDLIM]

tests/rt.conf

@@ -142,6 +142,7 @@ RUN | control_p8_lndp                                   |
 RUN | control_p8_rrtmgp                                 | - noaacloud                          | baseline |
 RUN | control_p8_mynn                                   | - noaacloud                          | baseline |
 RUN | merra2_thompson                                   | - noaacloud                          | baseline |
+RUN | merra2_hf_thompson                                | - noaacloud                          | baseline |
 RUN | regional_control                                  |                                      | baseline |
 RUN | regional_restart                                  | - noaacloud                          |          | regional_control
 RUN | regional_decomp                                   | - noaacloud                          |          |

tests/test_changes.list

@@ -1 +1,3 @@
-regional_atmaq_canopy intel
+merra2_thompson intel
+merra2_hf_thompson intel
+atmaero_control_p8_rad_micro intel

tests/tests/merra2_hf_thompson

@@ -0,0 +1,150 @@
+###############################################################################
+#
+#  Global control test GFSv16 atmosphere only at C96L127, P8 configuration
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control 3 hourly merra2 thompson results with previous trunk version"
+
+export CNTL_DIR=merra2_hf_thompson
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf021.nc \
+                   sfcf024.nc \
+                   atmf000.nc \
+                   atmf021.nc \
+                   atmf024.nc \
+                   GFSFLX.GrbF00 \
+                   GFSFLX.GrbF21 \
+                   GFSFLX.GrbF24 \
+                   GFSPRS.GrbF00 \
+                   GFSPRS.GrbF21 \
+                   GFSPRS.GrbF24 \
+                   RESTART/20210323.060000.coupler.res \
+                   RESTART/20210323.060000.fv_core.res.nc \
+                   RESTART/20210323.060000.fv_core.res.tile1.nc \
+                   RESTART/20210323.060000.fv_core.res.tile2.nc \
+                   RESTART/20210323.060000.fv_core.res.tile3.nc \
+                   RESTART/20210323.060000.fv_core.res.tile4.nc \
+                   RESTART/20210323.060000.fv_core.res.tile5.nc \
+                   RESTART/20210323.060000.fv_core.res.tile6.nc \
+                   RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
+                   RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
+                   RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
+                   RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
+                   RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
+                   RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
+                   RESTART/20210323.060000.fv_tracer.res.tile1.nc \
+                   RESTART/20210323.060000.fv_tracer.res.tile2.nc \
+                   RESTART/20210323.060000.fv_tracer.res.tile3.nc \
+                   RESTART/20210323.060000.fv_tracer.res.tile4.nc \
+                   RESTART/20210323.060000.fv_tracer.res.tile5.nc \
+                   RESTART/20210323.060000.fv_tracer.res.tile6.nc \
+                   RESTART/20210323.060000.phy_data.tile1.nc \
+                   RESTART/20210323.060000.phy_data.tile2.nc \
+                   RESTART/20210323.060000.phy_data.tile3.nc \
+                   RESTART/20210323.060000.phy_data.tile4.nc \
+                   RESTART/20210323.060000.phy_data.tile5.nc \
+                   RESTART/20210323.060000.phy_data.tile6.nc \
+                   RESTART/20210323.060000.sfc_data.tile1.nc \
+                   RESTART/20210323.060000.sfc_data.tile2.nc \
+                   RESTART/20210323.060000.sfc_data.tile3.nc \
+                   RESTART/20210323.060000.sfc_data.tile4.nc \
+                   RESTART/20210323.060000.sfc_data.tile5.nc \
+                   RESTART/20210323.060000.sfc_data.tile6.nc"
+
+export_fv3
+export_tiled
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=600
+export DT_INNER=${DT_ATMOS}
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export RESTART_INTERVAL="12 -1"
+export OUTPUT_GRID='gaussian_grid'
+export WRITE_DOPOST=.true.
+export OUTPUT_FH='0 21 24'
+
+export IALB=2
+export IEMS=2
+export LSM=2
+export IOPT_DVEG=4
+export IOPT_CRS=2
+export IOPT_RAD=3
+export IOPT_ALB=1
+export IOPT_STC=3
+export IOPT_SFC=3
+export IOPT_TRS=2
+export IOPT_DIAG=2
+
+export D2_BG_K1=0.20
+export D2_BG_K2=0.04
+export PSM_BC=1
+export DDDMP=0.1
+
+# Merra2 Aerosols & NSST
+export USE_MERRA2=.true.
+export LTAEROSOL=.false.
+export MRAEROSOL=.true.
+export IAER=6011
+export NSTF_NAME=2,1,0,0,0
+
+export LHEATSTRG=.false.
+export LSEASPRAY=.true.
+
+# UGWP1
+export GWD_OPT=2
+export DO_UGWP_V1=.false.
+export KNOB_UGWP_VERSION=0
+export KNOB_UGWP_NSLOPE=1
+export DO_UGWP_V0=.true.
+export DO_GSL_DRAG_LS_BL=.false.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
+export DO_UGWP_V0_NST_ONLY=.false.
+export LDIAG_UGWP=.false.
+
+# CA
+export DO_CA=.true.
+export CA_SGS=.true.
+export CA_GLOBAL=.false.
+export NCA=1
+export NCELLS=5
+export NLIVES=12
+export NTHRESH=18
+export NSEED=1
+export NFRACSEED=0.5
+export CA_TRIGGER=.true.
+export NSPINUP=1
+export ISEED_CA=12345
+
+export IMP_PHYSICS=8
+export LGFDLMPRAD=.false.
+export DO_SAT_ADJ=.false.
+export DNATS=2
+export DZ_MIN=6
+
+#required for NML.IN sharing
+export MIN_SEAICE=0.15
+export FRAC_GRID=.true.
+export MOM6_RESTART_SETTING=n
+# Following not used for standalone
+export USE_CICE_ALB=.false.
+
+export WRITE_NSFLIP=.true.
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export FIELD_TABLE=field_table_mr2
+export DIAG_TABLE=diag_table_mr2
+export INPUT_NML=global_control.nml.IN
+
+# RRTMGP
+export DO_RRTMGP=.false.
+export DOGP_CLDOPTICS_LUT=.true.
+export DOGP_LWSCAT=.true.
+export DOGP_SGS_CNV=.true.