Skip to content

Commit

Permalink
Merge branch 'develop' into feature/borescan_update_legacy_bcs_path
Browse files Browse the repository at this point in the history
  • Loading branch information
@amdasilva
amdasilva authored May 12, 2023
2 parents c463e87 + e3386e8 commit 2e12769
Show file tree
Hide file tree
Showing 28 changed files with 616 additions and 799 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Made needed code changes in SS2G_GridCompMod.F90 and
CA2G_GridCompMod.F90 to permit data instances of of GOCART
aerosols to run
- Added missing brown carbon (BR) climatology hooks to yaml and rc
files for data driven instances
- Changed pointers to climatological deposition inputs in yaml and
rc files to "/dev/null" since the files pointed to didn't provide
them anyway, and in any case they are being used presently in the
model
- Changed pointers to climatological nitrate inputs in yaml and rc
files to "/dev/null" since pointing to FP files was inconsistent
with MERRA-2 files used for other species
- Ensured zero-diff in performance of yaml vs. rc files for
ExtData2G vs. ExtData1g for data driven aerosols
- To do: remove hooks to old (legacy) GOCART.data instances in CHEM
and setup scripts

### Added

### Fixed
Expand All @@ -15,11 +33,17 @@ Fixed rc file in legacy O3 component.

### Changed

## [2.1.4] - 2023-05-04

### Fixed

- Fix in GOCART2G parent so that it can run with nitrates turned off. This patch of general utility was contributed by NOAA.

## [2.1.3] - 2023-02-27

### Added


- Added `*` to CA State specs file to allow for ACG to substitute in the long name
- Changes were made so GOCART2G and its children can be run with component level
OpenMP threading. The key change is to create the data structure ThreadWorkspace
Expand Down
46 changes: 29 additions & 17 deletions ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,42 @@ PrimaryExports%%

#========== 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

climBCDP001 'kg m-2 s-1' Y N 0 0.0 1.0 BCDP001 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climBCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT001 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climBCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT002 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climOCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT001 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climOCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT002 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ===========================================
Expand Down
46 changes: 29 additions & 17 deletions ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,42 @@ PrimaryExports%%

#========== 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

climBCDP001 'kg m-2 s-1' Y N 0 0.0 1.0 BCDP001 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climBCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT001 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climBCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 BCWT002 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climOCWT001 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT001 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
climOCWT002 'kg m-2 s-1' Y N 0 0.0 1.0 OCWT002 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
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 ===========================================
Expand Down
87 changes: 37 additions & 50 deletions ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ Collections:
template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
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
valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4:
template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.061.%y4%m2%d2.nc4
valid_range: "2000-02-29T12:00/2025-01-01"
Expand Down Expand Up @@ -186,85 +185,73 @@ Exports:
sample: CA2G_sample_1
variable: oc_shipping
climBCDP001:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: BCDP001
collection: /dev/null
climBCDP002:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: BCDP002
collection: /dev/null
climBCSD001:
collection: /dev/null
sample: CA2G_sample_0
variable: BCSD001
climBCSD002:
collection: /dev/null
sample: CA2G_sample_0
variable: BCSD002
climBCSV001:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: BCSV001
collection: /dev/null
climBCSV002:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: BCSV002
collection: /dev/null
climBCWT001:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: BCWT001
collection: /dev/null
climBCWT002:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: BCWT002
collection: /dev/null
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
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
climOCDP001:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: OCDP001
collection: /dev/null
climOCDP002:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: OCDP002
collection: /dev/null
climOCSD001:
collection: /dev/null
sample: CA2G_sample_0
variable: OCSD001
climOCSD002:
collection: /dev/null
sample: CA2G_sample_0
variable: OCSD002
climOCSV001:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: OCSV001
collection: /dev/null
climOCSV002:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: OCSV002
collection: /dev/null
climOCWT001:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: OCWT001
collection: /dev/null
climOCWT002:
collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
sample: CA2G_sample_0
variable: OCWT002
collection: /dev/null
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
Expand Down
Loading

0 comments on commit 2e12769

Please sign in to comment.