From 6fb2fa8e8eee4d76b12a858212736cb4eddd1769 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 8 Jun 2023 11:42:03 -0400 Subject: [PATCH 01/15] Update components to match GEOSgcm v11.1.0, update CI This PR updates the "in-repo" components to match GEOSgcm v11.1.0. This is mainly used for build testing of GOCART without the full model. This PR also updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm v11.1.0. --- .circleci/config.yml | 2 +- components.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3925282..e22a79cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 # Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.7.0 +baselibs_version: &baselibs_version v7.13.0 bcs_version: &bcs_version v11.00.0 orbs: diff --git a/components.yaml b/components.yaml index 81aa3128..ef6d13e1 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.9.1 + tag: v4.17.0 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.28.0 + tag: v3.29.0 develop: develop ecbuild: @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.0 + tag: v1.9.1 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.38.1 + tag: v2.39.1 develop: develop From ebe4aafcd26e85926a79a708d02ddac99284f43b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 8 Jun 2023 11:46:27 -0400 Subject: [PATCH 02/15] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25023cc6..2e90bab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Update `components.yaml` to match that of GEOSgcm v11.1.0 + - ESMA_env v4.17.0 (Baselibs 7.13.0) + - ESMA_cmake v3.29.0 (Fixes for NAS) + - GMAO_Shared v1.9.1 (Bug fix for MITgcm) + - MAPL 2.39.1 (Various minor fixes and features) +- Update CI to use Baselibs 7.13.0 + ## [v2.2.1] - 2023-05-30 ### Fixed From 3d6f90788cfae9e2ee447e8abde3292723f6c4ba Mon Sep 17 00:00:00 2001 From: acollow Date: Mon, 24 Jul 2023 14:21:47 -0400 Subject: [PATCH 03/15] Modifies *_ExtData.yaml files to persist 2019 anthropogenic emissions as a climatology after the end of the CEDS dataset --- CHANGELOG.md | 3 +- .../AMIP/CA2G_GridComp_ExtData.rc | 128 --------------- .../AMIP/CA2G_GridComp_ExtData.yaml | 62 ++++---- .../CA2G_GridComp/CA2G_GridComp_ExtData.rc | 128 --------------- .../CA2G_GridComp/CA2G_GridComp_ExtData.yaml | 149 ++++++++++-------- .../AMIP/NI2G_GridComp_ExtData.rc | 27 ---- .../AMIP/NI2G_GridComp_ExtData.yaml | 12 +- .../NI2G_GridComp/NI2G_GridComp_ExtData.rc | 27 ---- .../NI2G_GridComp/NI2G_GridComp_ExtData.yaml | 30 +++- .../AMIP/SU2G_GridComp_ExtData.rc | 67 -------- .../AMIP/SU2G_GridComp_ExtData.yaml | 41 ++--- .../SU2G_GridComp/SU2G_GridComp_ExtData.rc | 67 -------- .../SU2G_GridComp/SU2G_GridComp_ExtData.yaml | 100 ++++++++---- 13 files changed, 230 insertions(+), 611 deletions(-) delete mode 100644 ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc delete mode 100644 ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc delete mode 100644 ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc delete mode 100644 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc delete mode 100644 ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc delete mode 100644 ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc diff --git a/CHANGELOG.md b/CHANGELOG.md index 25023cc6..86d2c778 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,14 @@ 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] - 2023-07-24 ### Fixed ### Added ### Changed +-Modified ExtData.yaml files to persist as climatological anthropogenic emissions after the end of the CEDS dataset in 2019. Analogous rc files removed as this capability is only available with ExtData2G ## [v2.2.1] - 2023-05-30 diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc deleted file mode 100644 index 43ed7284..00000000 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc +++ /dev/null @@ -1,128 +0,0 @@ -PrimaryExports%% -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| -# Import | | | Regrid | Refresh | OffSet | Scale | Variable On | File | -# Name | Units | Clim | Method | Time Template | Factor | Factor | File | Template | -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| - -#========== Data Instance ========================================================== - -climBCphobic 'kg kg-1' Y N 0 0.0 1.0 BCPHOBIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climBCphilic 'kg kg-1' Y N 0 0.0 1.0 BCPHILIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climOCphobic 'kg kg-1' Y N 0 0.0 1.0 OCPHOBIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climOCphilic 'kg kg-1' Y N 0 0.0 1.0 OCPHILIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climBRphobic 'kg kg-1' Y N 0 0.0 1.0 BRPHOBIC /dev/null -climBRphilic 'kg kg-1' Y N 0 0.0 1.0 BRPHILIC /dev/null - -climBCDP001 'kg m-2 s-1' Y N 0 0.0 1.0 BCDP001 /dev/null -climBCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT001 /dev/null -climBCSD001 'kg m-2 s-1' Y N 0 0.0 1.0 BCSD001 /dev/null -climBCSV001 'kg m-2 s-1' Y N 0 0.0 1.0 BCSV001 /dev/null - -climBCDP002 'kg m-2 s-1' Y N 0 0.0 1.0 BCDP002 /dev/null -climBCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT002 /dev/null -climBCSD002 'kg m-2 s-1' Y N 0 0.0 1.0 BCSD002 /dev/null -climBCSV002 'kg m-2 s-1' Y N 0 0.0 1.0 BCSV002 /dev/null - -climOCDP001 'kg m-2 s-1' Y N 0 0.0 1.0 OCDP001 /dev/null -climOCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT001 /dev/null -climOCSD001 'kg m-2 s-1' Y N 0 0.0 1.0 OCSD001 /dev/null -climOCSV001 'kg m-2 s-1' Y N 0 0.0 1.0 OCSV001 /dev/null - -climOCDP002 'kg m-2 s-1' Y N 0 0.0 1.0 OCDP002 /dev/null -climOCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT002 /dev/null -climOCSD002 'kg m-2 s-1' Y N 0 0.0 1.0 OCSD002 /dev/null -climOCSV002 'kg m-2 s-1' Y N 0 0.0 1.0 OCSV002 /dev/null - -climBRDP001 'kg m-2 s-1' Y N 0 0.0 1.0 BRDP001 /dev/null -climBRWT001 'kg m-2 s-1' Y N 0 0.0 1.0 BRWT001 /dev/null -climBRSD001 'kg m-2 s-1' Y N 0 0.0 1.0 BRSD001 /dev/null -climBRSV001 'kg m-2 s-1' Y N 0 0.0 1.0 BRSV001 /dev/null - -climBRDP002 'kg m-2 s-1' Y N 0 0.0 1.0 BRDP002 /dev/null -climBRWT002 'kg m-2 s-1' Y N 0 0.0 1.0 BRWT002 /dev/null -climBRSD002 'kg m-2 s-1' Y N 0 0.0 1.0 BRSD002 /dev/null -climBRSV002 'kg m-2 s-1' Y N 0 0.0 1.0 BRSV002 /dev/null - - -#=========== Carbonaceous aerosol sources =========================================== -# ORGANIC CARBON -# --------------- -# Biomass burning -- QFED-v2.x -OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null - -# Biofuel Source -- Included in AeroCom anthropogenic emissions -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 - -# 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 - -# 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 - -# 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 -OC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null -OC_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null - -# SOA production -pSOA_ANTHRO_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null - -#============================================================================================================ -# BLACK CARBON -# ------------ -# QFED v2.x -BC_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_bc.061.%y4%m2%d2.nc4 - -# Biofuel Source -- Included in AeroCom anthropogenic emissions -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 - -# 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 - -# 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 - -# 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 -BC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null -BC_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null - -#============================================================================================================ -# BROWN CARBON -# ------------ -# Biomass burning -- QFED-v2.x -BRC_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_oc.061.%y4%m2%d2.nc4 - -# Terpene emission -BRC_TERPENE NA Y Y %y4-%m2-%d2t12:00:00 none none terpene /dev/null - -# Biofuel Source -- Included in AeroCom anthropogenic emissions -BRC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null - -# Anthropogenic (BF & FF) emissions -- allowed to input as two layers -BRC_ANTEBRC1 NA Y Y %y4-%m2-%d2t12:00:00 none none anteoc1 /dev/null -BRC_ANTEBRC2 NA Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 /dev/null - -# EDGAR based ship emissions -BRC_SHIP NA Y Y %y4-%m2-%d2t12:00:00 none none oc_ship /dev/null - -# Aircraft fuel consumption -BRC_AIRCRAFT NA Y Y %y4-%m2-%d2t12:00:00 none none none /dev/null - -# Aviation emissions during the three phases of flight -BRC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null -BRC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null -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 - -%% 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..eb0d90f3 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml @@ -2,19 +2,27 @@ 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 CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4: + valid_range: "1979-01-15T12:00/2019-12-15T12:00" template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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" @@ -43,23 +51,23 @@ Samplings: update_frequency: PT24H update_offset: PT12H update_reference_time: '0' + CA2G_sample_3: + extrapolation: clim + update_frequency: PT24H + update_offset: PT12H + update_reference_time: '0' + source_time: "2019-01-15T12:00/2019-12-15T00:00:00" Exports: BC_AIRCRAFT: - collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_aviation + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_aviation} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_aviation} BC_ANTEBC1: - collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_nonenergy + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_nonenergy} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_nonenergy} BC_ANTEBC2: - collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_energy + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_energy} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_energy} BC_AVIATION_CDS: collection: /dev/null regrid: CONSERVE @@ -84,10 +92,8 @@ Exports: - {starting: "1960-01-16T12:00", collection: CA2G_hfed.emis_bc.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass} - {starting: "2000-03-01T00:00", collection: CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass} BC_SHIP: - collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_shipping + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_shipping} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_shipping} BRC_AIRCRAFT: collection: /dev/null regrid: CONSERVE @@ -137,20 +143,14 @@ Exports: sample: CA2G_sample_2 variable: terpene OC_AIRCRAFT: - collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_aviation + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_aviation} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_aviation} OC_ANTEOC1: - collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_nonenergy + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_nonenergy} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_nonenergy} OC_ANTEOC2: - collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_energy + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_energy} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_energy} OC_AVIATION_CDS: collection: /dev/null regrid: CONSERVE @@ -180,10 +180,8 @@ Exports: sample: CA2G_sample_1 variable: biomass OC_SHIP: - collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_shipping + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_shipping} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_shipping} climBCDP001: collection: /dev/null climBCDP002: diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc deleted file mode 100644 index cd44f28d..00000000 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc +++ /dev/null @@ -1,128 +0,0 @@ -PrimaryExports%% -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| -# Import | | | Regrid | Refresh | OffSet | Scale | Variable On | File | -# Name | Units | Clim | Method | Time Template | Factor | Factor | File | Template | -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| - -#========== Data Instance ========================================================== - -climBCphobic 'kg kg-1' Y N 0 0.0 1.0 BCPHOBIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climBCphilic 'kg kg-1' Y N 0 0.0 1.0 BCPHILIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climOCphobic 'kg kg-1' Y N 0 0.0 1.0 OCPHOBIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climOCphilic 'kg kg-1' Y N 0 0.0 1.0 OCPHILIC ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -climBRphobic 'kg kg-1' Y N 0 0.0 1.0 BRPHOBIC /dev/null -climBRphilic 'kg kg-1' Y N 0 0.0 1.0 BRPHILIC /dev/null - -climBCDP001 'kg m-2 s-1' Y N 0 0.0 1.0 BCDP001 /dev/null -climBCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT001 /dev/null -climBCSD001 'kg m-2 s-1' Y N 0 0.0 1.0 BCSD001 /dev/null -climBCSV001 'kg m-2 s-1' Y N 0 0.0 1.0 BCSV001 /dev/null - -climBCDP002 'kg m-2 s-1' Y N 0 0.0 1.0 BCDP002 /dev/null -climBCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT002 /dev/null -climBCSD002 'kg m-2 s-1' Y N 0 0.0 1.0 BCSD002 /dev/null -climBCSV002 'kg m-2 s-1' Y N 0 0.0 1.0 BCSV002 /dev/null - -climOCDP001 'kg m-2 s-1' Y N 0 0.0 1.0 OCDP001 /dev/null -climOCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT001 /dev/null -climOCSD001 'kg m-2 s-1' Y N 0 0.0 1.0 OCSD001 /dev/null -climOCSV001 'kg m-2 s-1' Y N 0 0.0 1.0 OCSV001 /dev/null - -climOCDP002 'kg m-2 s-1' Y N 0 0.0 1.0 OCDP002 /dev/null -climOCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT002 /dev/null -climOCSD002 'kg m-2 s-1' Y N 0 0.0 1.0 OCSD002 /dev/null -climOCSV002 'kg m-2 s-1' Y N 0 0.0 1.0 OCSV002 /dev/null - -climBRDP001 'kg m-2 s-1' Y N 0 0.0 1.0 BRDP001 /dev/null -climBRWT001 'kg m-2 s-1' Y N 0 0.0 1.0 BRWT001 /dev/null -climBRSD001 'kg m-2 s-1' Y N 0 0.0 1.0 BRSD001 /dev/null -climBRSV001 'kg m-2 s-1' Y N 0 0.0 1.0 BRSV001 /dev/null - -climBRDP002 'kg m-2 s-1' Y N 0 0.0 1.0 BRDP002 /dev/null -climBRWT002 'kg m-2 s-1' Y N 0 0.0 1.0 BRWT002 /dev/null -climBRSD002 'kg m-2 s-1' Y N 0 0.0 1.0 BRSD002 /dev/null -climBRSV002 'kg m-2 s-1' Y N 0 0.0 1.0 BRSV002 /dev/null - - -#=========== Carbonaceous aerosol sources =========================================== -# ORGANIC CARBON -# --------------- -# Biomass burning -- QFED-v2.x -OC_BIOMASS NA N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null - -# Biofuel Source -- Included in AeroCom anthropogenic emissions -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 - -# 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 - -# 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 - -# 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 -OC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null -OC_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null - -# SOA production -pSOA_ANTHRO_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null - -#============================================================================================================ -# BLACK CARBON -# ------------ -# QFED v2.x -BC_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_bc.006.%y4%m2%d2.nc4 - -# Biofuel Source -- Included in AeroCom anthropogenic emissions -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 - -# 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 - -# 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 - -# 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 -BC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null -BC_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null - -#============================================================================================================ -# BROWN CARBON -# ------------ -# Biomass burning -- QFED-v2.x -BRC_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_oc.006.%y4%m2%d2.nc4 - -# Terpene emission -BRC_TERPENE NA Y Y %y4-%m2-%d2t12:00:00 none none terpene /dev/null - -# Biofuel Source -- Included in AeroCom anthropogenic emissions -BRC_BIOFUEL NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null - -# Anthropogenic (BF & FF) emissions -- allowed to input as two layers -BRC_ANTEBRC1 NA Y Y %y4-%m2-%d2t12:00:00 none none anteoc1 /dev/null -BRC_ANTEBRC2 NA Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 /dev/null - -# EDGAR based ship emissions -BRC_SHIP NA Y Y %y4-%m2-%d2t12:00:00 none none oc_ship /dev/null - -# Aircraft fuel consumption -BRC_AIRCRAFT NA Y Y %y4-%m2-%d2t12:00:00 none none none /dev/null - -# Aviation emissions during the three phases of flight -BRC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null -BRC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null -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 - -%% diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml index 24c7a8e3..f3ff8065 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml @@ -1,23 +1,32 @@ 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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" + CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4: + template: ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4 CA2G_qfed2.emis_bc.006.%y4%m2%d2.nc4: template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4 valid_range: "2014-12-01T12:00/2021-11-01T12:00" @@ -43,23 +52,23 @@ Samplings: update_frequency: PT24H update_offset: PT12H update_reference_time: '0' + CA2G_sample_3: + extrapolation: clim + update_frequency: PT24H + update_offset: PT12H + update_reference_time: '0' + source_time: "2019-01-15T12:00/2019-12-15T00:00:00" Exports: BC_AIRCRAFT: - collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_aviation + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_aviation} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_aviation} BC_ANTEBC1: - collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_nonenergy + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_nonenergy} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_nonenergy} BC_ANTEBC2: - collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_energy + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_energy} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_energy} BC_AVIATION_CDS: collection: /dev/null regrid: CONSERVE @@ -84,10 +93,8 @@ Exports: - {starting: "2014-12-01T12:00", collection: CA2G_qfed2.emis_bc.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass} - {starting: "2021-11-01T12:00", collection: CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass} BC_SHIP: - collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: bc_shipping + - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_shipping} + - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_shipping} BRC_AIRCRAFT: collection: /dev/null regrid: CONSERVE @@ -137,20 +144,14 @@ Exports: sample: CA2G_sample_2 variable: terpene OC_AIRCRAFT: - collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_aviation + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_aviation} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_aviation} OC_ANTEOC1: - collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_nonenergy + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_nonenergy} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_nonenergy} OC_ANTEOC2: - collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_energy + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_energy} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_energy} OC_AVIATION_CDS: collection: /dev/null regrid: CONSERVE @@ -180,78 +181,88 @@ Exports: sample: CA2G_sample_1 variable: biomass OC_SHIP: - collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: CA2G_sample_1 - variable: oc_shipping + - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_shipping} + - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_shipping} climBCDP001: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: BCDP001 climBCDP002: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: BCDP002 climBCSD001: collection: /dev/null + sample: CA2G_sample_0 + variable: BCSD001 climBCSD002: collection: /dev/null + sample: CA2G_sample_0 + variable: BCSD002 climBCSV001: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: BCSV001 climBCSV002: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: BCSV002 climBCWT001: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: BCWT001 climBCWT002: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: BCWT002 climBCphilic: collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4 sample: CA2G_sample_0 - variable: BCPHILIC + variable: BCphilic climBCphobic: collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4 sample: CA2G_sample_0 - variable: BCPHOBIC - climBRDP001: - collection: /dev/null - climBRDP002: - collection: /dev/null - climBRSD001: - collection: /dev/null - climBRSD002: - collection: /dev/null - climBRSV001: - collection: /dev/null - climBRSV002: - collection: /dev/null - climBRWT001: - collection: /dev/null - climBRWT002: - collection: /dev/null - climBRphilic: - collection: /dev/null - climBRphobic: - collection: /dev/null + variable: BCphobic climOCDP001: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: OCDP001 climOCDP002: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: OCDP002 climOCSD001: collection: /dev/null + sample: CA2G_sample_0 + variable: OCSD001 climOCSD002: collection: /dev/null + sample: CA2G_sample_0 + variable: OCSD002 climOCSV001: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: OCSV001 climOCSV002: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: OCSV002 climOCWT001: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: OCWT001 climOCWT002: - collection: /dev/null + collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: CA2G_sample_0 + variable: OCWT002 climOCphilic: collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4 sample: CA2G_sample_0 - variable: OCPHILIC + variable: OCphilic climOCphobic: collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4 sample: CA2G_sample_0 - variable: OCPHOBIC + variable: OCphobic pSOA_ANTHRO_VOC: collection: /dev/null regrid: CONSERVE diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc deleted file mode 100644 index 549bdca2..00000000 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc +++ /dev/null @@ -1,27 +0,0 @@ -PrimaryExports%% -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|---------- -# Import | | | Regrid | Refresh | OffSet | Scale | Variable On | File | File -# Name | Units | Clim | Method | Time Template | Factor | Factor | File | Template | Frequency -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|----------- - -# ======= Nitrate Data Instance ========== -climNO3an1 'kg kg-1' N Y F0 none none NO3AN1 /dev/null -climNO3an2 'kg kg-1' N Y F0 none none NO3AN2 /dev/null -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_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 -EMI_NH3_OC 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none emiss_ocn ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4 - -NITRATE_HNO3 'mol mol-1' N N %y4-%m2-%d2T12:00:00 none 0.20 hno3 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - -NI_regionMask NA N V - none none REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc - -#DU kg kg-1 N N - none none DU /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..a873a820 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml @@ -7,6 +7,7 @@ Collections: 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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" @@ -28,6 +29,11 @@ Samplings: update_reference_time: '0' NI2G_sample_3: extrapolation: persist_closest + NI2G_sample_4: + update_frequency: PT24H + update_offset: PT12H + update_reference_time: '0' + source_time: "2019-01-15T12:00/2019-12-15T00:00:00" Exports: EMI_NH3_AG: @@ -39,10 +45,8 @@ Exports: - {starting: "1960-01-16T12:00", collection: NI2G_hfed.emis_nh3.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass} - {starting: "2000-03-01T00:00", collection: NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass} EMI_NH3_EN: - collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: NI2G_sample_1 - variable: nh3 + - {starting: "1979-01-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, sample: NI2G_sample_1, regrid: CONSERVE, variable: nh3} + - {starting: "2019-12-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: NI2G_sample_4, variable: nh3} EMI_NH3_IN: collection: /dev/null regrid: CONSERVE diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc deleted file mode 100644 index 2b571336..00000000 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc +++ /dev/null @@ -1,27 +0,0 @@ -PrimaryExports%% -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|---------- -# Import | | | Regrid | Refresh | OffSet | Scale | Variable On | File | File -# Name | Units | Clim | Method | Time Template | Factor | Factor | File | Template | Frequency -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|----------- - -# ======= Nitrate Data Instance ========== -climNO3an1 'kg kg-1' N Y F0 none none NO3AN1 /dev/null -climNO3an2 'kg kg-1' N Y F0 none none NO3AN2 /dev/null -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_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 -EMI_NH3_OC 'kg m-2 s-1' Y Y %y4-%m2-%d2T12:00:00 none none emiss_ocn ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4 - -NITRATE_HNO3 'mol mol-1' N N %y4-%m2-%d2T12:00:00 none 0.20 hno3 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - -NI_regionMask NA N V - none none REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc - -#DU kg kg-1 N N - none none DU /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..6b12afbd 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml @@ -3,10 +3,13 @@ Collections: template: ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc NI2G_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4: template: ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4 + NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4: + template: /discover/nobackup/projects/gmao/gmao_ops/pub/fp/das/Y%y4/M%m2/D%d2/GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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" @@ -28,6 +31,11 @@ Samplings: update_reference_time: '0' NI2G_sample_3: extrapolation: persist_closest + NI2G_sample_4: + update_frequency: PT24H + update_offset: PT12H + update_reference_time: '0' + source_time: "2019-01-15T12:00/2019-12-15T00:00:00" Exports: EMI_NH3_AG: @@ -39,10 +47,8 @@ Exports: - {starting: "2014-12-01T12:00", collection: NI2G_qfed2.emis_nh3.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass} - {starting: "2021-11-01T12:00", collection: NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass} EMI_NH3_EN: - collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: NI2G_sample_1 - variable: nh3 + - {starting: "1979-01-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, sample: NI2G_sample_1, regrid: CONSERVE, variable: nh3} + - {starting: "2019-12-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: NI2G_sample_4, variable: nh3} EMI_NH3_IN: collection: /dev/null regrid: CONSERVE @@ -76,10 +82,18 @@ Exports: sample: NI2G_sample_3 variable: REGION_MASK climNO3an1: - collection: /dev/null + collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4 + regrid: CONSERVE + sample: NI2G_sample_0 + variable: NO3AN1 climNO3an2: - collection: /dev/null + collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4 + regrid: CONSERVE + sample: NI2G_sample_0 + variable: NO3AN2 climNO3an3: - collection: /dev/null - + collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4 + regrid: CONSERVE + sample: NI2G_sample_0 + variable: NO3AN3 diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc deleted file mode 100644 index 7f5a9e02..00000000 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc +++ /dev/null @@ -1,67 +0,0 @@ -PrimaryExports%% -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| -# Import | | | Regrid | Refresh | OffSet | Scale | Variable On | File | -# Name | Units | Clim | Method | Time Template | Factor | Factor | File | Template | -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| - -#===== Sulfate Data Instance ========================================== -climSO4 'kg kg-1' Y N 0 0.0 1.0 SO4 ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -#climDMS 'kg kg-1' Y N - 0.0 1.0 none /dev/null -#climMSA 'kg kg-1' Y N - 0.0 1.0 none /dev/null -#climSO2 'kg kg-1' Y N - 0.0 1.0 none /dev/null - -climSUDP001 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP001 /dev/null -climSUWT001 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT001 /dev/null -climSUSD001 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD001 /dev/null -climSUSV001 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV001 /dev/null - -climSUDP002 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP002 /dev/null -climSUWT002 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT002 /dev/null -climSUSD002 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD002 /dev/null -climSUSV002 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV002 /dev/null - -climSUDP003 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP003 /dev/null -climSUWT003 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT003 /dev/null -climSUSD003 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD003 /dev/null -climSUSV003 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV003 /dev/null - -climSUDP004 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP004 /dev/null -climSUWT004 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT004 /dev/null -climSUSD004 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD004 /dev/null -climSUSV004 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV004 /dev/null - - -#====== Sulfate Sources ================================================= -# Biomass burning -- QFED-v2.x -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 - -# 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 - -# 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 - -# 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 - -# Aviation emissions during the three phases of flight -SU_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null -SU_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null -SU_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null - -# H2O2, OH and NO3 mixing ratios -SU_H2O2 NA N Y %y4-%m2-%d2t12:00:00 none none h2o2 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 -SU_OH NA N Y %y4-%m2-%d2t12:00:00 none none oh ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 -SU_NO3 NA N Y %y4-%m2-%d2t12:00:00 none none no3 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - -# Production of SO2 from OCS oxidation -pSO2_OCS NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null - -#SU_regionMask NA N v - none none REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc -%% - diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml index bdeb7e32..b3a22965 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml @@ -5,14 +5,19 @@ Collections: 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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" @@ -35,23 +40,23 @@ Samplings: update_frequency: PT24H update_offset: PT12H update_reference_time: '0' + SU2G_sample_3: + extrapolation: clim + update_frequency: PT24H + update_offset: PT12H + update_reference_time: '0' + source_time: "2019-01-15T12:00/2019-12-15T00:00:00" Exports: SU_AIRCRAFT: - collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_aviation + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_aviation} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_aviation} SU_ANTHROL1: - collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_nonenergy + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_nonenergy} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_nonenergy} SU_ANTHROL2: - collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_energy + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_energy} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_energy} SU_AVIATION_CDS: collection: /dev/null regrid: CONSERVE @@ -91,15 +96,11 @@ Exports: sample: SU2G_sample_1 variable: oh SU_SHIPSO2: - collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_shipping + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_shipping} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_shipping} SU_SHIPSO4: - collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so4_shipping + - {starting: "1979-01-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so4_shipping} + - {starting: "2019-12-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so4_shipping} climSO4: collection: SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4 sample: SU2G_sample_0 diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc deleted file mode 100644 index d5ef60c0..00000000 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc +++ /dev/null @@ -1,67 +0,0 @@ -PrimaryExports%% -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| -# Import | | | Regrid | Refresh | OffSet | Scale | Variable On | File | -# Name | Units | Clim | Method | Time Template | Factor | Factor | File | Template | -# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------| - -#===== Sulfate Data Instance ========================================== -climSO4 'kg kg-1' Y N 0 0.0 1.0 SO4 ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4 -#climDMS 'kg kg-1' Y N - 0.0 1.0 none /dev/null -#climMSA 'kg kg-1' Y N - 0.0 1.0 none /dev/null -#climSO2 'kg kg-1' Y N - 0.0 1.0 none /dev/null - -climSUDP001 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP001 /dev/null -climSUWT001 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT001 /dev/null -climSUSD001 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD001 /dev/null -climSUSV001 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV001 /dev/null - -climSUDP002 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP002 /dev/null -climSUWT002 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT002 /dev/null -climSUSD002 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD002 /dev/null -climSUSV002 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV002 /dev/null - -climSUDP003 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP003 /dev/null -climSUWT003 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT003 /dev/null -climSUSD003 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD003 /dev/null -climSUSV003 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV003 /dev/null - -climSUDP004 'kg m-2 s-1' Y N 0 0.0 1.0 SUDP004 /dev/null -climSUWT004 'kg m-2 s-1' Y N 0 0.0 1.0 SUWT004 /dev/null -climSUSD004 'kg m-2 s-1' Y N 0 0.0 1.0 SUSD004 /dev/null -climSUSV004 'kg m-2 s-1' Y N 0 0.0 1.0 SUSV004 /dev/null - - -#====== Sulfate Sources ================================================= -# Biomass burning -- QFED-v2.x -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 - -# 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 - -# 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 - -# 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 - -# Aviation emissions during the three phases of flight -SU_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null -SU_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null -SU_AVIATION_CRS NA Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null - -# H2O2, OH and NO3 mixing ratios -SU_H2O2 NA N Y %y4-%m2-%d2t12:00:00 none none h2o2 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 -SU_OH NA N Y %y4-%m2-%d2t12:00:00 none none oh ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 -SU_NO3 NA N Y %y4-%m2-%d2t12:00:00 none none no3 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - -# Production of SO2 from OCS oxidation -pSO2_OCS NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null - -#SU_regionMask NA N v - none none REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc -%% - diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml index dbb6c462..dbf6c20d 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml @@ -5,17 +5,23 @@ Collections: 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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 + valid_range: "1979-01-15T12:00/2019-12-15T12:00" 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" + SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4: + template: ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4 SU2G_qfed2.emis_so2.006.%y4%m2%d2.nc4: template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4 valid_range: "2014-12-01T12:00/2021-11-01T12:00" @@ -35,23 +41,23 @@ Samplings: update_frequency: PT24H update_offset: PT12H update_reference_time: '0' + SU2G_sample_3: + extrapolation: clim + update_frequency: PT24H + update_offset: PT12H + update_reference_time: '0' + source_time: "2019-01-15T12:00/2019-12-15T00:00:00" Exports: SU_AIRCRAFT: - collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_aviation + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_aviation} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_aviation} SU_ANTHROL1: - collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_nonenergy + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_nonenergy} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_nonenergy} SU_ANTHROL2: - collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_energy + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_energy} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_energy} SU_AVIATION_CDS: collection: /dev/null regrid: CONSERVE @@ -91,51 +97,79 @@ Exports: sample: SU2G_sample_1 variable: oh SU_SHIPSO2: - collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so2_shipping + - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_shipping} + - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_shipping} SU_SHIPSO4: - collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: SU2G_sample_1 - variable: so4_shipping + - {starting: "1979-01-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so4_shipping} + - {starting: "2019-12-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so4_shipping} climSO4: collection: SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4 sample: SU2G_sample_0 variable: SO4 climSUDP001: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUDP001 climSUDP002: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUDP002 climSUDP003: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUDP003 climSUDP004: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUDP004 climSUSD001: collection: /dev/null + sample: SU2G_sample_0 + variable: SUSD001 climSUSD002: collection: /dev/null + sample: SU2G_sample_0 + variable: SUSD002 climSUSD003: collection: /dev/null + sample: SU2G_sample_0 + variable: SUSD003 climSUSD004: collection: /dev/null + sample: SU2G_sample_0 + variable: SUSD004 climSUSV001: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUSV001 climSUSV002: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUSV002 climSUSV003: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUSV003 climSUSV004: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUSV004 climSUWT001: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUWT001 climSUWT002: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUWT002 climSUWT003: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUWT003 climSUWT004: - collection: /dev/null + collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4 + sample: SU2G_sample_0 + variable: SUWT004 pSO2_OCS: collection: /dev/null regrid: CONSERVE From b22df9f0a26e60ba7b06e3b2088d6cae7fdbd8ca Mon Sep 17 00:00:00 2001 From: acollow Date: Mon, 24 Jul 2023 14:30:09 -0400 Subject: [PATCH 04/15] Modifies *_ExtData.yaml files to persist 2019 anthropogenic emissions as a climatology after the end of the CEDS dataset --- .../CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eb0d90f3..431525dd 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml @@ -1,8 +1,8 @@ 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 - CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4: valid_range: "1979-01-15T12:00/2019-12-15T12:00" + 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 valid_range: "1979-01-15T12:00/2019-12-15T12:00" CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4: From 3249963d240e26da2ec747cfef2b615215a99984 Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Mon, 24 Jul 2023 23:47:55 +0000 Subject: [PATCH 05/15] Move process library macro definitions to new header file (Process.H). --- Process_Library/GOCART2G_Process.F90 | 11 +---------- Process_Library/Process.H | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Process_Library/Process.H diff --git a/Process_Library/GOCART2G_Process.F90 b/Process_Library/GOCART2G_Process.F90 index 6892082c..ac2f1ef0 100644 --- a/Process_Library/GOCART2G_Process.F90 +++ b/Process_Library/GOCART2G_Process.F90 @@ -1,13 +1,4 @@ -#define __SUCCESS__ 0 -#define __FAIL__ 1 -#define __VERIFY__(x) if(x/=0) then; if(present(rc)) rc=x; return; endif -#define __VERIFY_NO_OPT__(x) if(x/=0) then; rc=x; return; endif -#define __RC__ rc=status); __VERIFY__(status -#define __RC_NO_OPT__ rc=status); __VERIFY_NO_OPT__(status -#define __STAT__ stat=status); __VERIFY__(status -#define __IOSTAT__ iostat=status); __VERIFY__(status -#define __RETURN__(x) if (present(rc)) rc=x; return -#define __ASSERT__(expr) if(.not. (expr)) then; if (present(rc)) rc=-1; return; endif +#include "Process.H" !------------------------------------------------------------------------- ! ! !MODULE: GOCART2G_Process -- GOCART2G process library diff --git a/Process_Library/Process.H b/Process_Library/Process.H new file mode 100644 index 00000000..fa74ee6c --- /dev/null +++ b/Process_Library/Process.H @@ -0,0 +1,10 @@ +#define __SUCCESS__ 0 +#define __FAIL__ 1 +#define __VERIFY__(x) if(x/=0) then; if(present(rc)) rc=x; return; endif +#define __VERIFY_NO_OPT__(x) if(x/=0) then; rc=x; return; endif +#define __RC__ rc=status); __VERIFY__(status +#define __RC_NO_OPT__ rc=status); __VERIFY_NO_OPT__(status +#define __STAT__ stat=status); __VERIFY__(status +#define __IOSTAT__ iostat=status); __VERIFY__(status +#define __RETURN__(x) if (present(rc)) rc=x; return +#define __ASSERT__(expr) if(.not. (expr)) then; if (present(rc)) rc=-1; return; endif From 60ec5f7a608e123f16dc604f00a2f677c015a426 Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Mon, 24 Jul 2023 23:58:12 +0000 Subject: [PATCH 06/15] Do not output error message for missing wavelengh/channel unless the optional rc argument is provided. --- Process_Library/GOCART2G_MieMod.F90 | 41 +++++++++++++++++------------ 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/Process_Library/GOCART2G_MieMod.F90 b/Process_Library/GOCART2G_MieMod.F90 index a595d8d4..15966ba2 100644 --- a/Process_Library/GOCART2G_MieMod.F90 +++ b/Process_Library/GOCART2G_MieMod.F90 @@ -1,3 +1,4 @@ +#include "Process.H" !BOP ! ! !MODULE: GOCART2G_MieMod --- Reader for aerosol mie tables @@ -540,13 +541,15 @@ integer function getChannel(this, wavelength, rc) result (ch) endif enddo - if (present(rc)) rc = 0 - - if (ch < 0) then - !$omp critical (GetCha) - print*, "wavelength of ",wavelength, " is an invalid value." - !$omp end critical (GetCha) - if (present(rc)) rc = -1 + if (present(rc)) then + if (ch > 0) then + rc = __SUCCESS__ + else + rc = __FAIL__ + !$omp critical (GetCha) + print*, "wavelength of ",wavelength, " is an invalid value." + !$omp end critical (GetCha) + endif endif end function getChannel @@ -558,18 +561,22 @@ real function getWavelength(this, ith_channel, rc) result (wavelength) real, parameter :: w_tol = 1.e-9 integer :: i - if (present(rc)) rc = 0 - if (ith_channel <=0 .or. ith_channel > this%nch ) then - !$omp critical (GetWav) - print*, "The channel of ",ith_channel, " is an invalid channel number." - !$omp end critical (GetWav) - if (present(rc)) rc = -1 - wavelength = -1. ! meanlingless nagative - return + wavelength = -1. ! meaningless negative + else + wavelength = this%wavelengths(ith_channel) endif - - wavelength = this%wavelengths(ith_channel) + + if (present(rc)) then + if (wavelength > 0) then + rc = __SUCCESS__ + else + rc = __FAIL__ + !$omp critical (GetWav) + print*, "The channel of ",ith_channel, " is an invalid channel number." + !$omp end critical (GetWav) + endif + endif end function getWavelength From 24d4be95b62f6d8925e2174b1f44d78cd82bd39a Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Tue, 25 Jul 2023 20:01:20 +0000 Subject: [PATCH 07/15] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25023cc6..4c7558c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Silenced unwarranted error messages from wavelength/channel retrieval functions occurring when 470nm and/or 870nm channels are not included in GOCART resource file. + ### Added ### Changed +- Moved process library macros to header file. + ## [v2.2.1] - 2023-05-30 ### Fixed From 4c227fb0783637c4930bfc01550a535bb6cc3efa Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 31 Jul 2023 11:55:20 -0400 Subject: [PATCH 08/15] Update components to match GEOSgcm v11.1.1 --- .circleci/config.yml | 12 ++++++------ CHANGELOG.md | 10 +++++----- components.yaml | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e22a79cb..acce258d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 -# Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.13.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.14.0 +#bcs_version: &bcs_version v11.1.0 orbs: ci: geos-esm/circleci-tools@1 @@ -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/CHANGELOG.md b/CHANGELOG.md index 2e90bab5..56ecca45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Update `components.yaml` to match that of GEOSgcm v11.1.0 - - ESMA_env v4.17.0 (Baselibs 7.13.0) - - ESMA_cmake v3.29.0 (Fixes for NAS) +- Update `components.yaml` to match that of GEOSgcm v11.1.1 + - ESMA_env v4.19.0 (Baselibs 7.14.0) + - ESMA_cmake v3.31.0 (Fixes for NAS, debug flags) - GMAO_Shared v1.9.1 (Bug fix for MITgcm) - - MAPL 2.39.1 (Various minor fixes and features) -- Update CI to use Baselibs 7.13.0 + - MAPL 2.40.1 (Various fixes and features) +- Update CI to use Baselibs by default from CircleCI Orb ## [v2.2.1] - 2023-05-30 diff --git a/components.yaml b/components.yaml index ef6d13e1..37c286fe 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.17.0 + tag: v4.19.0 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.29.0 + tag: v3.31.0 develop: develop ecbuild: @@ -35,5 +35,5 @@ GMAO_Shared: MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.39.1 + tag: v2.40.0 develop: develop From 3bb515bc732e5eb569b048a2a01233b699d9821c Mon Sep 17 00:00:00 2001 From: acollow Date: Fri, 18 Aug 2023 13:30:18 -0400 Subject: [PATCH 09/15] 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 --- CHANGELOG.md | 3 +- .../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, 57 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25023cc6..1b9d5464 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,14 @@ 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 +State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that the long names for AOD are more intuitive ## [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 1bba2142ef6cef1aef7d6b75995cc8153df4866c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 19 Sep 2023 10:09:36 -0400 Subject: [PATCH 10/15] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b20e22c..f8c78baa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( GOCART - VERSION 2.1.1 + VERSION 2.2.1 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") From 9c42809dd09b860b689dbe1c86a5907d9f947c76 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 25 Sep 2023 12:20:50 -0400 Subject: [PATCH 11/15] Update to v11.2.0 components --- CHANGELOG.md | 8 ++++---- components.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56ecca45..4792be98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,11 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Update `components.yaml` to match that of GEOSgcm v11.1.1 +- Update `components.yaml` to match that of GEOSgcm v11.2.0 - ESMA_env v4.19.0 (Baselibs 7.14.0) - - ESMA_cmake v3.31.0 (Fixes for NAS, debug flags) - - GMAO_Shared v1.9.1 (Bug fix for MITgcm) - - MAPL 2.40.1 (Various fixes and features) + - ESMA_cmake v3.31.1 (Fixes for NAS, debug flags) + - GMAO_Shared v1.9.2 (Bug fix for MITgcm, CI fixes) + - MAPL 2.40.3 (Various fixes and features) - Update CI to use Baselibs by default from CircleCI Orb ## [v2.2.1] - 2023-05-30 diff --git a/components.yaml b/components.yaml index 37c286fe..f0295031 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.31.0 + tag: v3.31.1 develop: develop ecbuild: @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.1 + tag: v1.9.2 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.40.0 + tag: v2.40.3 develop: develop From f84a6dc93e2b9aecaa17dd19245f0889e772c2c7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 1 Dec 2023 08:22:44 -0500 Subject: [PATCH 12/15] update to match v11.3.3 --- CHANGELOG.md | 10 +++++----- components.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e035da0a..a0d92907 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,11 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Update `components.yaml` to match that of GEOSgcm v11.2.0 - - ESMA_env v4.19.0 (Baselibs 7.14.0) - - ESMA_cmake v3.31.1 (Fixes for NAS, debug flags) - - GMAO_Shared v1.9.2 (Bug fix for MITgcm, CI fixes) - - MAPL 2.40.3 (Various fixes and features) +- Update `components.yaml` to match that of GEOSgcm v11.3.3 + - ESMA_env v4.20.6 (Baselibs 7.14.0, Updates for SLES15 at NCCS) + - ESMA_cmake v3.36.0 (Fixes for NAS, debug flags, Updates for SLES15 at NCCS) + - GMAO_Shared v1.9.6 (Bug fix for MITgcm, CI fixes, SLES15 Updates) + - MAPL 2.42.0 (Various fixes and features) - Update CI to use Baselibs by default from CircleCI Orb - Correct soil moisture parameterization in FENGSHA - Add `soil_moisture_factor` to the DU2G_instance_DU.rc (same name used in the K14 scheme) and DU2G_GridCompMod.F90 files for FENGSHA diff --git a/components.yaml b/components.yaml index f0295031..8b169a7b 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.19.0 + tag: v4.20.6 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.31.1 + tag: v3.36.0 develop: develop ecbuild: @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.2 + tag: v1.9.6 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.40.3 + tag: v2.42.0 develop: develop From 0cd37e5845d248daf57953cce935f2145bfaf14f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 22 Jan 2024 14:04:43 -0500 Subject: [PATCH 13/15] Update CI and components --- .circleci/config.yml | 6 +++--- components.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index acce258d..9f25aed2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,11 @@ version: 2.1 # Anchors in case we need to override the defaults from the orb -#baselibs_version: &baselibs_version v7.14.0 -#bcs_version: &bcs_version v11.1.0 +#baselibs_version: &baselibs_version v7.17.0 +#bcs_version: &bcs_version v11.3.0 orbs: - ci: geos-esm/circleci-tools@1 + ci: geos-esm/circleci-tools@2 workflows: build-and-test: diff --git a/components.yaml b/components.yaml index 8b169a7b..faf25a7d 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.20.6 + tag: v4.24.0 develop: main cmake: @@ -35,5 +35,5 @@ GMAO_Shared: MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.42.0 + tag: v2.43.0 develop: develop From 6a308f2df3a219b8d6269385951343ea9cbcf0b3 Mon Sep 17 00:00:00 2001 From: Allie Collow <31133739+acollow@users.noreply.github.com> Date: Fri, 26 Apr 2024 08:31:47 -0400 Subject: [PATCH 14/15] Update SU2G_StateSpecs.rc Changed sulfate to sulfur in the long names for emission and loss terms that represent all 4 bins (including DMS, SO2, SO4, and MSA). --- ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc index af8781f5..de6c6ddb 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc @@ -53,10 +53,10 @@ category: EXPORT #---------------------------------------------------------------------------------------- NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME #---------------------------------------------------------------------------------------- - SUEM | kg m-2 s-1 | xy | N | self%nbins | Sulfer Emission (Bin %d) - SUDP | kg m-2 s-1 | xy | N | self%nbins | Sulfate Dry Deposition (Bin %d) - SUSD | kg m-2 s-1 | xy | N | self%nbins | Sulfate Settling (Bin %d) - SUWT | kg m-2 s-1 | xy | N | self%nbins | Sulfate Wet Deposition (Bin %d) + SUEM | kg m-2 s-1 | xy | N | self%nbins | Sulfur Emission (Bin %d) + SUDP | kg m-2 s-1 | xy | N | self%nbins | Sulfur Dry Deposition (Bin %d) + SUSD | kg m-2 s-1 | xy | N | self%nbins | Sulfur Settling (Bin %d) + SUWT | kg m-2 s-1 | xy | N | self%nbins | Sulfur Wet Deposition (Bin %d) SUSV | kg m-2 s-1 | xy | N | self%nbins | Sulfate Convective Scavenging (Bin %d) SO4EMAN | kg m-2 s-1 | xy | N | | SO4 Anthropogenic Emissions SO2EMAN | kg m-2 s-1 | xy | N | | SO2 Anthropogenic Emissions From 3f376293d8d2cf22ed0d876a7c13b3993d7cf7f1 Mon Sep 17 00:00:00 2001 From: "Janak R. Joshi" <144248063+jrjoshi1@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:30:48 -0400 Subject: [PATCH 15/15] Update SU2G_StateSpecs.rc Changed optical depth to thickness for stratosphere --- ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc index de6c6ddb..ddcdf0b2 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc @@ -98,7 +98,7 @@ category: EXPORT 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 + SUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Thickness Due to Scattering SO4SAREA | m2 m-3 | xyz | C | | SO4 Surface Area Density SO4SNUM | m-3 | xyz | C | | SO4 Number Density