Skip to content

Commit

Permalink
Merge pull request #275 from GEOS-ESM/feature/acollow/aerosollongname…
Browse files Browse the repository at this point in the history 
…sforM21C

Updates to aerosol long names to be used for MERRA-21C
  • Loading branch information
@sdrabenh
sdrabenh committed May 17, 2024
2 parents ead8976 + cdce3cd commit 13cb65a
Show file tree
Hide file tree
Showing 9 changed files with 148 additions and 120 deletions.
5 changes: 3 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2.1

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

orbs:
ci: geos-esm/circleci-tools@1
Expand Down Expand Up @@ -50,5 +50,6 @@ workflows:
baselibs_version: *baselibs_version
repo: GEOSgcm
checkout_fixture: true
fixture_branch: R21C
mepodevelop: true
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
29 changes: 29 additions & 0 deletions .github/workflows/enforce-labels.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Enforce PR Labels

on:
pull_request:
types: [opened, labeled, unlabeled, edited, synchronize]

jobs:
require-label:
runs-on: ubuntu-latest
steps:
- uses: mheap/github-action-required-labels@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
mode: minimum
count: 1
labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled"
add_comment: true
blocking-label:
runs-on: ubuntu-latest
steps:
- uses: mheap/github-action-required-labels@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
mode: exactly
count: 0
labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve"
add_comment: true
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

### Changed
Long names in State Spec files

## v2.1.2+R21C_v1.0.1

Expand Down
62 changes: 31 additions & 31 deletions ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,36 +74,36 @@ category: EXPORT
#----------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME
#----------------------------------------------------------------------------------------
*MASS | kg kg-1 | xyz | C | | Carbonaceous Aerosol Mass Mixing Ratio
*CONC | kg m-3 | xyz | C | | Carbonaceous Aerosol Mass Concentration
*EXTCOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Carbonaceous Aerosol Extinction Coefficient
*EXTCOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Carbonaceous Aerosol Extinction Coefficient - Fixed RH=20%
*EXTCOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Carbonaceous Aerosol Extinction Coefficient - Fixed RH=80%
*SCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Carbonaceous Aerosol Scattering Coefficient
*SCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Carbonaceous Aerosol Scattering Coefficient - Fixed RH=20%
*SCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Carbonaceous Aerosol Scattering Coefficient - Fixed RH=80%
*MASS | kg kg-1 | xyz | C | | * Aerosol Mass Mixing Ratio
*CONC | kg m-3 | xyz | C | | * Aerosol Mass Concentration
*EXTCOEF | m-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Extinction Coefficient
*EXTCOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Extinction Coefficient - Fixed RH=20%
*EXTCOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Extinction Coefficient - Fixed RH=80%
*SCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Scattering Coefficient
*SCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Scattering Coefficient - Fixed RH=20%
*SCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Scattering Coefficient - Fixed RH=80%
#............ | ............ | ..... | ..... | ....... | ............................................
*EM | kg m-2 s-1 | xy | N | nbins | Carbonaceous Aerosol Emission (Bin %d)
*SD | kg m-2 s-1 | xy | N | nbins | Carbonaceous Aerosol Sedimentation (Bin %d)
*DP | kg m-2 s-1 | xy | N | nbins | Carbonaceous Aerosol Dry Deposition (Bin %d)
*WT | kg m-2 s-1 | xy | N | nbins | Carbonaceous Aerosol Wet Deposition (Bin %d)
*SV | kg m-2 s-1 | xy | N | nbins | Carbonaceous Aerosol Convective Scavenging (Bin %d)
*EMAN | kg m-2 s-1 | xy | N | | Carbonaceous Aerosol Anthropogenic Emissions
*EMBB | kg m-2 s-1 | xy | N | | Carbonaceous Aerosol Biomass Burning Emissions
*EMBF | kg m-2 s-1 | xy | N | | Carbonaceous Aerosol Biofuel Emissions
*EMBG | kg m-2 s-1 | xy | N | | Carbonaceous Aerosol Biogenic Emissions
*HYPHIL | kg m-2 s-1 | xy | N | | Carbonaceous Aerosol Hydrophobic to Hydrophilic
*PSOA | kg m-2 s-1 | xy | N | | Carbonaceous Aerosol SOA Production
*SMASS | kg m-3 | xy | N | | Carbonaceous Aerosol Surface Mass Concentration
*CMASS | kg m-2 | xy | N | | Carbonaceous Aerosol Column Mass Density
*EXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Carbonaceous Aerosol Extinction AOT
*STEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Carbonaceous Aerosol Extinction AOT Stratosphere
*SCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Carbonaceous Aerosol Scattering AOT
*STSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Carbonaceous Aerosol Scattering AOT Stratosphere
*ANGSTR | 1 | xy | N | | Carbonaceous Aerosol Angstrom parameter [470-870 nm]
*FLUXU | kg m-1 s-1 | xy | N | | Carbonaceous Aerosol column u-wind mass flux
*FLUXV | kg m-1 s-1 | xy | N | | Carbonaceous Aerosol column v-wind mass flux
*AERIDX | 1 | xy | N | | Carbonaceous Aerosol TOMS UV Aerosol Index
*EM | kg m-2 s-1 | xy | N | nbins | * Aerosol Emission (Bin %d)
*SD | kg m-2 s-1 | xy | N | nbins | * Aerosol Sedimentation (Bin %d)
*DP | kg m-2 s-1 | xy | N | nbins | * Aerosol Dry Deposition (Bin %d)
*WT | kg m-2 s-1 | xy | N | nbins | * Aerosol Wet Deposition (Bin %d)
*SV | kg m-2 s-1 | xy | N | nbins | * Aerosol Convective Scavenging (Bin %d)
*EMAN | kg m-2 s-1 | xy | N | | * Aerosol Anthropogenic Emissions
*EMBB | kg m-2 s-1 | xy | N | | * Aerosol Biomass Burning Emissions
*EMBF | kg m-2 s-1 | xy | N | | * Aerosol Biofuel Emissions
*EMBG | kg m-2 s-1 | xy | N | | * Aerosol Biogenic Emissions
*HYPHIL | kg m-2 s-1 | xy | N | | * Aerosol Hydrophobic to Hydrophilic
*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 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
*AERIDX | 1 | xy | N | | * Aerosol TOMS UV Aerosol Index



