From cdae89e2c90353484d28acc9ed8d0119ef4e774b Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 18:24:26 +0000 Subject: [PATCH 01/16] Adding updated parameters needed for newest changes in FENGSHA --- parm/ufs/chem/DU2G_instance_DU.rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/parm/ufs/chem/DU2G_instance_DU.rc b/parm/ufs/chem/DU2G_instance_DU.rc index c701efb128..6c30cdf06b 100644 --- a/parm/ufs/chem/DU2G_instance_DU.rc +++ b/parm/ufs/chem/DU2G_instance_DU.rc @@ -41,6 +41,8 @@ pressure_lid_in_hPa: 0.01 emission_scheme: fengsha # choose among: fengsha, ginoux, k14 # FENGSHA settings -alpha: 0.04 +alpha: 0.1 gamma: 1.0 +soil_moisture_factor: 1 +soil_drylimit_factor: 1 vertical_to_horizontal_flux_ratio_limit: 2.e-04 From f4c7137bb1bd803d5e3ee9fb6f43b0f152f3ca35 Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 18:25:35 +0000 Subject: [PATCH 02/16] Updating to remove the nitrogen inputs and the Ginoux scheme as they are not used. We also are updating the inputs for FENGSHA for GEFSv13 tests --- parm/ufs/chem/ExtData.other | 39 +++++++++++++++++-------------------- parm/ufs/chem/ExtData.qfed | 8 ++++---- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/parm/ufs/chem/ExtData.other b/parm/ufs/chem/ExtData.other index 5eb1e1dd0b..ea75aa2244 100644 --- a/parm/ufs/chem/ExtData.other +++ b/parm/ufs/chem/ExtData.other @@ -7,16 +7,13 @@ TROPP 'Pa' Y N - 0.0 1.0 TROPP /dev/null:10000. #====== Dust Imports ================================================= -# Ginoux input files -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 - Use files with _FillValue != NaN -DU_CLAY '1' Y E - none none clayfrac ExtData/Dust/FENGSHA_p81_10km_inputs.nc -DU_SAND '1' Y E - none none sandfrac ExtData/Dust/FENGSHA_p81_10km_inputs.nc +DU_CLAY '1' Y E - none none clayfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_SAND '1' Y E - none none sandfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/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 ssm /dev/null:1.0 -DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag ExtData/Dust/FENGSHA_p81_10km_inputs.nc -DU_UTHRES '1' Y E - none none uthres ExtData/Dust/FENGSHA_p81_10km_inputs.nc +DU_SSM '1' Y E - none none sep /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_UTHRES '1' Y E - none none uthres_bnu /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc #====== Sulfate Sources ================================================= # Anthropogenic (BF & FF) emissions -- allowed to input as two layers @@ -135,16 +132,16 @@ BRC_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null # SOA production pSOA_BIOB_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null -# ======= Nitrate Sources ======== -EMI_NH3_AG 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_ag ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc -EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_en /dev/null -EMI_NH3_IN 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_in ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc -EMI_NH3_RE 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_re ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc -EMI_NH3_TR 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_tr ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc -EMI_NH3_OC 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none emiss_ocn ExtData/PIESA/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4 - -# -------------------------------------------------------------- -# If using 64 levels please replace this section with the correct values (ie replace 127 with 64) -NITRATE_HNO3 'mol mol-1' Y N %y4-%m2-%d2T12:00:00 none 0.20 hno3 ExtData/PIESA/L127/GMI.vmr_HNO3.x144_y91.t12.2006.nc4 -# -------------------------------------------------------------- -NI_regionMask NA Y V - none none REGION_MASK ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc +# # ======= Nitrate Sources ======== +# EMI_NH3_AG 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_ag ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc +# EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_en /dev/null +# EMI_NH3_IN 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_in ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc +# EMI_NH3_RE 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_re ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc +# EMI_NH3_TR 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none none NH3_tr ExtData/nexus/CEDS/v2019/%y4/CEDS.2019.emis.%y4%m2%d2.nc +# EMI_NH3_OC 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none emiss_ocn ExtData/PIESA/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4 + +# # -------------------------------------------------------------- +# # If using 64 levels please replace this section with the correct values (ie replace 127 with 64) +# NITRATE_HNO3 'mol mol-1' Y N %y4-%m2-%d2T12:00:00 none 0.20 hno3 ExtData/PIESA/L127/GMI.vmr_HNO3.x144_y91.t12.2006.nc4 +# # -------------------------------------------------------------- +# NI_regionMask NA Y V - none none REGION_MASK ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc diff --git a/parm/ufs/chem/ExtData.qfed b/parm/ufs/chem/ExtData.qfed index 86ab3c86cc..cf15efa960 100644 --- a/parm/ufs/chem/ExtData.qfed +++ b/parm/ufs/chem/ExtData.qfed @@ -2,7 +2,7 @@ # QFED #-------------------------------------------------------------------------------------------------------------------------------- -SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none none biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4 -OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none none biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4 -BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none none biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4 -EMI_NH3_BB NA N Y %y4-%m2-%d2t12:00:00 none none biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4 +SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4 +OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4 +BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4 +# EMI_NH3_BB NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4 From 669b91439e5955240d471e5f02f29da3691f61f8 Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 18:31:36 +0000 Subject: [PATCH 03/16] Remove the nitrogen component by default in support of EPx experiments --- parm/ufs/chem/GOCART2G_GridComp.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/ufs/chem/GOCART2G_GridComp.rc b/parm/ufs/chem/GOCART2G_GridComp.rc index 5ea4fa45df..bfe5934b7a 100644 --- a/parm/ufs/chem/GOCART2G_GridComp.rc +++ b/parm/ufs/chem/GOCART2G_GridComp.rc @@ -31,7 +31,7 @@ PASSIVE_INSTANCES_SU: ACTIVE_INSTANCES_CA: CA.oc CA.bc # CA.oc.data CA.bc.data PASSIVE_INSTANCES_CA: -ACTIVE_INSTANCES_NI: NI # NI.data +ACTIVE_INSTANCES_NI: # NI # NI.data PASSIVE_INSTANCES_NI: # Set optics parameters From 30e554ab55066399289a2442352b36965439f707 Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 18:39:57 +0000 Subject: [PATCH 04/16] Update ufs-weather-model hash --- sorc/checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 3554cd99da..8ad9c5b8f0 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -151,7 +151,7 @@ source "${topdir}/../workflow/gw_setup.sh" # The checkout version should always be a speciifc commit (hash or tag), not a branch errs=0 # Checkout UFS submodules in parallel -checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-4d05445}" "8" ; errs=$((errs + $?)) +checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-63a43d9}" "8" ; errs=$((errs + $?)) # Run all other checkouts simultaneously with just 1 core each to handle submodules. checkout "wxflow" "https://github.com/NOAA-EMC/wxflow" "528f5ab" & From ef68bc88b0dceffbeabd74279f54aa2169f1d10d Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 18:42:23 +0000 Subject: [PATCH 05/16] remove nitrate tracers --- parm/ufs/chem/gocart_tracer.list | 5 ----- 1 file changed, 5 deletions(-) diff --git a/parm/ufs/chem/gocart_tracer.list b/parm/ufs/chem/gocart_tracer.list index 8b0202e2c4..8742aff67c 100644 --- a/parm/ufs/chem/gocart_tracer.list +++ b/parm/ufs/chem/gocart_tracer.list @@ -16,10 +16,5 @@ seas2 seas3 seas4 seas5 -nh3 -nh4a -no3an1 -no3an2 -no3an3 pm25 pm10 From e76a8680dc36efdb77f0b862b88577333e87ef0d Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 18:44:03 +0000 Subject: [PATCH 06/16] comment out nitrogen, left in so if anyone wants to run with it they only need to uncomment --- parm/ufs/fv3/diag_table.aero | 10 +++---- parm/ufs/fv3/field_table.aero | 50 +++++++++++++++++------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/parm/ufs/fv3/diag_table.aero b/parm/ufs/fv3/diag_table.aero index 683c50cc4a..6f96b462f1 100644 --- a/parm/ufs/fv3/diag_table.aero +++ b/parm/ufs/fv3/diag_table.aero @@ -19,10 +19,10 @@ "gfs_dyn", "seas3", "seas3", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "seas4", "seas4", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "seas5", "seas5", "fv3_history", "all", .false., "none", 2 -"gfs_dyn", "nh3", "nh3", "fv3_history", "all", .false., "none", 2 -"gfs_dyn", "nh4a", "nh4a", "fv3_history", "all", .false., "none", 2 -"gfs_dyn", "no3an1", "no3an1", "fv3_history", "all", .false., "none", 2 -"gfs_dyn", "no3an2", "no3an2", "fv3_history", "all", .false., "none", 2 -"gfs_dyn", "no3an3", "no3an3", "fv3_history", "all", .false., "none", 2 +# "gfs_dyn", "nh3", "nh3", "fv3_history", "all", .false., "none", 2 +# "gfs_dyn", "nh4a", "nh4a", "fv3_history", "all", .false., "none", 2 +# "gfs_dyn", "no3an1", "no3an1", "fv3_history", "all", .false., "none", 2 +# "gfs_dyn", "no3an2", "no3an2", "fv3_history", "all", .false., "none", 2 +# "gfs_dyn", "no3an3", "no3an3", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "pm25", "pm25", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "pm10", "pm10", "fv3_history", "all", .false., "none", 2 diff --git a/parm/ufs/fv3/field_table.aero b/parm/ufs/fv3/field_table.aero index d917dd786c..385192803f 100644 --- a/parm/ufs/fv3/field_table.aero +++ b/parm/ufs/fv3/field_table.aero @@ -89,31 +89,31 @@ "units", "ug/kg" "tracer_usage", "chemistry" "profile_type", "fixed", "surface_value=0.0" / - "TRACER", "atmos_mod", "nh3" - "longname", "primary NH3 mixing ratio" - "units", "ug/kg" - "tracer_usage", "chemistry" - "profile_type", "fixed", "surface_value=0.0" / - "TRACER", "atmos_mod", "nh4a" - "longname", "primary NH4a mixing ratio" - "units", "ug/kg" - "tracer_usage", "chemistry" - "profile_type", "fixed", "surface_value=0.0" / - "TRACER", "atmos_mod", "no3an1" - "longname", "primary NO3an1 mixing ratio" - "units", "ug/kg" - "tracer_usage", "chemistry" - "profile_type", "fixed", "surface_value=0.0" / - "TRACER", "atmos_mod", "no3an2" - "longname", "primary NO3an2 mixing ratio" - "units", "ug/kg" - "tracer_usage", "chemistry" - "profile_type", "fixed", "surface_value=0.0" / - "TRACER", "atmos_mod", "no3an3" - "longname", "primary NO3an3 mixing ratio" - "units", "ug/kg" - "tracer_usage", "chemistry" - "profile_type", "fixed", "surface_value=0.0" / +# "TRACER", "atmos_mod", "nh3" +# "longname", "primary NH3 mixing ratio" +# "units", "ug/kg" +# "tracer_usage", "chemistry" +# "profile_type", "fixed", "surface_value=0.0" / +# "TRACER", "atmos_mod", "nh4a" +# "longname", "primary NH4a mixing ratio" +# "units", "ug/kg" +# "tracer_usage", "chemistry" +# "profile_type", "fixed", "surface_value=0.0" / +# "TRACER", "atmos_mod", "no3an1" +# "longname", "primary NO3an1 mixing ratio" +# "units", "ug/kg" +# "tracer_usage", "chemistry" +# "profile_type", "fixed", "surface_value=0.0" / +# "TRACER", "atmos_mod", "no3an2" +# "longname", "primary NO3an2 mixing ratio" +# "units", "ug/kg" +# "tracer_usage", "chemistry" +# "profile_type", "fixed", "surface_value=0.0" / +# "TRACER", "atmos_mod", "no3an3" +# "longname", "primary NO3an3 mixing ratio" +# "units", "ug/kg" +# "tracer_usage", "chemistry" +# "profile_type", "fixed", "surface_value=0.0" / # diagnostic PM tracers "TRACER", "atmos_mod", "pm25" "longname", "primary PM25 mixing ratio" From 32469c2e5447d1077dbd722c27915bf1b9da7fff Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 19:00:01 +0000 Subject: [PATCH 07/16] update scaling factor --- parm/ufs/chem/ExtData.gbbepx | 8 ++++---- parm/ufs/chem/ExtData.qfed | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/parm/ufs/chem/ExtData.gbbepx b/parm/ufs/chem/ExtData.gbbepx index 0661e8412a..3bd516c772 100644 --- a/parm/ufs/chem/ExtData.gbbepx +++ b/parm/ufs/chem/ExtData.gbbepx @@ -2,7 +2,7 @@ # GBBEPx #-------------------------------------------------------------------------------------------------------------------------------- -SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none none SO2 ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc -OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none none OC ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc -BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none none BC ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc -EMI_NH3_BB NA N Y %y4-%m2-%d2t12:00:00 none none NH3 ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc +SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 SO2 ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc +OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 OC ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc +BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 BC ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc +# EMI_NH3_BB NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 NH3 ExtData/nexus/GBBEPx/GBBEPx_all01GRID.emissions_v003_%y4%m2%d2.nc diff --git a/parm/ufs/chem/ExtData.qfed b/parm/ufs/chem/ExtData.qfed index cf15efa960..b3a721211e 100644 --- a/parm/ufs/chem/ExtData.qfed +++ b/parm/ufs/chem/ExtData.qfed @@ -2,7 +2,7 @@ # QFED #-------------------------------------------------------------------------------------------------------------------------------- -SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4 -OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4 -BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4 -# EMI_NH3_BB NA N Y %y4-%m2-%d2t12:00:00 none 0.78 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4 +SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4 +OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4 +BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4 +# EMI_NH3_BB NA N Y %y4-%m2-%d2t12:00:00 none 0.7778 biomass ExtData/nexus/QFED/%y4/%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4 From 6c847640fa7166dd38a96e8445fd036822fd5182 Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Thu, 26 Oct 2023 19:00:33 +0000 Subject: [PATCH 08/16] update fengsha path --- parm/ufs/chem/ExtData.other | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parm/ufs/chem/ExtData.other b/parm/ufs/chem/ExtData.other index ea75aa2244..7dd1bd7a2b 100644 --- a/parm/ufs/chem/ExtData.other +++ b/parm/ufs/chem/ExtData.other @@ -8,12 +8,12 @@ TROPP 'Pa' Y N - 0.0 1.0 #====== Dust Imports ================================================= # FENGSHA input files. Note: regridding should be N or E - Use files with _FillValue != NaN -DU_CLAY '1' Y E - none none clayfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc -DU_SAND '1' Y E - none none sandfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +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 /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc -DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc -DU_UTHRES '1' Y E - none none uthres_bnu /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +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_UTHRES '1' Y E - none none uthres_bnu ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc #====== Sulfate Sources ================================================= # Anthropogenic (BF & FF) emissions -- allowed to input as two layers From 62d23a77df02d94bfd35f7b96ec7fb2d972a0ced Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Tue, 31 Oct 2023 14:43:31 +0000 Subject: [PATCH 09/16] removing nitrates from the cap --- parm/ufs/chem/CAP.rc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/parm/ufs/chem/CAP.rc b/parm/ufs/chem/CAP.rc index d40106ae81..2b8e71975b 100644 --- a/parm/ufs/chem/CAP.rc +++ b/parm/ufs/chem/CAP.rc @@ -64,12 +64,13 @@ CAP_EXPORTS: CA.bcphilic,CA.bc bc2 CA.ocphobic,CA.oc oc1 CA.ocphilic,CA.oc oc2 - NH3,NI nh3 - NH4a,NI nh4a - NO3an1,NI no3an1 - NO3an2,NI no3an2 - NO3an3,NI no3an3 :: +# NH3,NI nh3 +# NH4a,NI nh4a +# NO3an1,NI no3an1 +# NO3an2,NI no3an2 +# NO3an3,NI no3an3 +# :: # Diagnostic Tracers Table (only PM10 & PM25 available) From 0cde37eb65a8c5b2678b20aa245c844ed23f26e7 Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Tue, 31 Oct 2023 14:44:00 +0000 Subject: [PATCH 10/16] Removing nitrates by default from the inst_aod block --- parm/ufs/chem/AERO_HISTORY.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/parm/ufs/chem/AERO_HISTORY.rc b/parm/ufs/chem/AERO_HISTORY.rc index 19f572bb8c..43c2e12a67 100644 --- a/parm/ufs/chem/AERO_HISTORY.rc +++ b/parm/ufs/chem/AERO_HISTORY.rc @@ -388,7 +388,6 @@ PC720x361-DC.LM: 72 inst_aod.fields: 'CA.bcEXTTAU' , 'CA.bc' , 'AOD_BC', 'CA.ocEXTTAU' , 'CA.oc' , 'AOD_OC', 'DUEXTTAU' , 'DU' , 'AOD_DU', - 'NIEXTTAU' , 'NI' , 'AOD_NI', 'SSEXTTAU' , 'SS' , 'AOD_SS', 'SUEXTTAU' , 'SU' , 'AOD_SU', 'TOTEXTTAU' , 'GOCART2G' , 'AOD' , From 51cc5e676d0b18be429b5346f6fc3de8fbecd2fa Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Tue, 31 Oct 2023 14:47:48 +0000 Subject: [PATCH 11/16] correcting uthres variable name --- parm/ufs/chem/ExtData.other | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parm/ufs/chem/ExtData.other b/parm/ufs/chem/ExtData.other index 7dd1bd7a2b..cbde3faef4 100644 --- a/parm/ufs/chem/ExtData.other +++ b/parm/ufs/chem/ExtData.other @@ -8,12 +8,12 @@ TROPP 'Pa' Y N - 0.0 1.0 #====== Dust Imports ================================================= # 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_CLAY '1' Y E - none none clayfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_SAND '1' Y E - none none sandfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/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_UTHRES '1' Y E - none none uthres_bnu ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_SSM '1' Y E - none none sep /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +DU_UTHRES '1' Y E - none none uthres /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc #====== Sulfate Sources ================================================= # Anthropogenic (BF & FF) emissions -- allowed to input as two layers From 08a251d53e310377f6e646f23f35ef41f1eca504 Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Tue, 31 Oct 2023 15:49:03 +0000 Subject: [PATCH 12/16] Add ability to overwrite in AERO_HISTORY --- parm/ufs/chem/AERO_HISTORY.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/ufs/chem/AERO_HISTORY.rc b/parm/ufs/chem/AERO_HISTORY.rc index 43c2e12a67..7aece5b13e 100644 --- a/parm/ufs/chem/AERO_HISTORY.rc +++ b/parm/ufs/chem/AERO_HISTORY.rc @@ -6,7 +6,7 @@ VERSION: 1 EXPID: gocart EXPDSC: GOCART2g_diagnostics_at_c360 EXPSRC: GEOSgcm-v10.16.0 - +Allow_Overwrite: .true. COLLECTIONS: 'inst_aod' # 'inst_du_ss' From 652f2898b8765945d2f5144a8f2613563f43878a Mon Sep 17 00:00:00 2001 From: bbakernoaa Date: Tue, 31 Oct 2023 15:50:44 +0000 Subject: [PATCH 13/16] remove whitespace --- parm/ufs/chem/AERO_HISTORY.rc | 410 +++++++++++++++++----------------- 1 file changed, 205 insertions(+), 205 deletions(-) diff --git a/parm/ufs/chem/AERO_HISTORY.rc b/parm/ufs/chem/AERO_HISTORY.rc index 7aece5b13e..4c7df15b2a 100644 --- a/parm/ufs/chem/AERO_HISTORY.rc +++ b/parm/ufs/chem/AERO_HISTORY.rc @@ -25,7 +25,7 @@ COLLECTIONS: 'inst_aod' # 'tavg_du_bin' # 'tavg_2d_rad' # 'tavg_3d_rad' - :: + :: ################################################## # The GRID_LABELS section must be after the main # @@ -63,8 +63,8 @@ PC720x361-DC.LM: 72 inst_du_ss.ref_time: 000000 , inst_du_ss.nbits: 10, inst_du_ss.fields: 'DU' , 'DU' , - 'SS' , 'SS' , - :: + 'SS' , 'SS' , + :: tavg_du_ss.format: 'CFIO' , tavg_du_ss.descr: '3d,Hourly,Instantaneous,Model-Level,Aerosol Concentrations', @@ -77,8 +77,8 @@ PC720x361-DC.LM: 72 tavg_du_ss.ref_time: 000000 , tavg_du_ss.nbits: 10, tavg_du_ss.fields: 'DU' , 'DU' , - 'SS' , 'SS' , - :: + 'SS' , 'SS' , + :: inst_ca.format: 'CFIO' , inst_ca.descr: '3d,Hourly,Instantaneous,Model-Level,Aerosol Concentrations', @@ -90,10 +90,10 @@ PC720x361-DC.LM: 72 inst_ca.ref_time: 000000 , inst_ca.nbits: 10, inst_ca.fields: 'CAphilicCA.bc' , 'CA.bc' , - 'CAphobicCA.bc' , 'CA.bc' , - 'CAphilicCA.oc' , 'CA.oc' , - 'CAphobicCA.oc' , 'CA.oc' , - :: + 'CAphobicCA.bc' , 'CA.bc' , + 'CAphilicCA.oc' , 'CA.oc' , + 'CAphobicCA.oc' , 'CA.oc' , + :: inst_ni.format: 'CFIO' , inst_ni.descr: '3d,Hourly,Instantaneous,Model-Level,Aerosol Concentrations', @@ -105,11 +105,11 @@ PC720x361-DC.LM: 72 inst_ni.ref_time: 000000 , inst_ni.nbits: 10, inst_ni.fields: 'NH3' , 'NI' , - 'NH4a' , 'NI' , - 'NO3an1' , 'NI' , - 'NO3an2' , 'NI' , - 'NO3an3' , 'NI' , - :: + 'NH4a' , 'NI' , + 'NO3an1' , 'NI' , + 'NO3an2' , 'NI' , + 'NO3an3' , 'NI' , + :: inst_su.format: 'CFIO' , inst_su.descr: '3d,Hourly,Instantaneous,Model-Level,Aerosol Concentrations', @@ -121,10 +121,10 @@ PC720x361-DC.LM: 72 inst_su.ref_time: 000000 , inst_su.nbits: 10, inst_su.fields: 'DMS' , 'SU' , - 'SO2' , 'SU' , - 'SO4' , 'SU' , - 'MSA' , 'SU' , - :: + 'SO2' , 'SU' , + 'SO4' , 'SU' , + 'MSA' , 'SU' , + :: # # Binned aerosols # @@ -140,11 +140,11 @@ PC720x361-DC.LM: 72 inst_du_bin.ref_time: 000000 , inst_du_bin.nbits: 10, inst_du_bin.fields: 'DUEM' , 'DU' , - 'DUSD' , 'DU' , - 'DUDP' , 'DU' , - 'DUWT' , 'DU' , - 'DUSV' , 'DU' , - :: + 'DUSD' , 'DU' , + 'DUDP' , 'DU' , + 'DUWT' , 'DU' , + 'DUSV' , 'DU' , + :: tavg_du_bin.format: 'CFIO' , tavg_du_bin.descr: '2d,Hourly,Instantaneous' @@ -157,11 +157,11 @@ PC720x361-DC.LM: 72 tavg_du_bin.ref_time: 000000 , tavg_du_bin.nbits: 10, tavg_du_bin.fields: 'DUEM' , 'DU' , - 'DUSD' , 'DU' , - 'DUDP' , 'DU' , - 'DUWT' , 'DU' , - 'DUSV' , 'DU' , - :: + 'DUSD' , 'DU' , + 'DUDP' , 'DU' , + 'DUWT' , 'DU' , + 'DUSV' , 'DU' , + :: inst_ss_bin.format: 'CFIO' , inst_ss_bin.descr: '2d,Hourly,Instantaneous' @@ -174,11 +174,11 @@ PC720x361-DC.LM: 72 inst_ss_bin.ref_time: 000000 , inst_ss_bin.nbits: 10, inst_ss_bin.fields: 'SSEM' , 'SS' , - 'SSSD' , 'SS' , - 'SSDP' , 'SS' , - 'SSWT' , 'SS' , - 'SSSV' , 'SS' , - :: + 'SSSD' , 'SS' , + 'SSDP' , 'SS' , + 'SSWT' , 'SS' , + 'SSSV' , 'SS' , + :: inst_ca_bin.format: 'CFIO' , inst_ca_bin.descr: '3d,Hourly,Instantaneous,Model-Level' @@ -191,16 +191,16 @@ PC720x361-DC.LM: 72 inst_ca_bin.ref_time: 000000 , inst_ca_bin.nbits: 10, inst_ca_bin.fields: 'CAEMCA.bc' , 'CA.bc' , - 'CAEMCA.oc' , 'CA.oc' , - 'CASDCA.bc' , 'CA.bc' , - 'CASDCA.oc' , 'CA.oc' , - 'CADPCA.bc' , 'CA.bc' , - 'CADPCA.oc' , 'CA.oc' , - 'CAWTCA.bc' , 'CA.bc' , - 'CAWTCA.oc' , 'CA.oc' , - 'CASVCA.bc' , 'CA.bc' , - 'CASVCA.oc' , 'CA.oc' , - :: + 'CAEMCA.oc' , 'CA.oc' , + 'CASDCA.bc' , 'CA.bc' , + 'CASDCA.oc' , 'CA.oc' , + 'CADPCA.bc' , 'CA.bc' , + 'CADPCA.oc' , 'CA.oc' , + 'CAWTCA.bc' , 'CA.bc' , + 'CAWTCA.oc' , 'CA.oc' , + 'CASVCA.bc' , 'CA.bc' , + 'CASVCA.oc' , 'CA.oc' , + :: inst_ni_bin.format: 'CFIO' , inst_ni_bin.descr: '3d,Hourly,Instantaneous,Model-Level' @@ -213,11 +213,11 @@ PC720x361-DC.LM: 72 inst_ni_bin.ref_time: 000000 , inst_ni_bin.nbits: 10, inst_ni_bin.fields: 'NIHT' , 'NI' , - 'NISD' , 'NI' , - 'NIDP' , 'NI' , - 'NIWT' , 'NI' , - 'NISV' , 'NI' , - :: + 'NISD' , 'NI' , + 'NIDP' , 'NI' , + 'NIWT' , 'NI' , + 'NISV' , 'NI' , + :: inst_su_bin.format: 'CFIO' , inst_su_bin.descr: '3d,Hourly,Instantaneous,Model-Level' @@ -230,11 +230,11 @@ PC720x361-DC.LM: 72 inst_su_bin.ref_time: 000000 , inst_su_bin.nbits: 10, inst_su_bin.fields: 'SUEM' , 'SU', - 'SUSD' , 'SU', - 'SUDP' , 'SU', - 'SUWT' , 'SU', - 'SUSV' , 'SU', - :: + 'SUSD' , 'SU', + 'SUDP' , 'SU', + 'SUWT' , 'SU', + 'SUSV' , 'SU', + :: # # Other 2d diagnostics @@ -249,92 +249,92 @@ PC720x361-DC.LM: 72 inst_2d.ref_time: 000000, inst_2d.grid_label: PC720x361-DC inst_2d.fields: 'DUSMASS' , 'DU' , - 'DUCMASS' , 'DU' , - 'DUSMASS25' , 'DU' , - 'DUCMASS25' , 'DU' , - 'DUAERIDX' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , - 'DUANGSTR' , 'DU' , - 'SSSMASS' , 'SS' , - 'SSCMASS' , 'SS' , - 'SSSMASS25' , 'SS' , - 'SSCMASS25' , 'SS' , - 'SSAERIDX' , 'SS' , - 'SSANGSTR' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , - 'CAEMANCA.bc' , 'CA.bc' , - 'CAEMANCA.oc' , 'CA.oc' , - 'CAEMBBCA.bc' , 'CA.bc' , - 'CAEMBBCA.oc' , 'CA.oc' , - 'CAEMBFCA.bc' , 'CA.bc' , - 'CAEMBFCA.oc' , 'CA.oc' , - 'CAEMBGCA.bc' , 'CA.bc' , - 'CAEMBGCA.oc' , 'CA.oc' , - 'CAHYPHILCA.bc' , 'CA.bc' , - 'CAHYPHILCA.oc' , 'CA.oc' , - 'CAPSOACA.bc' , 'CA.bc' , - 'CAPSOACA.oc' , 'CA.oc' , - 'CASMASSCA.bc' , 'CA.bc' , - 'CASMASSCA.oc' , 'CA.oc' , - 'CACMASSCA.bc' , 'CA.bc' , - 'CACMASSCA.oc' , 'CA.oc' , - 'CAANGSTRCA.bc' , 'CA.bc' , - 'CAANGSTRCA.oc' , 'CA.oc' , - 'CAFLUXUCA.bc' , 'CA.bc' , - 'CAFLUXUCA.oc' , 'CA.oc' , - 'CAFLUXVCA.bc' , 'CA.bc' , - 'CAFLUXVCA.oc' , 'CA.oc' , - 'CAAERIDXCA.bc' , 'CA.bc' , - 'CAAERIDXCA.oc' , 'CA.oc' , - 'NIPNO3AQ' , 'NI' , - 'NIPNH4AQ' , 'NI' , - 'NIPNH3AQ' , 'NI' , - 'NH3EM' , 'NI' , - 'NH3DP' , 'NI' , - 'NH3WT' , 'NI' , - 'NH3SV' , 'NI' , - 'NH4SD' , 'NI' , - 'NH4DP' , 'NI' , - 'NH4WT' , 'NI' , - 'NH4SV' , 'NI' , - 'HNO3SMASS' , 'NI' , - 'NH3SMASS' , 'NI' , - 'NH4SMASS' , 'NI' , - 'NISMASS' , 'NI' , - 'NISMASS25' , 'NI' , - 'HNO3CMASS' , 'NI' , - 'NH3CMASS' , 'NI' , - 'NH4CMASS' , 'NI' , - 'NICMASS' , 'NI' , - 'NICMASS25' , 'NI' , - 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , - 'SUPSO2' , 'SU' , - 'SUPSO4' , 'SU' , - 'SUPSO4G' , 'SU' , - 'SUPSO4AQ' , 'SU' , - 'SUPSO4WT' , 'SU' , - 'SUPMSA' , 'SU' , - 'SO2SMASS' , 'SU' , - 'SO2CMASS' , 'SU' , - 'SO4SMASS' , 'SU' , - 'SO4CMASS' , 'SU' , - 'DMSSMASS' , 'SU' , - 'DMSCMASS' , 'SU' , - 'MSASMASS' , 'SU' , - 'MSACMASS' , 'SU' , - 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , - 'SO4EMAN' , 'SU' , - 'SO2EMAN' , 'SU' , - 'SO2EMBB' , 'SU' , - 'SO2EMVN' , 'SU' , - 'SO2EMVE' , 'SU' , - :: + 'DUCMASS' , 'DU' , + 'DUSMASS25' , 'DU' , + 'DUCMASS25' , 'DU' , + 'DUAERIDX' , 'DU' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , + 'DUANGSTR' , 'DU' , + 'SSSMASS' , 'SS' , + 'SSCMASS' , 'SS' , + 'SSSMASS25' , 'SS' , + 'SSCMASS25' , 'SS' , + 'SSAERIDX' , 'SS' , + 'SSANGSTR' , 'SS' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , + 'CAEMANCA.bc' , 'CA.bc' , + 'CAEMANCA.oc' , 'CA.oc' , + 'CAEMBBCA.bc' , 'CA.bc' , + 'CAEMBBCA.oc' , 'CA.oc' , + 'CAEMBFCA.bc' , 'CA.bc' , + 'CAEMBFCA.oc' , 'CA.oc' , + 'CAEMBGCA.bc' , 'CA.bc' , + 'CAEMBGCA.oc' , 'CA.oc' , + 'CAHYPHILCA.bc' , 'CA.bc' , + 'CAHYPHILCA.oc' , 'CA.oc' , + 'CAPSOACA.bc' , 'CA.bc' , + 'CAPSOACA.oc' , 'CA.oc' , + 'CASMASSCA.bc' , 'CA.bc' , + 'CASMASSCA.oc' , 'CA.oc' , + 'CACMASSCA.bc' , 'CA.bc' , + 'CACMASSCA.oc' , 'CA.oc' , + 'CAANGSTRCA.bc' , 'CA.bc' , + 'CAANGSTRCA.oc' , 'CA.oc' , + 'CAFLUXUCA.bc' , 'CA.bc' , + 'CAFLUXUCA.oc' , 'CA.oc' , + 'CAFLUXVCA.bc' , 'CA.bc' , + 'CAFLUXVCA.oc' , 'CA.oc' , + 'CAAERIDXCA.bc' , 'CA.bc' , + 'CAAERIDXCA.oc' , 'CA.oc' , + 'NIPNO3AQ' , 'NI' , + 'NIPNH4AQ' , 'NI' , + 'NIPNH3AQ' , 'NI' , + 'NH3EM' , 'NI' , + 'NH3DP' , 'NI' , + 'NH3WT' , 'NI' , + 'NH3SV' , 'NI' , + 'NH4SD' , 'NI' , + 'NH4DP' , 'NI' , + 'NH4WT' , 'NI' , + 'NH4SV' , 'NI' , + 'HNO3SMASS' , 'NI' , + 'NH3SMASS' , 'NI' , + 'NH4SMASS' , 'NI' , + 'NISMASS' , 'NI' , + 'NISMASS25' , 'NI' , + 'HNO3CMASS' , 'NI' , + 'NH3CMASS' , 'NI' , + 'NH4CMASS' , 'NI' , + 'NICMASS' , 'NI' , + 'NICMASS25' , 'NI' , + 'NIANGSTR' , 'NI' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , + 'SUPSO2' , 'SU' , + 'SUPSO4' , 'SU' , + 'SUPSO4G' , 'SU' , + 'SUPSO4AQ' , 'SU' , + 'SUPSO4WT' , 'SU' , + 'SUPMSA' , 'SU' , + 'SO2SMASS' , 'SU' , + 'SO2CMASS' , 'SU' , + 'SO4SMASS' , 'SU' , + 'SO4CMASS' , 'SU' , + 'DMSSMASS' , 'SU' , + 'DMSCMASS' , 'SU' , + 'MSASMASS' , 'SU' , + 'MSACMASS' , 'SU' , + 'SUANGSTR' , 'SU' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , + 'SO4EMAN' , 'SU' , + 'SO2EMAN' , 'SU' , + 'SO2EMBB' , 'SU' , + 'SO2EMVN' , 'SU' , + 'SO2EMVE' , 'SU' , + :: # # 3d diagnostics @@ -348,30 +348,30 @@ PC720x361-DC.LM: 72 inst_3d.ref_time: 000000, inst_3d.grid_label: PC720x361-DC inst_3d.fields: 'DUMASS' , 'DU', - 'DUMASS25' , 'DU', - 'DUCONC' , 'DU', - 'SSMASS' , 'SS', - 'SSMASS25' , 'SS', - 'SSCONC' , 'SS', - 'CAMASSCA.bc' , 'CA.bc' , - 'CACONCCA.bc' , 'CA.bc' , - 'CAMASSCA.oc' , 'CA.oc' , - 'CACONCCA.oc' , 'CA.oc' , - 'SO4MASS' , 'SU', - 'SO4SAREA' , 'SU', - 'SO4SNUM' , 'SU', - 'SUCONC' , 'SU', - 'PSO2' , 'SU', - 'PMSA' , 'SU', - 'PSO4' , 'SU', - 'PSO4G' , 'SU', - 'PSO4WET' , 'SU', - 'PSO4AQ' , 'SU', - 'DMS' , 'SU', - 'SO2' , 'SU', - 'SO4' , 'SU', - 'MSA' , 'SU', - :: + 'DUMASS25' , 'DU', + 'DUCONC' , 'DU', + 'SSMASS' , 'SS', + 'SSMASS25' , 'SS', + 'SSCONC' , 'SS', + 'CAMASSCA.bc' , 'CA.bc' , + 'CACONCCA.bc' , 'CA.bc' , + 'CAMASSCA.oc' , 'CA.oc' , + 'CACONCCA.oc' , 'CA.oc' , + 'SO4MASS' , 'SU', + 'SO4SAREA' , 'SU', + 'SO4SNUM' , 'SU', + 'SUCONC' , 'SU', + 'PSO2' , 'SU', + 'PMSA' , 'SU', + 'PSO4' , 'SU', + 'PSO4G' , 'SU', + 'PSO4WET' , 'SU', + 'PSO4AQ' , 'SU', + 'DMS' , 'SU', + 'SO2' , 'SU', + 'SO4' , 'SU', + 'MSA' , 'SU', + :: # @@ -386,12 +386,12 @@ PC720x361-DC.LM: 72 inst_aod.ref_time: 000000, inst_aod.grid_label: PC720x361-DC inst_aod.fields: 'CA.bcEXTTAU' , 'CA.bc' , 'AOD_BC', - 'CA.ocEXTTAU' , 'CA.oc' , 'AOD_OC', - 'DUEXTTAU' , 'DU' , 'AOD_DU', - 'SSEXTTAU' , 'SS' , 'AOD_SS', - 'SUEXTTAU' , 'SU' , 'AOD_SU', - 'TOTEXTTAU' , 'GOCART2G' , 'AOD' , - :: + 'CA.ocEXTTAU' , 'CA.oc' , 'AOD_OC', + 'DUEXTTAU' , 'DU' , 'AOD_DU', + 'SSEXTTAU' , 'SS' , 'AOD_SS', + 'SUEXTTAU' , 'SU' , 'AOD_SU', + 'TOTEXTTAU' , 'GOCART2G' , 'AOD' , + :: tavg_2d_rad.format: 'CFIO' , @@ -403,30 +403,30 @@ PC720x361-DC.LM: 72 tavg_2d_rad.ref_time: 000000, tavg_2d_rad.grid_label: PC720x361-DC tavg_2d_rad.fields: 'CA.bcEXTTAU' , 'CA.bc' , - 'CA.ocEXTTAU' , 'CA.oc' , - 'CASCATAUCA.bc' , 'CA.bc' , - 'CASCATAUCA.oc' , 'CA.oc' , - 'DUEXTTAU' , 'DU' , - 'DUSCATAU' , 'DU' , - 'DUEXTT25' , 'DU' , - 'DUSCAT25' , 'DU' , - 'DUEXTTFM' , 'DU' , - 'DUSCATFM' , 'DU' , - 'NIEXTTFM' , 'NI' , - 'NISCATFM' , 'NI' , - 'NIEXTT25' , 'NI' , - 'NISCAT25' , 'NI' , - 'NIEXTTAU' , 'NI' , - 'NISCATAU' , 'NI' , - 'SSEXTTAU' , 'SS' , - 'SSSCATAU' , 'SS' , - 'SSEXTT25' , 'SS' , - 'SSSCAT25' , 'SS' , - 'SSEXTTFM' , 'SS' , - 'SSSCATFM' , 'SS' , - 'SUEXTTAU' , 'SU' , - 'SUSCATAU' , 'SU' , - :: + 'CA.ocEXTTAU' , 'CA.oc' , + 'CASCATAUCA.bc' , 'CA.bc' , + 'CASCATAUCA.oc' , 'CA.oc' , + 'DUEXTTAU' , 'DU' , + 'DUSCATAU' , 'DU' , + 'DUEXTT25' , 'DU' , + 'DUSCAT25' , 'DU' , + 'DUEXTTFM' , 'DU' , + 'DUSCATFM' , 'DU' , + 'NIEXTTFM' , 'NI' , + 'NISCATFM' , 'NI' , + 'NIEXTT25' , 'NI' , + 'NISCAT25' , 'NI' , + 'NIEXTTAU' , 'NI' , + 'NISCATAU' , 'NI' , + 'SSEXTTAU' , 'SS' , + 'SSSCATAU' , 'SS' , + 'SSEXTT25' , 'SS' , + 'SSSCAT25' , 'SS' , + 'SSEXTTFM' , 'SS' , + 'SSSCATFM' , 'SS' , + 'SUEXTTAU' , 'SU' , + 'SUSCATAU' , 'SU' , + :: tavg_3d_rad.format: 'CFIO' , tavg_3d_rad.template: '%y4%m2%d2_%h2%n2z.nc4', @@ -438,15 +438,15 @@ PC720x361-DC.LM: 72 tavg_3d_rad.grid_label: PC720x361-DC tavg_3d_rad.splitField: 1, tavg_3d_rad.fields: 'CAEXTCOEFCA.bc' , 'CA.bc' , - 'CAEXTCOEFCA.oc' , 'CA.oc' , - 'CASCACOEFCA.bc' , 'CA.bc' , - 'CASCACOEFCA.oc' , 'CA.oc' , - 'DUEXTCOEF' , 'DU' , - 'DUSCACOEF' , 'DU' , - 'NIEXTCOEF' , 'NI' , - 'NISCACOEF' , 'NI' , - 'SSEXTCOEF' , 'SS' , - 'SSSCACOEF' , 'SS' , - 'SUEXTCOEF' , 'SU' , - 'SUSCACOEF' , 'SU' , - :: + 'CAEXTCOEFCA.oc' , 'CA.oc' , + 'CASCACOEFCA.bc' , 'CA.bc' , + 'CASCACOEFCA.oc' , 'CA.oc' , + 'DUEXTCOEF' , 'DU' , + 'DUSCACOEF' , 'DU' , + 'NIEXTCOEF' , 'NI' , + 'NISCACOEF' , 'NI' , + 'SSEXTCOEF' , 'SS' , + 'SSSCACOEF' , 'SS' , + 'SUEXTCOEF' , 'SU' , + 'SUSCACOEF' , 'SU' , + :: From be26458269fd4b5174773de9c60dd27d8919b2c7 Mon Sep 17 00:00:00 2001 From: Barry Baker Date: Mon, 6 Nov 2023 13:07:26 -0600 Subject: [PATCH 14/16] update to latest hash --- sorc/checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index a756c8d040..15f89c80db 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -151,7 +151,7 @@ source "${topdir}/../workflow/gw_setup.sh" # The checkout version should always be a speciifc commit (hash or tag), not a branch errs=0 # Checkout UFS submodules in parallel -checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-68050e5}" "8" ; errs=$((errs + $?)) +checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-4513c26}" "8" ; errs=$((errs + $?)) # Run all other checkouts simultaneously with just 1 core each to handle submodules. checkout "wxflow" "https://github.com/NOAA-EMC/wxflow" "528f5ab" & From d35f88ae86a879898d636fec445bc856aa9926e2 Mon Sep 17 00:00:00 2001 From: Barry Baker Date: Mon, 6 Nov 2023 14:47:55 -0600 Subject: [PATCH 15/16] updating to none user path --- parm/ufs/chem/ExtData.other | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parm/ufs/chem/ExtData.other b/parm/ufs/chem/ExtData.other index cbde3faef4..789576305e 100644 --- a/parm/ufs/chem/ExtData.other +++ b/parm/ufs/chem/ExtData.other @@ -8,12 +8,12 @@ TROPP 'Pa' Y N - 0.0 1.0 #====== Dust Imports ================================================= # FENGSHA input files. Note: regridding should be N or E - Use files with _FillValue != NaN -DU_CLAY '1' Y E - none none clayfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc -DU_SAND '1' Y E - none none sandfrac /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +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 /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc -DU_RDRAG '1' Y E %y4-%m2-%d2t12:00:00 none none albedo_drag /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc -DU_UTHRES '1' Y E - none none uthres /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc +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_UTHRES '1' Y E - none none uthres ExtData/nexus/FENGSHA/FENGSHA_2022_NESDIS_inputs_10km_v3.2.nc #====== Sulfate Sources ================================================= # Anthropogenic (BF & FF) emissions -- allowed to input as two layers From f791ff9870a2fc0987ea50e70df6337027be037b Mon Sep 17 00:00:00 2001 From: Barry Baker Date: Mon, 6 Nov 2023 15:23:06 -0600 Subject: [PATCH 16/16] roll back to 63a43d9 when gocart update was merged --- Externals.cfg | 2 +- sorc/checkout.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index d33951b5c9..e5d7c0d8c9 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -8,7 +8,7 @@ protocol = git required = True [UFS] -tag = 4513c26 +tag = 63a43d9 local_path = sorc/ufs_model.fd repo_url = https://github.com/ufs-community/ufs-weather-model.git protocol = git diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 15f89c80db..382e7b6f32 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -151,7 +151,7 @@ source "${topdir}/../workflow/gw_setup.sh" # The checkout version should always be a speciifc commit (hash or tag), not a branch errs=0 # Checkout UFS submodules in parallel -checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-4513c26}" "8" ; errs=$((errs + $?)) +checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-63a43d9}" "8" ; errs=$((errs + $?)) # Run all other checkouts simultaneously with just 1 core each to handle submodules. checkout "wxflow" "https://github.com/NOAA-EMC/wxflow" "528f5ab" &