ufs-community · MinsukJi-NOAA · May 19, 2022 · Apr 6, 2022 · Apr 6, 2022 · Apr 9, 2022
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1245,6 +1245,8 @@ export DO_SAT_ADJ=.false.
 export KTHERM=2
 export TFREEZE_OPTION=mushy
 
+export FSCAV_AERO='"*:0.3","so2:0.0","msa:0.0","dms:0.0","nh3:0.4","nh4:0.6","bc1:0.6","bc2:0.6","dust1:0.6","dust2:0.6","dust3:0.6","dust4:0.6","dust5:0.6","seas1:0.5","seas2:0.5","seas3:0.5","seas4:0.5","seas5:0.5"'
+
 export CPLFLX=.true.
 export CPLICE=.true.
 export CPL=.true.

diff --git a/tests/parm/gocart/AERO_ExtData.rc b/tests/parm/gocart/AERO_ExtData.rc
@@ -42,12 +42,12 @@ TROPP                'Pa'                 Y        N               0
 DU_SRC NA  N Y - none none du_src ExtData/dust/gocart.dust_source.v5a.x1152_y721.nc
 #DU_SRC NA  N Y - none none du_src ExtData/Dust/gocart.dust_source.v5a.x1152_y721.nc
 # FENGSHA input files. Note: regridding should be N or E
-DU_CLAY                 '1'  Y E - none none clayfrac     ExtData/dust/FENGSHA_DUST_INPUTS_v0.6.nc
-DU_SAND                 '1'  Y E - none none sandfrac     ExtData/dust/FENGSHA_DUST_INPUTS_v0.6.nc
-DU_SILT                 '1'  Y E - none none siltfrac     ExtData/dust/FENGSHA_DUST_INPUTS_v0.6.nc
-DU_SSM                  '1'  Y E - none none ssm          ExtData/dust/FENGSHA_DUST_INPUTS_v0.6.nc
-DU_RDRAG                '1'  Y E - none none drag_part    ExtData/dust/FENGSHA_DUST_INPUTS_v0.6.nc
-DU_UTHRES               '1'  Y E - none none uthres       ExtData/dust/FENGSHA_DUST_INPUTS_v0.6.nc
+DU_CLAY                 '1'  Y E - none none clayfrac     ExtData/dust/FENGSHA_SOILGRIDS2019_GEFSv12_v1.2.nc
+DU_SAND                 '1'  Y E - none none sandfrac     ExtData/dust/FENGSHA_SOILGRIDS2019_GEFSv12_v1.2.nc
+DU_SILT                 '1'  Y E - none none siltfrac     /dev/null:0.0
+DU_SSM                  '1'  Y E - none none ssm          /dev/null:1.0
+DU_RDRAG                '1'  Y E - none none albedo_drag  ExtData/dust/FENGSHA_Albedo_drag_v1.nc
+DU_UTHRES               '1'  Y E - none none uthres       ExtData/dust/randomforestensemble_uthres.nc
 
 # sulfate
 SU_regionMask        '1'                  Y        N               0              0.0      1.0     SU_regionMask     /dev/null:1.00

diff --git a/tests/parm/gocart/DU2G_instance_DU.rc b/tests/parm/gocart/DU2G_instance_DU.rc
@@ -41,6 +41,6 @@ pressure_lid_in_hPa: 0.01
 emission_scheme: ginoux       # choose among: fengsha, ginoux, k14
 
 # FENGSHA settings
-alpha: 0.7
+alpha: 0.04
 gamma: 1.0
 vertical_to_horizontal_flux_ratio_limit: 2.e-04
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -132,6 +132,7 @@ export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_control_c384_p8 b/tests/tests/cpld_control_c384_p8
@@ -128,6 +128,7 @@ export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_control_c96_p8 b/tests/tests/cpld_control_c96_p8
@@ -100,6 +100,7 @@ export MOM6_USE_WAVES=False
 export eps_imesh=2.5e-1
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -78,6 +78,7 @@ export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
@@ -87,6 +87,7 @@ export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
@@ -84,6 +84,7 @@ export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
@@ -86,6 +86,7 @@ export BLCKY=`expr $NY_GLB / 2`
 export eps_imesh=2.5e-1
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -153,6 +153,7 @@ export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_restart_c384_p8 b/tests/tests/cpld_restart_c384_p8
@@ -149,6 +149,7 @@ export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 

diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_c96_p8
@@ -106,6 +106,7 @@ export MOM6_USE_WAVES=False
 export eps_imesh=2.5e-1
 
 export CPLCHM=.true.
+export FSCAV_AERO="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5’”
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART