From 52218f658ca45d296079effa496ef29ad64fb328 Mon Sep 17 00:00:00 2001 From: acollow Date: Fri, 19 Jul 2024 11:27:34 -0400 Subject: [PATCH 01/13] Addresses the incorrect seasonal cycle in the CEDS emissions for the current x run testing --- CHANGELOG.md | 1 + .../AMIP.20C/CA2G_GridComp_ExtData.rc | 16 ++++++++-------- .../CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc | 16 ++++++++-------- .../AMIP/CA2G_GridComp_ExtData.yaml | 16 ++++++++-------- .../CA2G_GridComp/CA2G_GridComp_ExtData.rc | 16 ++++++++-------- .../CA2G_GridComp/CA2G_GridComp_ExtData.yaml | 16 ++++++++-------- .../AMIP.20C/NI2G_GridComp_ExtData.rc | 2 +- .../NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc | 2 +- .../AMIP/NI2G_GridComp_ExtData.yaml | 2 +- .../NI2G_GridComp/NI2G_GridComp_ExtData.rc | 2 +- .../NI2G_GridComp/NI2G_GridComp_ExtData.yaml | 2 +- .../AMIP.20C/SU2G_GridComp_ExtData.rc | 10 +++++----- .../SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc | 10 +++++----- .../SU2G_GridComp/SU2G_GridComp_ExtData.rc | 10 +++++----- .../SU2G_GridComp/SU2G_GridComp_ExtData.yaml | 10 +++++----- 15 files changed, 66 insertions(+), 65 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25023cc6..3385d50a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +-Filepath for CEDS has been updated in the ExtData yaml and rc files. Note the old version had an incorrect seasonal cycle. ## [v2.2.1] - 2023-05-30 diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc index 736a0008..b11995c1 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc @@ -54,14 +54,14 @@ OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null OC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -OC_ANTEOC1 NA N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -OC_ANTEOC2 NA N Y %y4-%m2-%d2t12:00:00 none none oc_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +OC_ANTEOC1 NA N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +OC_ANTEOC2 NA N Y %y4-%m2-%d2t12:00:00 none none oc_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # EDGAR based ship emissions -OC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none oc_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +OC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none oc_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -OC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +OC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # Aviation emissions during the three phases of flight OC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null @@ -81,14 +81,14 @@ BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/HFE BC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -BC_ANTEBC1 NA N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -BC_ANTEBC2 NA N Y %y4-%m2-%d2t12:00:00 none none bc_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +BC_ANTEBC1 NA N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +BC_ANTEBC2 NA N Y %y4-%m2-%d2t12:00:00 none none bc_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # EDGAR based ship emissions -BC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none bc_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +BC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none bc_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -BC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +BC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # Aviation emissions during the LTO, SDC and CRS phases of flight BC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc index 43ed7284..84426bd3 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc @@ -54,14 +54,14 @@ OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null OC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -OC_ANTEOC1 NA N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -OC_ANTEOC2 NA N Y %y4-%m2-%d2t12:00:00 none none oc_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +OC_ANTEOC1 NA N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +OC_ANTEOC2 NA N Y %y4-%m2-%d2t12:00:00 none none oc_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # EDGAR based ship emissions -OC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none oc_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +OC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none oc_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -OC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +OC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # Aviation emissions during the three phases of flight OC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null @@ -81,14 +81,14 @@ BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFE BC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -BC_ANTEBC1 NA N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -BC_ANTEBC2 NA N Y %y4-%m2-%d2t12:00:00 none none bc_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +BC_ANTEBC1 NA N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +BC_ANTEBC2 NA N Y %y4-%m2-%d2t12:00:00 none none bc_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # EDGAR based ship emissions -BC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none bc_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +BC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none bc_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -BC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +BC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # Aviation emissions during the LTO, SDC and CRS phases of flight BC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml index c25be12c..6b4637dd 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml @@ -1,20 +1,20 @@ Collections: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4: template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00" diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc index cd44f28d..1020ab94 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc @@ -54,14 +54,14 @@ OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null OC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -OC_ANTEOC1 NA N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -OC_ANTEOC2 NA N Y %y4-%m2-%d2t12:00:00 none none oc_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +OC_ANTEOC1 NA N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +OC_ANTEOC2 NA N Y %y4-%m2-%d2t12:00:00 none none oc_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # EDGAR based ship emissions -OC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none oc_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +OC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none oc_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -OC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +OC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # Aviation emissions during the three phases of flight OC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null @@ -81,14 +81,14 @@ BC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFE BC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -BC_ANTEBC1 NA N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -BC_ANTEBC2 NA N Y %y4-%m2-%d2t12:00:00 none none bc_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +BC_ANTEBC1 NA N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +BC_ANTEBC2 NA N Y %y4-%m2-%d2t12:00:00 none none bc_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # EDGAR based ship emissions -BC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none bc_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +BC_SHIP NA N Y %y4-%m2-%d2t12:00:00 none none bc_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -BC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +BC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # Aviation emissions during the LTO, SDC and CRS phases of flight BC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml index 24c7a8e3..fa96c6a9 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml @@ -1,20 +1,20 @@ Collections: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4: template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00" diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc index d09decb3..b4658a98 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc @@ -12,7 +12,7 @@ climNO3an3 'kg kg-1' N Y F0 none none NO3AN3 /dev/null # ======= Nitrate Sources ======== EMI_NH3_BB 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none 0.778 biomass ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_nh3.x576_y361_t14.%y4.nc4 EMI_NH3_AG 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null -EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2t12:00:00 none none nh3 ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 +EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2t12:00:00 none none nh3 ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 EMI_NH3_IN 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null EMI_NH3_RE 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null EMI_NH3_TR 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc index 549bdca2..5e741b47 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc @@ -12,7 +12,7 @@ climNO3an3 'kg kg-1' N Y F0 none none NO3AN3 /dev/null # ======= Nitrate Sources ======== EMI_NH3_BB 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.061.%y4%m2%d2.nc4 EMI_NH3_AG 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null -EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2t12:00:00 none none nh3 ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 +EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2t12:00:00 none none nh3 ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 EMI_NH3_IN 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null EMI_NH3_RE 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null EMI_NH3_TR 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml index e7596eed..0e2ff7a2 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml @@ -6,7 +6,7 @@ Collections: NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4: template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4: template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.061.%y4%m2%d2.nc4 valid_range: "2000-02-29T12:00/2025-01-01" diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc index 2b571336..d7030101 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc @@ -12,7 +12,7 @@ climNO3an3 'kg kg-1' N Y F0 none none NO3AN3 /dev/null # ======= Nitrate Sources ======== EMI_NH3_BB 'kg m-2 s-1' N Y %y4-%m2-%d2T12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4 EMI_NH3_AG 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null -EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2t12:00:00 none none nh3 ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 +EMI_NH3_EN 'kg m-2 s-1' N Y %y4-%m2-%d2t12:00:00 none none nh3 ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 EMI_NH3_IN 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null EMI_NH3_RE 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null EMI_NH3_TR 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none nh3_emis /dev/null diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml index 9a05461a..6ea96d38 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml @@ -6,7 +6,7 @@ Collections: NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4: template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 NI2G_qfed2.emis_nh3.006.%y4%m2%d2.nc4: template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4 valid_range: "2014-12-01T12:00/2021-11-01T12:00" diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc index ea89f3a1..32be8f94 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc @@ -36,15 +36,15 @@ climSUSV004 'kg m-2 s-1' Y N 0 0.0 1.0 SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_so2.x576_y361_t14.%y4.nc4 # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -SU_ANTHROL1 NA N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -SU_ANTHROL2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +SU_ANTHROL1 NA N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +SU_ANTHROL2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # Ship emissions -SU_SHIPSO2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 -SU_SHIPSO4 NA N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +SU_SHIPSO2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +SU_SHIPSO4 NA N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -SU_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none so2_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +SU_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none so2_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # DMS concentration SU_DMSO NA Y Y %y4-%m2-%d2t12:00:00 none none conc ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4 diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc index 7f5a9e02..cfd0a2cd 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc @@ -36,15 +36,15 @@ climSUSV004 'kg m-2 s-1' Y N 0 0.0 1.0 SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.061.%y4%m2%d2.nc4 # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -SU_ANTHROL1 NA N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -SU_ANTHROL2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +SU_ANTHROL1 NA N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +SU_ANTHROL2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # Ship emissions -SU_SHIPSO2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 -SU_SHIPSO4 NA N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +SU_SHIPSO2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +SU_SHIPSO4 NA N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -SU_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none so2_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +SU_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none so2_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # DMS concentration SU_DMSO NA Y Y %y4-%m2-%d2t12:00:00 none none conc ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4 diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc index d5ef60c0..926803f4 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc @@ -36,15 +36,15 @@ climSUSV004 'kg m-2 s-1' Y N 0 0.0 1.0 SU_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4 # Anthropogenic (BF & FF) emissions -- allowed to input as two layers -SU_ANTHROL1 NA N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 -SU_ANTHROL2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_energy ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 +SU_ANTHROL1 NA N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 +SU_ANTHROL2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_energy ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 # Ship emissions -SU_SHIPSO2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 -SU_SHIPSO4 NA N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +SU_SHIPSO2 NA N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 +SU_SHIPSO4 NA N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 # Aircraft fuel consumption -SU_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none so2_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 +SU_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none so2_aviation ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 # DMS concentration SU_DMSO NA Y Y %y4-%m2-%d2t12:00:00 none none conc ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4 diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml index dbb6c462..cc390467 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml @@ -4,15 +4,15 @@ Collections: SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4: template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 + template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4: template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00" From adf0c5d0467c5178d12c57030c58ca2aba60f697 Mon Sep 17 00:00:00 2001 From: acollow Date: Fri, 18 Aug 2023 13:30:18 -0400 Subject: [PATCH 02/13] updates state specs --- CHANGELOG.md | 6 +++- .../CA2G_GridComp/CA2G_StateSpecs.rc | 8 +++--- .../DU2G_GridComp/DU2G_StateSpecs.rc | 20 ++++++------- ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc | 28 +++++++++---------- .../NI2G_GridComp/NI2G_StateSpecs.rc | 24 ++++++++-------- .../SS2G_GridComp/SS2G_StateSpecs.rc | 22 +++++++-------- .../SU2G_GridComp/SU2G_StateSpecs.rc | 8 +++--- 7 files changed, 60 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3385d50a..b241cf98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,14 +5,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [Unreleased] - feature/acollow/#233_aodlongnames ### Fixed ### Added ### Changed +<<<<<<< HEAD -Filepath for CEDS has been updated in the ExtData yaml and rc files. Note the old version had an incorrect seasonal cycle. +======= +State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that the long names for AOD are more intuitive +>>>>>>> 3bb515b (state spec RC files for GOCART2G, CA, DU, NI, SU, and SS are updated to make AOD long names more intuitive for users, addressing issue #233) ## [v2.2.1] - 2023-05-30 diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc index de20e655..f0fe0eb4 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc @@ -97,10 +97,10 @@ category: EXPORT *PSOA | kg m-2 s-1 | xy | N | | * Aerosol SOA Production *SMASS | kg m-3 | xy | N | | * Aerosol Surface Mass Concentration *CMASS | kg m-2 | xy | N | | * Aerosol Column Mass Density - *EXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | * Aerosol Extinction AOT - *STEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | * Aerosol Extinction AOT Stratosphere - *SCATAU | 1 | xy | N | size(self%wavelengths_vertint) | * Aerosol Scattering AOT - *STSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | * Aerosol Scattering AOT Stratosphere + *EXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | * Aerosol Optical Depth + *STEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | * Stratospheric Aerosol Optical Thickness + *SCATAU | 1 | xy | N | size(self%wavelengths_vertint) | * Aerosol Optical Depth Due to Scattering + *STSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | * Stratospheric Aerosol Optical Thickness Due to Scattering *ANGSTR | 1 | xy | N | | * Aerosol Angstrom parameter [470-870 nm] *FLUXU | kg m-1 s-1 | xy | N | | * Aerosol column u-wind mass flux *FLUXV | kg m-1 s-1 | xy | N | | * Aerosol column v-wind mass flux diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc index a53bdd55..d5fc35fc 100644 --- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc @@ -71,19 +71,19 @@ category: EXPORT #........................................................................................ DUSMASS | kg m-3 | xy | N | | Dust Surface Mass Concentration DUCMASS | kg m-2 | xy | N | | Dust Column Mass Density - DUEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Extinction AOT - DUSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Extinction AOT Stratosphere - DUSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Scattering AOT - DUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Scattering AOT Stratosphere - DUSMASS25 | kg m-3 | xy | N | | Dust Surface Mass Concentration - PM 2.5 - DUCMASS25 | kg m-2 | xy | N | | Dust Column Mass Density - PM 2.5 - DUEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Dust Extinction AOT - PM 2.5 - DUSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Dust Scattering AOT - PM 2.5 + DUEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth + DUSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Stratospheric Aerosol Optical Thickness + DUSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth Due to Scattering + DUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Dust Stratospheric Aerosol Optical Thickness Due to Scattering + DUSMASS25 | kg m-3 | xy | N | | Dust Surface Mass Concentration of Particulate Matter < 2.5 microns (PM 2.5) + DUCMASS25 | kg m-2 | xy | N | | Dust Column Mass Density of Particulate Matter < 2.5 microns (PM 2.5) + DUEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5) + DUSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5) DUAERIDX | 1 | xy | N | | Dust TOMS UV Aerosol Index DUFLUXU | kg m-1 s-1 | xy | N | | Dust column u-wind mass flux DUFLUXV | kg m-1 s-1 | xy | N | | Dust column v-wind mass flux - DUEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Dust Extinction AOT - PM 1.0 um - DUSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Dust Scattering AOT - PM 1.0 um + DUEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0) + DUSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0) DUANGSTR | 1 | xy | N | | Dust Angstrom parameter [470-870 nm] DUEM | kg m-2 s-1 | xy | N | self%nbins | Dust Emission (Bin %d) DUSD | kg m-2 s-1 | xy | N | self%nbins | Dust Sedimentation (Bin %d) diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc index ba8ca591..7a7cbe90 100644 --- a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc @@ -21,14 +21,14 @@ category: EXPORT #---------------------------------------------------------------------------------------- PSO4TOT | kg m-2 s-1 | xyz | C | | Total Sulfate Produced in GOCART #........................................................................................ - TOTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - TOTSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] Stratosphere - TOTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Scattering AOT [550 nm] - TOTSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Scattering AOT [550 nm] Stratosphere - TOTEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM2.5 - TOTSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM2.5 - TOTEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM1.0 - TOTSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM1.0 + TOTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm + TOTSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Stratospheric Aerosol Optical Thickness at 550 nm + TOTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering + TOTSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Stratospheric Aerosol Optical Thickness at 550 nm Due to Scattering + TOTEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 2.5 microns (PM2.5) + TOTSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 2.5 microns (PM2.5) + TOTEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 1 micron (PM1.0) + TOTSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 1 micron (PM1.0) TOTANGSTR | 1 | xy | N | | Total Aerosol Angstrom parameter [470-870 nm] TOTEXTCOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient TOTEXTCOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient - Fixed RH=20% @@ -39,12 +39,12 @@ category: EXPORT TOTBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Single Scattering Backscatter coefficient TOTABCKTOA | m-1 sr-1 | xyz | C | | Total Attenuated Backscatter Coefficient from TOA [532nm] TOTABCKSFC | m-1 sr-1 | xyz | C | | Total Attenuated Backscatter Coefficient from surface [532nm] - PM | kg m-3 | xy | N | | Total reconstructed PM - PM_RH35 | kg m-3 | xy | N | | Total reconstructed PM(RH=35%) - PM_RH50 | kg m-3 | xy | N | | Total reconstructed PM(RH=50%) - PM25 | kg m-3 | xy | N | | Total reconstructed PM2.5 - PM25_RH35 | kg m-3 | xy | N | | Total reconstructed PM2.5(RH=35%) - PM25_RH50 | kg m-3 | xy | N | | Total reconstructed PM2.5(RH=50%) + PM | kg m-3 | xy | N | | Total Reconstructed Dry Particulate Matter + PM_RH35 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter at 35% Relative Humidity + PM_RH50 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter at 50% Relative Humidity + PM25 | kg m-3 | xy | N | | Total Reconstructed Dry Particulate Matter < 2.5 microns (PM2.5) + PM25_RH35 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 35% Relative Humidity + PM25_RH50 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 50% Relative Humidity category: INTERNAL #---------------------------------------------------------------------------------------- diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc index cf42893a..b0cc0632 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc @@ -49,12 +49,12 @@ category: EXPORT NH3MASS | kg/kg | xyz | C | | Ammonia Mass Mixing Ratio NH4MASS | kg/kg | xyz | C | | Ammonium Aerosol Mass Mixing Ratio NIMASS | kg/kg | xyz | C | | Nitrate Mass Mixing Ratio - NIMASS25 | kg/kg | xyz | C | | Nitrate Mass Mixing Ratio [PM2.5] + NIMASS25 | kg/kg | xyz | C | | Nitrate Mass Mixing Ratio of Particulate Matter < 2.5 microns (PM2.5) HNO3CONC | kg m-3 | xyz | C | | Nitric Acid Mass Concentration NH3CONC | kg m-3 | xyz | C | | Ammonia Mass Concentration NH4CONC | kg m-3 | xyz | C | | Ammonium Mass Concentration NICONC | kg m-3 | xyz | C | | Nitrate Mass Concentration - NICONC25 | kg m-3 | xyz | C | | Nitrate Mass Concentration [PM2.5] + NICONC25 | kg m-3 | xyz | C | | Nitrate Mass Concentration of Particulate Matter < 2.5 microns (PM2.5) NIEXTCOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Extinction Coefficient NIEXTCOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Extinction Coefficient - fixed RH=20% NIEXTCOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Extinction Coefficient - fixed RH=80% @@ -83,20 +83,20 @@ category: EXPORT NH3SMASS | kg m-3 | xy | N | | Ammonia Surface Mass Concentration NH4SMASS | kg m-3 | xy | N | | Ammonium Surface Mass Concentration NISMASS | kg m-3 | xy | N | | Nitrate Surface Mass Concentration - NISMASS25 | kg m-3 | xy | N | | Nitrate Surface Mass Concentration [PM2.5] + NISMASS25 | kg m-3 | xy | N | | Nitrate Surface Mass Concentration of Particulate Matter < 2.5 microns (PM2.5) HNO3CMASS | kg m-3 | xy | N | | Nitric Acid Column Mass Density NH3CMASS | kg m-3 | xy | N | | Ammonia Column Mass Density NH4CMASS | kg m-3 | xy | N | | Ammonium Column Mass Density NICMASS | kg m-2 | xy | N | | Nitrate Column Mass Density - NICMASS25 | kg m-2 | xy | N | | Nitrate Column Mass Density [PM2.5] - NIEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Extinction AOT - PM 1.0 um - NISCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Scattering AOT - PM 1.0 um - NIEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Extinction AOT - PM 2.5 um - NISCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Scattering AOT - PM 2.5 um - NIEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Extinction AOT - NISTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Extinction AOT Stratosphere - NISCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Scattering AOT - NISTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Scattering AOT Stratosphere + NICMASS25 | kg m-2 | xy | N | | Nitrate Column Mass Density of Particulate Matter < 2.5 microns (PM2.5) + NIEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0) + NISCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0) + NIEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5) + NISCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5) + NIEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth + NISTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Stratospheric Aerosol Optical Thickness + NISCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth Due to Scattering + NISTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Nitrate Stratospheric Aerosol Optical Thickness Due to Scattering NIANGSTR | 1 | xy | N | | Nitrate Angstrom parameter [470-870 nm] NIFLUXU | kg m-1 s-1 | xy | N | | Nitrate column u-wind mass flux NIFLUXV | kg m-1 s-1 | xy | N | | Nitrate column v-wind mass flux diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc index 4feb4050..6adfe688 100644 --- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc @@ -42,7 +42,7 @@ category: EXPORT NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME #---------------------------------------------------------------------------------------- SSMASS | kg kg-1 | xyz | C | | Sea Salt Mass Mixing Ratio - SSMASS25 | kg kg-1 | xyz | C | | Sea Salt Mass Mixing Ratio - PM 2.5 + SSMASS25 | kg kg-1 | xyz | C | | Sea Salt Mass Mixing Ratio of Particulate Matter < 2.5 microns (PM2.5) SSCONC | kg m-3 | xyz | C | | Sea Salt Mass Concentration SSEXTCOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient SSEXTCOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient - Fixed RH=20% @@ -59,17 +59,17 @@ category: EXPORT SSSV | kg m-2 s-1 | xy | N | self%nbins | Sea Salt Convective Scavenging (Bin %d) SSSMASS | kg m-3 | xy | N | | Sea Salt Surface Mass Concentration SSCMASS | kg m-2 | xy | N | | Sea Salt Column Mass Density - SSEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT - SSSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT Stratosphere - SSSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT - SSSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT Stratosphere - SSSMASS25 | kg m-3 | xy | N | | Sea Salt Surface Mass Concentration - PM 2.5 - SSCMASS25 | kg m-2 | xy | N | | Sea Salt Column Mass Density - PM 2.5 - SSEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT - PM 2.5 - SSSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT - PM 2.5 + SSEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth + SSSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness + SSSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering + SSSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness Due to Scattering + SSSMASS25 | kg m-3 | xy | N | | Sea Salt Surface Mass Concentration of Particulate Matter < 2.5 microns (PM2.5) + SSCMASS25 | kg m-2 | xy | N | | Sea Salt Column Mass Density of Particulate Matter < 2.5 microns (PM2.5) + SSEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5) + SSSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5) SSAERIDX | 1 | xy | N | | Sea Salt TOMS UV Aerosol Index - SSEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT [550 nm] - PM 1.0 um - SSSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT [550 nm] - PM 1.0 um + SSEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0) + SSSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0) SSANGSTR | 1 | xy | N | | Sea Salt Angstrom parameter [470-870 nm] SSFLUXU | kg m-1 s-1 | xy | N | | Sea Salt column u-wind mass flux SSFLUXV | kg m-1 s-1 | xy | N | | Sea Salt column v-wind mass flux diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc index b8f051b4..af8781f5 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc @@ -95,10 +95,10 @@ category: EXPORT SUFLUXU | kg m-1 s-1 | xy | N | | SO4 column u-wind mass flux SUFLUXV | kg m-1 s-1 | xy | N | | SO4 column v-wind mass flux SO4MASS | kg kg-1 | xyz | C | | SO4 Aerosol Mass Mixing Ratio - SUEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Extinction AOT - SUSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Extinction AOT Stratosphere - SUSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Scattering AOT - SUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Scattering AOT Stratosphere + SUEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth + SUSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Thickness + SUSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth Due to Scattering + SUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Depth Due to Scattering SO4SAREA | m2 m-3 | xyz | C | | SO4 Surface Area Density SO4SNUM | m-3 | xyz | C | | SO4 Number Density From 1f0b5d25efbb5a101425710768831ea0892433bc Mon Sep 17 00:00:00 2001 From: William Putman Date: Sun, 21 Jan 2024 14:04:05 -0500 Subject: [PATCH 03/13] Replay import patch for ozone --- ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90 b/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90 index 0873000f..9e212a27 100644 --- a/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90 +++ b/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90 @@ -636,6 +636,7 @@ SUBROUTINE O3_GridCompRun ( gcO3, w_c, impChem, expChem, & REAL, ALLOCATABLE :: dryDepFreq(:,:) REAL, ALLOCATABLE :: dO3(:,:) INTEGER, ALLOCATABLE :: oro(:,:) + REAL, ALLOCATABLE :: tropPa(:,:) REAL, ALLOCATABLE :: lai2D(:,:) CHARACTER(LEN= 3) :: laiID @@ -889,7 +890,8 @@ SUBROUTINE O3_GridCompRun ( gcO3, w_c, impChem, expChem, & ! Repair bad tropopause pressures, if any exist ! --------------------------------------------- - CALL Chem_UtilTroppFixer(i2, j2, tropp, VERBOSE=.TRUE., RC=status) + ALLOCATE(tropPa(i1:i2,j1:j2), _STAT) + CALL Chem_UtilTroppFixer(i2, j2, tropp, VERBOSE=.TRUE., NEWTROPP=tropPa, RC=status) VERIFY_(status) ! Perform parameterized production and loss chemistry @@ -1288,13 +1290,14 @@ SUBROUTINE doProdLoss(rc) mask = 0 DO k=1,km - WHERE(plPa(:,:,k) <= tropp(:,:)) mask(:,:,k) = 1 - WHERE(tropp(:,:) == MAPL_UNDEF) mask(:,:,k) = 0 + WHERE(plPa(:,:,k) <= tropPa(:,:)) mask(:,:,k) = 1 + WHERE(tropPa(:,:) == MAPL_UNDEF) mask(:,:,k) = 0 END DO n = w_c%reg%i_O3 WHERE(mask == 1) w_c%qa(n)%data3d = (w_c%qa(n)%data3d + cdt*Pi)/(1.00 + cdt*Li) + DEALLOCATE(tropPa, _STAT) DEALLOCATE(mask, STAT=status) VERIFY_(status) DEALLOCATE(Pclim, STAT=status) From 44a311d2d1a59b868032bffcb5c0a72a15f42c14 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 17 Apr 2024 15:05:01 -0600 Subject: [PATCH 04/13] Test no standalone --- CMakeLists.txt | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b20e22c..b95fa825 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,22 @@ if (NOT CMAKE_BUILD_TYPE) "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif () +# mepo can now clone subrepos in three styles +set (ESMA_CMAKE_DIRS + cmake + @cmake + cmake@ + ) + +foreach (dir IN LISTS ESMA_CMAKE_DIRS) + if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${dir}) + list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}") + set (ESMA_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}" CACHE PATH "Path to ESMA_cmake code") + include (esma) + set(GOCART_STANDALONE TRUE) + endif () +endforeach () + # Set build options option (UFS_GOCART "Build GOCART component for UFS" OFF) @@ -81,7 +97,9 @@ include_directories(${MPI_Fortran_INCLUDE_PATH}) add_subdirectory (ESMF) add_subdirectory (Process_Library) -ecbuild_install_project (NAME GOCART) +if(GOCART_STANDALONE) + ecbuild_install_project (NAME GOCART) +endif() # https://www.scivision.dev/cmake-auto-gitignore-build-dir/ # --- auto-ignore build directory From 213f773be6fd381729709dceab9a41ef99bc7bfb Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 17 Apr 2024 17:24:36 -0400 Subject: [PATCH 05/13] Make GOCART a project only if standalone --- CMakeLists.txt | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b95fa825..b6da5e74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,25 +2,6 @@ cmake_minimum_required (VERSION 3.17) cmake_policy (SET CMP0053 NEW) cmake_policy (SET CMP0054 NEW) -project ( - GOCART - VERSION 2.1.1 - LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF - -if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") - message(SEND_ERROR "In-source builds are disabled. Please - issue cmake command in separate build directory.") -endif ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") - -# Set the default build type to release -if (NOT CMAKE_BUILD_TYPE) - message (STATUS "Setting build type to 'Release' as none was specified.") - set (CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE) - # Set the possible values of build type for cmake-gui - set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Release" "MinSizeRel" "RelWithDebInfo") -endif () - # mepo can now clone subrepos in three styles set (ESMA_CMAKE_DIRS cmake @@ -37,6 +18,27 @@ foreach (dir IN LISTS ESMA_CMAKE_DIRS) endif () endforeach () +if (GOCART_STANDALONE) + project ( + GOCART + VERSION 2.1.1 + LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF + + if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") + message(SEND_ERROR "In-source builds are disabled. Please + issue cmake command in separate build directory.") + endif ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") + + # Set the default build type to release + if (NOT CMAKE_BUILD_TYPE) + message (STATUS "Setting build type to 'Release' as none was specified.") + set (CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE) + # Set the possible values of build type for cmake-gui + set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Release" "MinSizeRel" "RelWithDebInfo") + endif () +endif() + # Set build options option (UFS_GOCART "Build GOCART component for UFS" OFF) @@ -61,7 +63,9 @@ if (NOT COMMAND esma) include (esma) endif() -ecbuild_declare_project() +if(GOCART_STANDALONE) + ecbuild_declare_project() +endif() if (NOT Baselibs_FOUND) # Find dependencies From 70882009e8854b2bdbe626c14fe64e0fee6fc513 Mon Sep 17 00:00:00 2001 From: acollow Date: Fri, 21 Jun 2024 08:23:04 -0400 Subject: [PATCH 06/13] Closes #277 by amending CMakeLists.txt to use the GCsuffix for the carbon long names --- ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt index 5cee19b7..f640df6f 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt @@ -4,9 +4,11 @@ esma_add_library (${this} SRCS ${this}Mod.F90 DEPENDENCIES MAPL GA_Environment Chem_Shared2G Process_Library esmf NetCDF::NetCDF_Fortran) -mapl_acg (${this} CA2G_StateSpecs.rc - IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS - GET_POINTERS DECLARE_POINTERS) +mapl_acg (${this} CA2G_StateSpecs.rc + IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS + GET_POINTERS DECLARE_POINTERS + LONG_NAME_PREFIX "GCsuffix") + file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml) foreach ( file ${rc_files} ) From 4a9032df34f4fbf7fa680f937adb160fb3e4a5a1 Mon Sep 17 00:00:00 2001 From: Allie Collow <31133739+acollow@users.noreply.github.com> Date: Thu, 16 Jan 2025 07:57:59 -0500 Subject: [PATCH 07/13] Update components.yaml Updated MAPL to latest used by GEOSadas --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 81aa3128..31d58904 100644 --- a/components.yaml +++ b/components.yaml @@ -35,5 +35,5 @@ GMAO_Shared: MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.38.1 + tag: v2.47.1.2 develop: develop From 0eb010c16f269abec80b5afd50ff8e6165646013 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 08:30:29 -0500 Subject: [PATCH 08/13] Update components.yaml to match GEOSgcm main as of 2025-Jan-16 --- components.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components.yaml b/components.yaml index 31d58904..a77d6198 100644 --- a/components.yaml +++ b/components.yaml @@ -5,19 +5,19 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.9.1 + tag: v4.29.2 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.28.0 + tag: v3.56.0 develop: develop ecbuild: local: ./cmake@/ecbuild@ remote: ../ecbuild.git - tag: geos/v1.3.0 + tag: geos/v1.4.0 HEMCO: local: ./ESMF/HEMCO_GridComp@ @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.0 + tag: v1.9.9 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.47.1.2 + tag: v2.51.2 develop: develop From 0007e12b1c64ff5531a8759a4359019b60ab1808 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 08:30:51 -0500 Subject: [PATCH 09/13] Update to v4 orb --- .circleci/config.yml | 14 +++++++------- .github/workflows/validate_yaml_files.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3925282..6fe732b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,11 @@ version: 2.1 -# Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.7.0 -bcs_version: &bcs_version v11.00.0 +# Anchors in case we need to override the defaults from the orb +#baselibs_version: &baselibs_version v7.27.0 +#bcs_version: &bcs_version v11.6.0 orbs: - ci: geos-esm/circleci-tools@1 + ci: geos-esm/circleci-tools@4 workflows: build-and-test: @@ -18,7 +18,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GOCART buildtarget: GOCART2G_GridComp mepodevelop: true @@ -32,7 +32,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GOCART buildtarget: GOCART2G_GridComp mepodevelop: true @@ -47,7 +47,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GEOSgcm checkout_fixture: true mepodevelop: true diff --git a/.github/workflows/validate_yaml_files.yml b/.github/workflows/validate_yaml_files.yml index ff19b0d6..449db6e6 100644 --- a/.github/workflows/validate_yaml_files.yml +++ b/.github/workflows/validate_yaml_files.yml @@ -15,7 +15,7 @@ jobs: validate-YAML: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - id: yaml-lint name: yaml-lint uses: ibiqlik/action-yamllint@v3 @@ -24,7 +24,7 @@ jobs: format: colored config_file: .yamllint.yml - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: always() with: name: yamllint-logfile From 10249be0fd5c62ffca1162938e54afb8bb0e6e47 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 08:31:07 -0500 Subject: [PATCH 10/13] Updates for pending v2.3.0 release --- CHANGELOG.md | 17 ++++++++++------- CMakeLists.txt | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b241cf98..aac68fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,18 +5,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] - feature/acollow/#233_aodlongnames +## [Unreleased] ### Fixed ### Added ### Changed -<<<<<<< HEAD --Filepath for CEDS has been updated in the ExtData yaml and rc files. Note the old version had an incorrect seasonal cycle. -======= -State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that the long names for AOD are more intuitive ->>>>>>> 3bb515b (state spec RC files for GOCART2G, CA, DU, NI, SU, and SS are updated to make AOD long names more intuitive for users, addressing issue #233) + +## [v2.3.0] - 2025-MM-DD + +### Changed + +- Filepath for CEDS has been updated in the ExtData yaml and rc files. Note the old version had an incorrect seasonal cycle. +- State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that the long names for AOD are more intuitive +- Updated CI to use v4 orb +- Update components.yaml to match GEOSgcm `main` as of 2025-01-16 ## [v2.2.1] - 2023-05-30 @@ -24,7 +28,6 @@ State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that - In dust and sea-salt, changed dimensions back to `globalCellCountPerDim` since these are needed to determine emission tuning parameters, not to allocate arrays. - ## [v2.2.0] - 2023-05-18 ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index b6da5e74..d098ce8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ endforeach () if (GOCART_STANDALONE) project ( GOCART - VERSION 2.1.1 + VERSION 2.3.0 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") From 3323ae1012498b0147d42915969a20b5dc688de3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 08:32:47 -0500 Subject: [PATCH 11/13] Update CMakeLists.txt to match sdr_v2.3.0 --- CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d098ce8e..0560d96f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 3.17) cmake_policy (SET CMP0053 NEW) cmake_policy (SET CMP0054 NEW) -# mepo can now clone subrepos in three styles +# Let's look for the ESMA cmake directory in a few places +# to see if we are building standalone set (ESMA_CMAKE_DIRS cmake @cmake @@ -13,7 +14,6 @@ foreach (dir IN LISTS ESMA_CMAKE_DIRS) if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${dir}) list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}") set (ESMA_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}" CACHE PATH "Path to ESMA_cmake code") - include (esma) set(GOCART_STANDALONE TRUE) endif () endforeach () @@ -59,7 +59,6 @@ if (UFS_GOCART) endif() if (NOT COMMAND esma) - list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake@") include (esma) endif() @@ -81,6 +80,12 @@ endif () if (UFS_GOCART) find_package (GFTL_SHARED REQUIRED) + # Dom Heinzeller 2023/08/30 - workaround until https://github.com/GEOS-ESM/MAPL/pull/2320 + # is merged and finds its way into the ufs-weather-model dependency tree + find_package (YAFYAML QUIET) + find_package (FARGPARSE QUIET) + find_package (PFLOGGER QUIET) + # find_package (MAPL REQUIRED) include(mapl_acg) elseif (IS_DIRECTORY "${PROJECT_SOURCE_DIR}/ESMF/Shared/MAPL@") From 22376ebc36b363f5e834951b9f2e89fdbdc040c4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 08:33:34 -0500 Subject: [PATCH 12/13] Update CMakeLists.txt to be like develop --- CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0560d96f..48670f7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,14 @@ foreach (dir IN LISTS ESMA_CMAKE_DIRS) endif () endforeach () +# Set build options +option (UFS_GOCART "Build GOCART component for UFS" OFF) + +# Any UFS build of GOCART is by definition a standalone build +if(UFS_GOCART) + set(GOCART_STANDALONE TRUE) +endif() + if (GOCART_STANDALONE) project ( GOCART @@ -39,9 +47,6 @@ if (GOCART_STANDALONE) endif () endif() -# Set build options -option (UFS_GOCART "Build GOCART component for UFS" OFF) - set (DOING_GEOS5 YES) # Should find a better place for this - used in Chem component From 3208de4f0d44130f95d2f7c9045514f87244a489 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 11:13:12 -0500 Subject: [PATCH 13/13] Update changelog date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aac68fe0..466b04c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -## [v2.3.0] - 2025-MM-DD +## [v2.3.0] - 2025-01-16 ### Changed