Skip to content

Commit

Permalink
Merge pull request #237 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history 
Updates for Release v2.2.0
  • Loading branch information
@amdasilva
amdasilva authored May 18, 2023
2 parents 3ddd39f + 4c1323a commit cfab4fa
Show file tree
Hide file tree
Showing 36 changed files with 931 additions and 1,155 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.7.0
bcs_version: &bcs_version v10.23.0
bcs_version: &bcs_version v11.00.0

orbs:
ci: geos-esm/circleci-tools@1
Expand Down
43 changes: 32 additions & 11 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

### Added

### Changed

## [v2.2.0] - 2023-05-18

### 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
- Fixed rc file in legacy O3 component.
- Fixed issue #223 where Global dimension was being used for allocating a local array
- This fixes a long standing issue that one can not start and stop the model in anything less than 3 hour increments to test start/stop regression because of GOCART.
- Fix issue with scattering coefficient calculation with oc
- Fix a long standing issue that one can not start and stop the model in anything less than 3 hour increments to test start/stop regression because of GOCART.

### Added

### Changed

## [2.1.4] - 2023-05-04
- Comment out ASSERT to allow `GOCART_DT` to not match the `HEARTBEAT_DT`
- Single-moment moist changes from Donifan
- Change names of microphysics schemes to match refactored physics
- Set `SS_SCALE` default to 0.0
- Updates in CA2G for OpenMP
- Updates for CI
- Update BCs version
- Update components to match GEOSgcm v11.0.0

## [2.1.4] - 2023-05-12

### Fixed

Expand All @@ -23,10 +52,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### 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
- 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
to hold variables that should be private to each thread to avoid race conditions.
Additionally spatially distributed arrays that are not in any of the ESMF states
were added to the ESMF internal state so they could be properly handled when
Expand All @@ -36,8 +64,6 @@ option so they are not written to restart.
- Aerosol single scattering backscatter coefficient for each instances and total at wavelengths_profile
- Total (molecular + aerosols) attenuated backscatter coefficient from TOA and sfc at 532nm

### Fixed

### Changed

- Moved to use GitHub Action for label enforcement
Expand All @@ -56,11 +82,6 @@ option so they are not written to restart.
- Extinction/Scattering profile exports at model RH at wavelengths_profile
- Extinction/Scattering profile exports with RH=20% and RH=80% at wavelengths_profile

### Fixed

### Changed


## [2.1.1] - 2022-09-16

### Fixed
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
Loading

0 comments on commit cfab4fa

Please sign in to comment.