Skip to content

Commit

Permalink
Merge branch 'develop' into feature/jrjoshi1/#267/RemoveExtData.rc
Browse files Browse the repository at this point in the history
  • Loading branch information
@vbuchard
vbuchard authored Aug 12, 2024
2 parents 12e554a + 3c84363 commit c10f7a8
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 79 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Removed all ExtData.rc files

## [Unreleased] - 2024-05-14

### Added

- Required attributes for the 2D GOCART export fields in AERO_DP bundle have been set in subroutine append_to_bundle in Chem_AeroGeneric.F90. These export fields are imported by OBIO via Surface GC, and the missing of the attributes was causing the writing of surface import checkpoint to fail. The issue has been explained in detail on https://github.com/GEOS-ESM/GOCART/issues/258

## [Unreleased] - 2023-07-24


### Fixed


- corrected reading variable 'rhod' from files ( it was mispelled as 'rhop')

- Silenced unwarranted error messages from wavelength/channel retrieval functions occurring when 470nm and/or 870nm channels are not included in GOCART resource file.

- Add explicit `find_package()` calls for missing dependencies for MAPL for builds with spack-stack. Will eventually be fixed in MAPL in later versions
- Corrected the units of the gravimetric soil moisture to percent instead of fractional in the FENGSHA dust scheme.

Expand All @@ -22,7 +33,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Additional tuning parameters for the soil moisture and drylimit calculations for application specific tuning.

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

- State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that the long names for AOD are more intuitive

- 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

- 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)
Expand All @@ -36,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Moved process library macros to header file.


## [v2.2.1] - 2023-05-30

### Fixed
Expand Down
8 changes: 4 additions & 4 deletions ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
28 changes: 14 additions & 14 deletions ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -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
#----------------------------------------------------------------------------------------
Expand Down
24 changes: 12 additions & 12 deletions ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit c10f7a8

Please sign in to comment.