From 748121b4acc189cea8be51bec93bac4ea881d73e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 9 Apr 2026 14:47:48 -0400 Subject: [PATCH] v12: Migrate ExtData YAMLs from GOCART and ACHEM --- ACHEM_ExtData.yaml | 138 --------------------------------------- AMIP/ACHEM_ExtData.yaml | 140 ---------------------------------------- CHANGELOG.md | 2 + CMakeLists.txt | 2 +- 4 files changed, 3 insertions(+), 279 deletions(-) delete mode 100644 ACHEM_ExtData.yaml delete mode 100644 AMIP/ACHEM_ExtData.yaml diff --git a/ACHEM_ExtData.yaml b/ACHEM_ExtData.yaml deleted file mode 100644 index a578462..0000000 --- a/ACHEM_ExtData.yaml +++ /dev/null @@ -1,138 +0,0 @@ -Collections: - ACHEM_CO-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/CO-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 - ACHEM_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4: - template: ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4 - ACHEM_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 - ACHEM_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 - ACHEM_SOAG.emiss.x144_y91_t12.1990.nc4: - template: ExtData/chemistry/CAM/v0.0.0/sfc/SOAG.emiss.x144_y91_t12.1990.nc4 - ACHEM_edgar-v42.emis_nh3.anthropogenic.x1152_y721.19700703T12z_20200703T00z.nc4: - template: ExtData/chemistry/MERRA2/v0.0.0/sfc/edgar-v42.emis_nh3.anthropogenic.x1152_y721.19700703T12z_20200703T00z.nc4 - ACHEM_htap-v2.2.emis_so2.aviation_cds.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.aviation_cds.x3600_y1800_t12.2010.nc4 - ACHEM_htap-v2.2.emis_so2.aviation_crs.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.aviation_crs.x3600_y1800_t12.2010.nc4 - ACHEM_htap-v2.2.emis_so2.aviation_lto.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.aviation_lto.x3600_y1800_t12.2010.nc4 - ACHEM_htap-v2.2.emis_so2.ships.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.ships.x3600_y1800_t12.2010.nc4 - ACHEM_htapv2.2.emisso2.elevated.x3600y1800t12.2017.integrate.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htapv2.2.emisso2.elevated.x3600y1800t12.2017.integrate.nc4 - ACHEM_htapv2.2.emisso2.surface.x3600y1800t12.2017.integrate.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htapv2.2.emisso2.surface.x3600y1800t12.2017.integrate.nc4 - ACHEM_qfed2.emis_co.006.%y4%m2%d2.nc4: - template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_co.006.%y4%m2%d2.nc4 - valid_range: "2014-12-01T12:00/2021-11-01T12:00" - ACHEM_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" - ACHEM_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" - ACHEM_qfed2.emis_co.061.%y4%m2%d2.nc4: - template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_co.061.%y4%m2%d2.nc4 - valid_range: "2021-11-01T12:00/2025-01-01" - ACHEM_qfed2.emis_nh3.061.%y4%m2%d2.nc4: - template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.061.%y4%m2%d2.nc4 - valid_range: "2021-11-01T12:00/2025-01-01" - ACHEM_qfed2.emis_so2.061.%y4%m2%d2.nc4: - template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.061.%y4%m2%d2.nc4 - valid_range: "2021-11-01T12:00/2025-01-01" - -Samplings: - ACHEM_sample_0: - update_frequency: PT24H - update_offset: PT12H - update_reference_time: '0' - ACHEM_sample_1: - extrapolation: clim - update_frequency: PT24H - update_offset: PT12H - update_reference_time: '0' - ACHEM_sample_2: - extrapolation: clim - -Exports: - CO_BF_VOC: - collection: /dev/null - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: emcobf - CO_BIOMASS_VOC: - - {starting: "2014-12-01T12:00",collection: ACHEM_qfed2.emis_co.006.%y4%m2%d2.nc4,regrid: CONSERVE,sample: ACHEM_sample_0,variable: biomass} - - {starting: "2021-11-01T12:00",collection: ACHEM_qfed2.emis_co.061.%y4%m2%d2.nc4,regrid: CONSERVE,sample: ACHEM_sample_0,variable: biomass} - CO_FS_VOC: - collection: ACHEM_CO-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: ACHEM_sample_0 - variable: co - DMS_CONC_OCEAN: - collection: ACHEM_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4 - linear_transformation: - - 0.0 - - 1.0e-06 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: conc - H2O2: - collection: ACHEM_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - variable: h2o2 - NH3_EMIS: - collection: ACHEM_edgar-v42.emis_nh3.anthropogenic.x1152_y721.19700703T12z_20200703T00z.nc4 - regrid: CONSERVE - variable: emi_nh3 - NH3_EMIS_FIRE: - - {starting: "2014-12-01T12:00",collection: ACHEM_qfed2.emis_nh3.006.%y4%m2%d2.nc4,regrid: CONSERVE,sample: ACHEM_sample_0,variable: biomass} - - {starting: "2021-11-01T12:00",collection: ACHEM_qfed2.emis_nh3.061.%y4%m2%d2.nc4,regrid: CONSERVE,sample: ACHEM_sample_0,variable: biomass} - NH3_EMIS_OCEAN: - collection: ACHEM_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: emiss_ocn - NO3: - collection: ACHEM_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - variable: no3 - OH: - collection: ACHEM_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - variable: oh - SO2_EMIS_AIRCRAFT_CDS: - collection: ACHEM_htap-v2.2.emis_so2.aviation_cds.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_aviation - SO2_EMIS_AIRCRAFT_CRS: - collection: ACHEM_htap-v2.2.emis_so2.aviation_crs.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_aviation - SO2_EMIS_AIRCRAFT_LTO: - collection: ACHEM_htap-v2.2.emis_so2.aviation_lto.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_aviation - SO2_EMIS_ENERGY: - collection: ACHEM_htapv2.2.emisso2.elevated.x3600y1800t12.2017.integrate.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: sanl2 - SO3_EMIS_FIRE: - - {starting: "2014-12-01T12:00",collection: ACHEM_qfed2.emis_so3.006.%y4%m2%d2.nc4,regrid: CONSERVE,sample: ACHEM_sample_0,variable: biomass} - - {starting: "2021-11-01T12:00",collection: ACHEM_qfed2.emis_so3.061.%y4%m2%d2.nc4,regrid: CONSERVE,sample: ACHEM_sample_0,variable: biomass} - SO2_EMIS_NONENERGY: - collection: ACHEM_htapv2.2.emisso2.surface.x3600y1800t12.2017.integrate.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: sanl1 - SO2_EMIS_SHIPPING: - collection: ACHEM_htap-v2.2.emis_so2.ships.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_ship - SOAG_EMIS: - collection: ACHEM_SOAG.emiss.x144_y91_t12.1990.nc4 - sample: ACHEM_sample_2 - variable: soag - diff --git a/AMIP/ACHEM_ExtData.yaml b/AMIP/ACHEM_ExtData.yaml deleted file mode 100644 index d3bb9c8..0000000 --- a/AMIP/ACHEM_ExtData.yaml +++ /dev/null @@ -1,140 +0,0 @@ -Collections: - ACHEM_CO-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4: - template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/CO-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 - ACHEM_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4: - template: ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4 - ACHEM_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 - ACHEM_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 - ACHEM_SOAG.emiss.x144_y91_t12.1990.nc4: - template: ExtData/chemistry/CAM/v0.0.0/sfc/SOAG.emiss.x144_y91_t12.1990.nc4 - ACHEM_edgar-v42.emis_nh3.anthropogenic.x1152_y721.19700703T12z_20200703T00z.nc4: - template: ExtData/chemistry/MERRA2/v0.0.0/sfc/edgar-v42.emis_nh3.anthropogenic.x1152_y721.19700703T12z_20200703T00z.nc4 - ACHEM_htap-v2.2.emis_so2.aviation_cds.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.aviation_cds.x3600_y1800_t12.2010.nc4 - ACHEM_htap-v2.2.emis_so2.aviation_crs.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.aviation_crs.x3600_y1800_t12.2010.nc4 - ACHEM_htap-v2.2.emis_so2.aviation_lto.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.aviation_lto.x3600_y1800_t12.2010.nc4 - ACHEM_htap-v2.2.emis_so2.ships.x3600_y1800_t12.2010.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htap-v2.2.emis_so2.ships.x3600_y1800_t12.2010.nc4 - ACHEM_htapv2.2.emisso2.elevated.x3600y1800t12.2017.integrate.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htapv2.2.emisso2.elevated.x3600y1800t12.2017.integrate.nc4 - ACHEM_htapv2.2.emisso2.surface.x3600y1800t12.2017.integrate.nc4: - template: ExtData/chemistry/HTAP/v2.2/sfc/htapv2.2.emisso2.surface.x3600y1800t12.2017.integrate.nc4 - ACHEM_qfed2.emis_co.061.%y4%m2%d2.nc4: - template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_co.061.%y4%m2%d2.nc4 - valid_range: "2000-02-29T12:00/2025-01-01" - ACHEM_hfed.emis_co.x576_y361.%y4%m2.nc4: - template: ExtData/chemistry/HFED/v1.0/Y%y4/M%m2/hfed.emis_co.x576_y361.%y4%m2.nc4 - valid_range: "1960-01-16T12:00/2000-12-16T12:00" - ACHEM_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" - ACHEM_hfed.emis_nh3.x576_y361.%y4%m2.nc4: - template: ExtData/chemistry/HFED/v1.0/Y%y4/M%m2/hfed.emis_nh3.x576_y361.%y4%m2.nc4 - valid_range: "1960-01-16T12:00/2000-12-16T12:00" - ACHEM_qfed2.emis_so2.061.%y4%m2%d2.nc4: - template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.061.%y4%m2%d2.nc4 - valid_range: "2000-02-29T12:00/2025-01-01" - ACHEM_hfed.emis_so2.x576_y361.%y4%m2.nc4: - template: ExtData/chemistry/HFED/v1.0/Y%y4/M%m2/hfed.emis_so2.x576_y361.%y4%m2.nc4 - valid_range: "1960-01-16T12:00/2000-12-16T12:00" - - - -Samplings: - ACHEM_sample_0: - update_frequency: PT24H - update_offset: PT12H - update_reference_time: '0' - ACHEM_sample_1: - extrapolation: clim - update_frequency: PT24H - update_offset: PT12H - update_reference_time: '0' - ACHEM_sample_2: - extrapolation: clim - -Exports: - CO_BF_VOC: - collection: /dev/null - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: emcobf - CO_BIOMASS_VOC: - - {starting: "1960-01-16T12:00", collection: ACHEM_hfed.emis_co.x576_y361.%y4%m2.nc4, regrid: CONSERVE, sample: ACHEM_sample_0, variable: biomass} - - {starting: "2000-03-01T00:00", collection: ACHEM_qfed2.emis_co.061.%y4%m2%d2.nc4, regrid: CONSERVE, sample: ACHEM_sample_0, variable: biomass} - CO_FS_VOC: - collection: ACHEM_CO-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4 - regrid: CONSERVE - sample: ACHEM_sample_0 - variable: co - DMS_CONC_OCEAN: - collection: ACHEM_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4 - linear_transformation: - - 0.0 - - 1.0e-06 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: conc - H2O2: - collection: ACHEM_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - variable: h2o2 - NH3_EMIS: - collection: ACHEM_edgar-v42.emis_nh3.anthropogenic.x1152_y721.19700703T12z_20200703T00z.nc4 - regrid: CONSERVE - variable: emi_nh3 - NH3_EMIS_FIRE: - - {starting: "1960-01-16T12:00", collection: ACHEM_hfed.emis_nh3.x576_y361.%y4%m2.nc4, regrid: CONSERVE, sample: ACHEM_sample_0, variable: biomass} - - {starting: "2000-03-01T00:00", collection: ACHEM_qfed2.emis_nh3.061.%y4%m2%d2.nc4, regrid: CONSERVE, sample: ACHEM_sample_0, variable: biomass} - NH3_EMIS_OCEAN: - collection: ACHEM_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: emiss_ocn - NO3: - collection: ACHEM_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - variable: no3 - OH: - collection: ACHEM_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4 - variable: oh - SO2_EMIS_AIRCRAFT_CDS: - collection: ACHEM_htap-v2.2.emis_so2.aviation_cds.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_aviation - SO2_EMIS_AIRCRAFT_CRS: - collection: ACHEM_htap-v2.2.emis_so2.aviation_crs.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_aviation - SO2_EMIS_AIRCRAFT_LTO: - collection: ACHEM_htap-v2.2.emis_so2.aviation_lto.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_aviation - SO2_EMIS_ENERGY: - collection: ACHEM_htapv2.2.emisso2.elevated.x3600y1800t12.2017.integrate.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: sanl2 - SO2_EMIS_FIRES: - - {starting: "1960-01-16T12:00", collection: ACHEM_hfed.emis_so2.x576_y361.%y4%m2.nc4, regrid: CONSERVE, sample: ACHEM_sample_0, variable: biomass} - - {starting: "2000-03-01T00:00", collection: ACHEM_qfed2.emis_so2.061.%y4%m2%d2.nc4, regrid: CONSERVE, sample: ACHEM_sample_0, variable: biomass} - SO2_EMIS_NONENERGY: - collection: ACHEM_htapv2.2.emisso2.surface.x3600y1800t12.2017.integrate.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: sanl1 - SO2_EMIS_SHIPPING: - collection: ACHEM_htap-v2.2.emis_so2.ships.x3600_y1800_t12.2010.nc4 - regrid: CONSERVE - sample: ACHEM_sample_1 - variable: so2_ship - SOAG_EMIS: - collection: ACHEM_SOAG.emiss.x144_y91_t12.1990.nc4 - sample: ACHEM_sample_2 - variable: soag - diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ddaaf..972f8da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +- Removed `*_GridComp_ExtData.yaml` files. These have been migrated to the new `Aerosol_ExtData` repository. + ### Deprecated ## [1.0.1] - 2025-09-09 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ec1530..3804a8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ new_esma_generate_automatic_code ( "-f" ) -file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml) +file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc) foreach ( file ${rc_files} ) get_filename_component( dir ${file} DIRECTORY ) install( FILES ${file} DESTINATION etc/${dir} )