Expand All @@ -113,8 +113,8 @@ category: INTERNAL
#--------------------------------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME
#--------------------------------------------------------------------------------------------------------------
*phobic | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Carbonaceous Aerosol Mixing Ratio
*philic | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Carbonaceous Aerosol Mixing Ratio
*phobic | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | * Hydrophobic Aerosol Mixing Ratio
*philic | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | * Hydrophilic Aerosol Mixing Ratio

#********************************************************
#
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 @@ -70,19 +70,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
37 changes: 18 additions & 19 deletions ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ category: IMPORT
#----------------------------------------------------------------------------------------
# VARIABLE | DIMENSIONS | Additional Metadata
#----------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | COND | LONG NAME
NAME | UNITS | DIMS | VLOC | COND | LONG NAME
#----------------------------------------------------------------------------------------
# DELP | Pa | xyz | C | | pressure_thickness
# RH2 | 1 | xyz | C | | Rel_Hum_after_moist
# DELP | Pa | xyz | C | | pressure_thickness
# RH2 | 1 | xyz | C | | Rel_Hum_after_moist


category: EXPORT
#----------------------------------------------------------------------------------------
Expand All @@ -18,27 +19,27 @@ 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%
TOTEXTCOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient - Fixed RH=80%
TOTSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Scattering coefficient
TOTSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Scattering coefficient - Fixed RH=20%
TOTSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Scattering coefficient - Fixed RH=80%
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 Expand Up @@ -76,5 +77,3 @@ category: INTERNAL
# E | VLOC | MAPL_VlocationEdge
# N | VLOC | MAPL_VlocationNone
#--------------------------------------------


Loading

0 comments on commit 13cb65a

Please sign in to comment.