diff --git a/dev/jobs/upp.sh b/dev/jobs/upp.sh index 4d070e9c5c2..50b2825e391 100755 --- a/dev/jobs/upp.sh +++ b/dev/jobs/upp.sh @@ -18,7 +18,7 @@ if [[ "${MACHINE_ID}" == "wcoss2" ]]; then set +x source "${HOMEgfs}/ush/module-setup.sh" module use "${HOMEgfs}/sorc/ufs_model.fd/FV3/upp/modulefiles" - module load "${MACHINE_ID}" + module load "${MACHINE_ID}_intel" module load prod_util module load cray-pals module load cfp diff --git a/parm/ufs/gocart/CA2G_instance_CA.bc.rc b/parm/ufs/gocart/CA2G_instance_CA.bc.rc index f6411e2c9d7..9ac462fa3e6 100644 --- a/parm/ufs/gocart/CA2G_instance_CA.bc.rc +++ b/parm/ufs/gocart/CA2G_instance_CA.bc.rc @@ -1,5 +1,5 @@ # -# Resource file for Black Carbon parameters. +# Resource file for Black Carbon parameters. # nbins: 2 @@ -16,8 +16,22 @@ aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3 # Initially hydrophobic portion hydrophobic_fraction: 0.8 +# Rate of conversion of hydrophobic to hydrophilic [days] +time_days_hydrophobic_to_hydrophilic: 2.5 + +# Rate of chemical destruction of carbon species [days] +time_days_chemical_destruction: -1. -1. + +# Wet Removal Scheme Option | gocart, ufs +wet_removal_scheme: ufs # default value + +# Rainout efficiency per bin for wet_removal_scheme == ufs +fwet_ice: 0.0 1.0 +fwet_snow: 0.0 1.0 +fwet_rain: 0.0 1.0 + # Scavenging efficiency per bin [km-1] (NOT USED UNLESS RAS IS CALLED) -fscav: 0.0 0.4 +fscav: 0.0 0.4 # Dry particle density [kg m-3] particle_density: 1800 1800 diff --git a/parm/ufs/gocart/CA2G_instance_CA.br.rc b/parm/ufs/gocart/CA2G_instance_CA.br.rc index 41360831f33..e983240212b 100644 --- a/parm/ufs/gocart/CA2G_instance_CA.br.rc +++ b/parm/ufs/gocart/CA2G_instance_CA.br.rc @@ -21,6 +21,18 @@ pom_ca_ratio: 1.8 # Initially hydrophobic portion hydrophobic_fraction: 0.5 +# Rate of conversion of hydrophobic to hydrophilic [days] +time_days_hydrophobic_to_hydrophilic: 2.5 + +# Rate of chemical destruction of carbon species [days] +time_days_chemical_destruction: -1. -1. + +# Wet Removal Scheme Option | gocart, ufs +wet_removal_scheme: ufs +fwet_ice: 0.0 0.4 +fwet_snow: 0.0 0.4 +fwet_rain: 0.0 0.4 + # Scavenging efficiency per bin [km-1] (NOT USED UNLESS RAS IS CALLED) fscav: 0.0 0.4 diff --git a/parm/ufs/gocart/CA2G_instance_CA.oc.rc b/parm/ufs/gocart/CA2G_instance_CA.oc.rc index 6e3f5ef978a..f24d65e4c47 100644 --- a/parm/ufs/gocart/CA2G_instance_CA.oc.rc +++ b/parm/ufs/gocart/CA2G_instance_CA.oc.rc @@ -1,5 +1,5 @@ # -# Resource file for Organic Carbon parameters. +# Resource file for Organic Carbon parameters. # aerosol_radBands_optics_file: ExtData/optics/opticsBands_OC.v1_3.RRTMG.nc @@ -26,8 +26,22 @@ rhFlag: 0 # Initially hydrophobic portion hydrophobic_fraction: 0.5 +# Rate of conversion of hydrophobic to hydrophilic [days] +time_days_hydrophobic_to_hydrophilic: 2.5 + +# Rate of chemical destruction of carbon species [days] +time_days_chemical_destruction: -1. -1. + +# Wet Removal Scheme Option | gocart, ufs +wet_removal_scheme: ufs + +# Rainout efficiency per bin for wet_removal_scheme == ufs +fwet_ice: 0.0 1.0 +fwet_snow: 0.0 1.0 +fwet_rain: 0.0 1.0 + # Scavenging efficiency per bin [km-1] (NOT USED UNLESS RAS IS CALLED) -fscav: 0.0 0.4 +fscav: 0.0 0.4 # Dry particle density [kg m-3] particle_density: 1800 1800 @@ -43,6 +57,6 @@ sigma: 2.20 2.20 pressure_lid_in_hPa: 0.01 -nbins: 2 +nbins: 2 point_emissions_srcfilen: /dev/null diff --git a/parm/ufs/gocart/DU2G_instance_DU.rc b/parm/ufs/gocart/DU2G_instance_DU.rc index 6c30cdf06b8..8001798189d 100644 --- a/parm/ufs/gocart/DU2G_instance_DU.rc +++ b/parm/ufs/gocart/DU2G_instance_DU.rc @@ -1,5 +1,5 @@ # -# Resource file Dust parameters. +# Resource file Dust parameters. # aerosol_radBands_optics_file: ExtData/optics/opticsBands_DU.v15_3.RRTMG.nc @@ -22,6 +22,17 @@ Ch_DU: 0.2 0.2 0.07 0.07 0.07 0.056 # Scavenging efficiency per bin [km-1] fscav: 0.2 0.2 0.2 0.2 0.2 # +# clay fraction scaling factor +soil_clay_factor: 1.0 + +# Wet Removal Scheme Option | gocart, ufs +wet_removal_scheme: ufs + +# Rainout efficiency per bin for wet_removal_scheme == ufs +fwet_ice: 0.8 0.8 0.8 1.0 1.0 +fwet_snow: 0.8 0.8 0.8 1.0 1.0 +fwet_rain: 0.8 0.8 0.8 1.0 1.0 + # Molecular weight of species [kg mole-1] molecular_weight: 0.1 0.1 0.1 0.1 0.1 @@ -31,7 +42,7 @@ fnum: 2.45e14 3.28e13 6.52e12 9.89e11 1.76e11 rhFlag: 0 # Maring settling velocity correction -maringFlag: .true. +maringFlag: .true. nbins: 5 @@ -41,8 +52,9 @@ pressure_lid_in_hPa: 0.01 emission_scheme: fengsha # choose among: fengsha, ginoux, k14 # FENGSHA settings -alpha: 0.1 +alpha: 0.16 gamma: 1.0 soil_moisture_factor: 1 soil_drylimit_factor: 1 vertical_to_horizontal_flux_ratio_limit: 2.e-04 +drag_partition_option: 2 \ No newline at end of file diff --git a/parm/ufs/gocart/ExtData.other b/parm/ufs/gocart/ExtData.other index 5d2ddc51021..1c138b4b312 100644 --- a/parm/ufs/gocart/ExtData.other +++ b/parm/ufs/gocart/ExtData.other @@ -7,13 +7,15 @@ TROPP 'Pa' Y N - 0.0 1.0 TROPP /dev/null:10000. #====== Dust Imports ================================================= -# FENGSHA input files. Note: regridding should be N or E - Use files with _FillValue != NaN +# FENGSHA input files. Note: regridding should be N or E - Use files with _FillValue != NaN DU_CLAY '1' Y E - none none clayfrac ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc DU_SAND '1' Y E - none none sandfrac ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc DU_SILT '1' Y E - none none siltfrac /dev/null -DU_SSM '1' Y E - none none sep ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc -DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_SSM '1' Y E - none none sep /dev/null:1.0 DU_UTHRES '1' Y E - none none uthres ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none PC ExtData/nexus/FENGSHA/FENGSHA_New_Method_NESDISv1.1_9km.nc +DU_GVF '1' Y E %y4-%m2-%d2T12:00:00 none none GVF ExtData/nexus/FENGSHA/FENGSHA_GVF_LAI2.nc +DU_LAI '1' Y E %y4-%m2-%d2T12:00:00 none none LAI ExtData/nexus/FENGSHA/FENGSHA_GVF_LAI2.nc #====== Sulfate Sources ================================================= # Anthropogenic (BF & FF) emissions -- allowed to input as two layers diff --git a/parm/ufs/gocart/SS2G_instance_SS.rc b/parm/ufs/gocart/SS2G_instance_SS.rc index d8faa3efa8a..5616616ea6c 100644 --- a/parm/ufs/gocart/SS2G_instance_SS.rc +++ b/parm/ufs/gocart/SS2G_instance_SS.rc @@ -14,7 +14,7 @@ radius_upper: 0.1 0.5 1.5 5.0 10.0 particle_density: 2200. 2200. 2200. 2200. 2200. # Scavenging efficiency per bin [km-1] -fscav: 0.4 0.4 0.4 0.4 0.4 +fscav: 0.4 0.4 0.4 0.4 0.4 # Emissions methods and scaling emission_scheme: 3 # 1 for Gong 2003, 2 for ... @@ -40,4 +40,12 @@ nbins: 5 pressure_lid_in_hPa: 0.01 +# Wet Removal Scheme Option | gocart, ufs +wet_removal_scheme: ufs + +# Rainout efficiency per bin for wet_removal_scheme == ufs +fwet_ice: 1.0 1.0 1.0 1.0 1.0 +fwet_snow: 1.0 1.0 1.0 1.0 1.0 +fwet_rain: 1.0 1.0 1.0 1.0 1.0 + diff --git a/parm/ufs/gocart/SU2G_instance_SU.rc b/parm/ufs/gocart/SU2G_instance_SU.rc index 79484b30683..2efa5ec49f8 100644 --- a/parm/ufs/gocart/SU2G_instance_SU.rc +++ b/parm/ufs/gocart/SU2G_instance_SU.rc @@ -8,7 +8,8 @@ aerosol_monochromatic_optics_file: ExtData/monochromatic/optics_SU.v1_3.nc nbins: 4 # Volcanic pointwise sources | degassing only | replace with path to historical volcanic emissions for scientific runs -volcano_srcfilen: ExtData/nexus/VOLCANO/v2021-09/so2_volcanic_emissions_CARN_v202005.degassing_only.rc +volcano_srcfilen_explosive: /dev/null +volcano_srcfilen_degassing: ExtData/nexus/VOLCANO/v2021-09/so2_volcanic_emissions_CARN_v202005.degassing_only.rc # Heights [m] of LTO, CDS and CRS aviation emissions layers aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3 diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 1f0ab4322b0..d820b67f674 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 1f0ab4322b0c81e48a0db5a202a427d374e29be0 +Subproject commit d820b67f674e1636a9b55dd1ef780b22693fc873 diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh index f1ba0a14477..b8d33f2b401 100755 --- a/ush/parsing_namelists_FV3.sh +++ b/ush/parsing_namelists_FV3.sh @@ -174,6 +174,8 @@ local IMP_PHYSICS=${imp_physics:-"99"} local default_dt_inner=$(( DELTIM/2 )) local IOVR=${iovr:-"3"} local LTAEROSOL=${ltaerosol:-".false."} +local MRAEROSOL=.false. +local LTHAILAWARE=.false. local LRADAR=${lradar:-".true."} local TTENDLIM=${ttendlim:-"-999"} local DT_INNER=${dt_inner:-"${default_dt_inner}"}