upgrade coarse resolution OPAC aerosol with more advanced high resolu…

…tion MERRA2 aerosol data (ufs-community#451) * Implement 0.625 degree MERRA2 climatological aerosol * Update gfs_v16 tests
DusanJovic-NOAA · Mar 26, 2021 · c780ec0 · c780ec0
1 parent 37f0da7
commit c780ec0
Show file tree

Hide file tree

Showing 23 changed files with 3,310 additions and 4,483 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/gfs_v16_run.IN b/tests/fv3_conf/gfs_v16_run.IN
@@ -19,6 +19,14 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_gfdlmp diag_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_suite2 field_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
+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/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
+done
+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
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
 
 if [ $DO_RRTMGP = .T. ]; then
   cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .

diff --git a/tests/parm/v16_c96.nml.IN b/tests/parm/v16_c96.nml.IN
@@ -133,7 +133,7 @@ deflate_level=1
   fhlwr        = 3600.
   ialb         = 1
   iems         = 1
-  iaer         = 5111
+  iaer         =  @[IAER]
   icliq_sw     = 2
   iovr         = 3
   ico2         = 2

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -74,13 +74,10 @@ RUN     | fv3_thompson_no_aero
 # This test crashes with NaNs on jet.intel
 RUN     | fv3_rrfs_v1beta                                                                                                         | - jet.intel                             | fv3 |
 
-COMPILE | APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP                                        |                                         | fv3 |
-# fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
-RUN     | fv3_gfs_v15p2                                                                                                           | - cheyenne.intel                        | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                                                           |                                         | fv3 |
 RUN     | fv3_gfs_v16                                                                                                             |                                         | fv3 |
 RUN     | fv3_gfs_v16_restart                                                                                                     |                                         |     | fv3_gfs_v16
 RUN     | fv3_gfs_v16_stochy                                                                                                      |                                         | fv3 |
-RUN     | fv3_gfs_v15p2_RRTMGP                                                                                                    |  - cheyenne.intel jet.intel             | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP                                                                                                      |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_c192L127                                                                                             |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_2thrd                                                                                                |                                         | fv3 |
@@ -106,10 +103,8 @@ RUN     | fv3_gfs_v16_ras
 # DEBUG tests                                                                                                                                                                     #
 ###################################################################################################################################################################################
 
-COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                |                                         | fv3 |
-RUN     | fv3_gfs_v15p2_debug                                                                                                     |                                         | fv3 |
+COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                                     |                                         | fv3 |
 RUN     | fv3_gfs_v16_debug                                                                                                       |                                         | fv3 |
-RUN     | fv3_gfs_v15p2_RRTMGP_debug                                                                                              |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_debug                                                                                                |                                         | fv3 |
 
 COMPILE | APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y |                      | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -416,12 +416,12 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210318/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210324/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210318}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210324}
 fi
 
-INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210212}
+INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210324}
 INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20201220
 INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210212}
 

diff --git a/tests/tests/fv3_gfs_v16 b/tests/tests/fv3_gfs_v16
@@ -96,5 +96,6 @@ export NSTF_NAME=2,1,0,0,0
 export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16
 export INPUT_NML=v16_c96.nml.IN
+export IAER=1111
 
 export WLCLK=30
diff --git a/tests/tests/fv3_gfs_v16_RRTMGP b/tests/tests/fv3_gfs_v16_RRTMGP
@@ -80,4 +80,5 @@ export DO_RRTMGP=.T.
 export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16_RRTMGP
 export INPUT_NML=v16_c96_rrtmgp.nml.IN
+export IAER=5111
 
diff --git a/tests/tests/fv3_gfs_v16_RRTMGP_2thrd b/tests/tests/fv3_gfs_v16_RRTMGP_2thrd
@@ -82,6 +82,7 @@ export WRTTASK_PER_GROUP=12
 
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
+export IAER=5111
 
 export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16_RRTMGP

diff --git a/tests/tests/fv3_gfs_v16_RRTMGP_debug b/tests/tests/fv3_gfs_v16_RRTMGP_debug
@@ -76,6 +76,7 @@ export_fv3
 export FHMAX="06"
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
+export IAER=5111
 
 export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16_RRTMGP

diff --git a/tests/tests/fv3_gfs_v16_debug b/tests/tests/fv3_gfs_v16_debug
@@ -81,4 +81,5 @@ export NSTF_NAME=2,1,0,0,0
 export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16
 export INPUT_NML=v16_c96.nml.IN
+export IAER=1111
 
diff --git a/tests/tests/fv3_gfs_v16_ras b/tests/tests/fv3_gfs_v16_ras
@@ -85,3 +85,4 @@ export IMFDEEPCNV=-1
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
 export H2O_PHYS=.T.
+export IAER=5111
diff --git a/tests/tests/fv3_gfs_v16_ras_debug b/tests/tests/fv3_gfs_v16_ras_debug
@@ -87,3 +87,4 @@ export IMFDEEPCNV=-1
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
 export H2O_PHYS=.T.
+export IAER=5111
diff --git a/tests/tests/fv3_gfs_v16_restart b/tests/tests/fv3_gfs_v16_restart
@@ -67,6 +67,7 @@ export EXTERNAL_IC=.F.
 export MAKE_NH=.F.
 export MOUNTAIN=.T.
 export NSTF_NAME=2,0,0,0,0
+export IAER=1111
 
 export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16

diff --git a/tests/tests/fv3_gfs_v16_stochy b/tests/tests/fv3_gfs_v16_stochy
@@ -85,6 +85,7 @@ export DO_SKEB=.T.
 export SKEB=0.3
 export SHUM=0.003
 export SPPT=0.2
+export IAER=5111
 
 export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16