From 22a733bf2e1885febf0ee1b4364195c9574c7f23 Mon Sep 17 00:00:00 2001 From: acollow Date: Fri, 26 Apr 2024 08:47:57 -0400 Subject: [PATCH 1/7] Updates to aerosol long names to be used for MERRA-21C --- CHANGELOG.md | 1 + .../CA2G_GridComp/CA2G_StateSpecs.rc | 63 ++++----- .../DU2G_GridComp/DU2G_StateSpecs.rc | 21 +-- ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc | 125 +++++++++++++++--- .../NI2G_GridComp/NI2G_StateSpecs.rc | 47 +++---- .../SS2G_GridComp/SS2G_StateSpecs.rc | 37 +++--- .../SU2G_GridComp/SU2G_StateSpecs.rc | 36 ++--- 7 files changed, 214 insertions(+), 116 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c84a89b5..de6bebbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc index 83057eae..f0fe0eb4 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc @@ -74,36 +74,37 @@ 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% + *BCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Backscatter Coefficient #............ | ............ | ..... | ..... | ....... | ............................................ - *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 @@ -113,8 +114,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 #******************************************************** # diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc index ea832c98..d5fc35fc 100644 --- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc @@ -67,22 +67,23 @@ category: EXPORT DUSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Dust Scattering Coefficient DUSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Dust Scattering Coefficient - Fixed RH=20% DUSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Dust Scattering Coefficient - Fixed RH=80% + DUBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Dust Backscatter Coefficient #........................................................................................ 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) diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc index 2132ce85..b6c43cc6 100644 --- a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc @@ -5,10 +5,13 @@ category: IMPORT #---------------------------------------------------------------------------------------- # VARIABLE | DIMENSIONS | Additional Metadata #---------------------------------------------------------------------------------------- - NAME | UNITS | DIMS | VLOC | COND | LONG NAME + NAME | UNITS | DIMS | VLOC | RESTART | 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 + AIRDENS | kg/m^3 | xyz | C | OPT | moist_air_density + T | K | xyz | C | OPT | air_temperature + PLE | Pa | xyz | E | OPT | air_pressure category: EXPORT #---------------------------------------------------------------------------------------- @@ -18,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% @@ -33,12 +36,100 @@ category: EXPORT 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%) + 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 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 +#---------------------------------------------------------------------------------------- +# VARIABLE | DIMENSION | Additional Metadata +#---------------------------------------------------------------------------------------- + NAME | UNITS | DIMS | VLOC | UNGRIDDED | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME +#---------------------------------------------------------------------------------------- + + + +#******************************************************** +# +# Legend +# +#------------------------------------------------------------------ +# Column label | MAPL keyword/interpretation | Default +#--------------|--------------------------------------------------- +# NAME | short_name | +# UNITS | units | +# DIMS | dims | +# VLOC | VLocation | MAPL_VLocationNone +# LONG NAME | long_name | +# COND | if () then | .FALSE. +# NUM_SUBTILES | num_subtiles +# ... +#------------------------------------------------------------------ +# +#-------------------------------------------- +# Entry alias | Column | MAPL keyword/interpretation +#--------------|----------------------------- +# xyz | DIMS | MAPL_HorzVert +# xy | DIMS | MAPL_HorzOnly +# z | DIMS | MAPL_VertOnly (plus ungridded) +# C | VLOC | MAPL_VlocationCenter +# E | VLOC | MAPL_VlocationEdge +# N | VLOC | MAPL_VlocationNone +#-------------------------------------------- + +schema_version: 2.0.0 +component: GOCART2G + +category: IMPORT +#---------------------------------------------------------------------------------------- +# VARIABLE | DIMENSIONS | Additional Metadata +#---------------------------------------------------------------------------------------- + NAME | UNITS | DIMS | VLOC | RESTART | LONG NAME +#---------------------------------------------------------------------------------------- + DELP | Pa | xyz | C | | pressure_thickness +# RH2 | 1 | xyz | C | | Rel_Hum_after_moist + AIRDENS | kg/m^3 | xyz | C | OPT | moist_air_density + T | K | xyz | C | OPT | air_temperature + PLE | Pa | xyz | E | OPT | air_pressure + +category: EXPORT +#---------------------------------------------------------------------------------------- +# VARIABLE | DIMENSIONS | Additional Metadata +#---------------------------------------------------------------------------------------- + NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME +#---------------------------------------------------------------------------------------- + PSO4TOT | kg m-2 s-1 | xyz | C | | Total Sulfate Produced in GOCART +#........................................................................................ + 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% + 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 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 #---------------------------------------------------------------------------------------- diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc index 7531b822..b0cc0632 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc @@ -49,18 +49,19 @@ 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% NISCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Scattering Coefficient NISCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Scattering Coefficient - fixed RH=20% NISCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Scattering Coefficient - fixed RH=80% + NIBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Backscatter Coefficient # ............. | ............ | ..... | ..... | ........... | .................................. NIPNO3AQ | kg m-2 s-1 | xy | N | | Nitrate Production from Aqueous Chemistry NIPNH4AQ | kg m-2 s-1 | xy | N | | Ammonium Production from Aqueous Chemistry @@ -82,36 +83,36 @@ 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 category: INTERNAL -#--------------------------------------------------------------------------------------------------------------- -# VARIABLE | DIMENSION | Additional Metadata -#--------------------------------------------------------------------------------------------------------------- - NAME | UNITS | DIMS | VLOC | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME -#--------------------------------------------------------------------------------------------------------------- - NH3 | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Ammonia (NH3, gas phase) - NH4a | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Ammonium ion (NH4+, aerosol phase) - NO3an1 | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 001 - NO3an2 | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 002 - NO3an3 | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 003 - +#---------------------------------------------------------------------------------------- +# VARIABLE | DIMENSION | Additional Metadata +#---------------------------------------------------------------------------------------- + NAME | UNITS | DIMS | VLOC | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME +#---------------------------------------------------------------------------------------- + NH3 |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Ammonia (NH3, gas phase) + NH4a |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Ammonium ion (NH4+, aerosol phase) + NO3an1 |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 001 + NO3an2 |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 002 + NO3an3 |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 003 + XHNO3 |kg m-2 s-1| xyz | C | | F | | buffer for NITRATE_HNO3 #******************************************************** # diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc index 6fe202fd..6adfe688 100644 --- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc @@ -42,7 +42,7 @@ category: EXPORT NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME #---------------------------------------------------------------------------------------- SSMASS | kg kg-1 | xyz | C | | Sea Salt Mass Mixing Ratio - SSMASS25 | kg kg-1 | xyz | C | | Sea Salt Mass Mixing Ratio - PM 2.5 + SSMASS25 | kg kg-1 | xyz | C | | Sea Salt Mass Mixing Ratio of Particulate Matter < 2.5 microns (PM2.5) SSCONC | kg m-3 | xyz | C | | Sea Salt Mass Concentration SSEXTCOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient SSEXTCOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient - Fixed RH=20% @@ -50,6 +50,7 @@ category: EXPORT SSSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient SSSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient - Fixed RH=20% SSSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient - Fixed RH=80% + SSBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Backscatter Coefficient #............. | ............ | ..... | ..... | ............ | .................................. SSEM | kg m-2 s-1 | xy | N | self%nbins | Sea Salt Emission (Bin %d) SSSD | kg m-2 s-1 | xy | N | self%nbins | Sea Salt Sedimentation (Bin %d) @@ -58,30 +59,30 @@ category: EXPORT SSSV | kg m-2 s-1 | xy | N | self%nbins | Sea Salt Convective Scavenging (Bin %d) SSSMASS | kg m-3 | xy | N | | Sea Salt Surface Mass Concentration SSCMASS | kg m-2 | xy | N | | Sea Salt Column Mass Density - SSEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT - SSSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT Stratosphere - SSSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT - SSSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT Stratosphere - SSSMASS25 | kg m-3 | xy | N | | Sea Salt Surface Mass Concentration - PM 2.5 - SSCMASS25 | kg m-2 | xy | N | | Sea Salt Column Mass Density - PM 2.5 - SSEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT - PM 2.5 - SSSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT - PM 2.5 + SSEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth + SSSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness + SSSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering + SSSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness Due to Scattering + SSSMASS25 | kg m-3 | xy | N | | Sea Salt Surface Mass Concentration of Particulate Matter < 2.5 microns (PM2.5) + SSCMASS25 | kg m-2 | xy | N | | Sea Salt Column Mass Density of Particulate Matter < 2.5 microns (PM2.5) + SSEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5) + SSSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5) SSAERIDX | 1 | xy | N | | Sea Salt TOMS UV Aerosol Index - SSEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Extinction AOT [550 nm] - PM 1.0 um - SSSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Scattering AOT [550 nm] - PM 1.0 um + SSEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0) + SSSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0) SSANGSTR | 1 | xy | N | | Sea Salt Angstrom parameter [470-870 nm] SSFLUXU | kg m-1 s-1 | xy | N | | Sea Salt column u-wind mass flux SSFLUXV | kg m-1 s-1 | xy | N | | Sea Salt column v-wind mass flux category: INTERNAL -#-------------------------------------------------------------------------------------------------------------------------- -# VARIABLE | DIMENSION | Additional Metadata -#-------------------------------------------------------------------------------------------------------------------------- - NAME | UNITS | DIMS | VLOC | UNGRIDDED | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME -#-------------------------------------------------------------------------------------------------------------------------- - SS | kg kg-1 | xyz | C | self%nbins | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sea Salt Mixing Ratio (bin %d) - +#---------------------------------------------------------------------------------------- +# VARIABLE | DIMENSION | Additional Metadata +#---------------------------------------------------------------------------------------- + NAME | UNITS | DIMS | VLOC | UNGRIDDED | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME +#---------------------------------------------------------------------------------------- + SS |kg kg-1| xyz | C | self%nbins | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sea Salt Mixing Ratio (bin %d) + DEEP_LAKES_MASK | 1 | xy | N | | MAPL_RestartSkip | F | | Deep Lakes Mask #******************************************************** # diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc index 10aa5531..de6c6ddb 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc @@ -53,10 +53,10 @@ category: EXPORT #---------------------------------------------------------------------------------------- NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME #---------------------------------------------------------------------------------------- - SUEM | kg m-2 s-1 | xy | N | self%nbins | Sulfer Emission (Bin %d) - SUDP | kg m-2 s-1 | xy | N | self%nbins | Sulfate Dry Deposition (Bin %d) - SUSD | kg m-2 s-1 | xy | N | self%nbins | Sulfate Settling (Bin %d) - SUWT | kg m-2 s-1 | xy | N | self%nbins | Sulfate Wet Deposition (Bin %d) + SUEM | kg m-2 s-1 | xy | N | self%nbins | Sulfur Emission (Bin %d) + SUDP | kg m-2 s-1 | xy | N | self%nbins | Sulfur Dry Deposition (Bin %d) + SUSD | kg m-2 s-1 | xy | N | self%nbins | Sulfur Settling (Bin %d) + SUWT | kg m-2 s-1 | xy | N | self%nbins | Sulfur Wet Deposition (Bin %d) SUSV | kg m-2 s-1 | xy | N | self%nbins | Sulfate Convective Scavenging (Bin %d) SO4EMAN | kg m-2 s-1 | xy | N | | SO4 Anthropogenic Emissions SO2EMAN | kg m-2 s-1 | xy | N | | SO2 Anthropogenic Emissions @@ -90,27 +90,29 @@ category: EXPORT SUSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | SO4 Scattering Coefficient SUSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | SO4 Scattering Coefficient - Fixed RH=20% SUSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | SO4 Scattering Coefficient - Fixed RH=80% + SUBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | SO4 Backscatter Coefficient SUANGSTR | 1 | xy | N | | SO4 Angstrom parameter [470-870 nm] SUFLUXU | kg m-1 s-1 | xy | N | | SO4 column u-wind mass flux SUFLUXV | kg m-1 s-1 | xy | N | | SO4 column v-wind mass flux SO4MASS | kg kg-1 | xyz | C | | SO4 Aerosol Mass Mixing Ratio - SUEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Extinction AOT - SUSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Extinction AOT Stratosphere - SUSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Scattering AOT - SUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Scattering AOT Stratosphere + SUEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth + SUSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Thickness + SUSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth Due to Scattering + SUSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Depth Due to Scattering SO4SAREA | m2 m-3 | xyz | C | | SO4 Surface Area Density SO4SNUM | m-3 | xyz | C | | SO4 Number Density category: INTERNAL -#------------------------------------------------------------------------------------------------------------ -# VARIABLE | DIMENSION | Additional Metadata -#------------------------------------------------------------------------------------------------------------ - NAME | UNITS | DIMS | VLOC | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME -#------------------------------------------------------------------------------------------------------------ - DMS | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Dimethylsulphide - SO2 | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphur dioxide - SO4 | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphate aerosol - MSA | kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Methanesulphonic acid +#---------------------------------------------------------------------------------------- +# VARIABLE | DIMENSION | Additional Metadata +#---------------------------------------------------------------------------------------- + NAME | UNITS | DIMS | VLOC | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME +#---------------------------------------------------------------------------------------- + DMS |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Dimethylsulphide + SO2 |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphur dioxide + SO4 |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphate aerosol + MSA |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Methanesulphonic acid + H2O2_INIT |kg kg-1| xyz | C | | F | | private H2O2 that is saved and used to initialize #******************************************************** From c1ec477ea0855d171d6dede75e7528615006e96c Mon Sep 17 00:00:00 2001 From: acollow Date: Mon, 29 Apr 2024 14:24:52 -0400 Subject: [PATCH 2/7] Modified to align with branch for R21C --- ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc | 1 - ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc | 1 - ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc | 2 -- ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc | 2 -- ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc | 2 -- 5 files changed, 8 deletions(-) diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc index f0fe0eb4..60fd1960 100644 --- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc @@ -82,7 +82,6 @@ category: EXPORT *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% - *BCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | * Aerosol Backscatter Coefficient #............ | ............ | ..... | ..... | ....... | ............................................ *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) diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc index d5fc35fc..d5366ea0 100644 --- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc @@ -67,7 +67,6 @@ category: EXPORT DUSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Dust Scattering Coefficient DUSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Dust Scattering Coefficient - Fixed RH=20% DUSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Dust Scattering Coefficient - Fixed RH=80% - DUBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Dust Backscatter Coefficient #........................................................................................ DUSMASS | kg m-3 | xy | N | | Dust Surface Mass Concentration DUCMASS | kg m-2 | xy | N | | Dust Column Mass Density diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc index b0cc0632..49c0375d 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc @@ -61,7 +61,6 @@ category: EXPORT NISCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Scattering Coefficient NISCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Scattering Coefficient - fixed RH=20% NISCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Scattering Coefficient - fixed RH=80% - NIBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Nitrate Backscatter Coefficient # ............. | ............ | ..... | ..... | ........... | .................................. NIPNO3AQ | kg m-2 s-1 | xy | N | | Nitrate Production from Aqueous Chemistry NIPNH4AQ | kg m-2 s-1 | xy | N | | Ammonium Production from Aqueous Chemistry @@ -112,7 +111,6 @@ category: INTERNAL NO3an1 |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 001 NO3an2 |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 002 NO3an3 |kg kg-1 | xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Nitrate size bin 003 - XHNO3 |kg m-2 s-1| xyz | C | | F | | buffer for NITRATE_HNO3 #******************************************************** # diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc index 6adfe688..a9b43448 100644 --- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc @@ -50,7 +50,6 @@ category: EXPORT SSSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient SSSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient - Fixed RH=20% SSSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient - Fixed RH=80% - SSBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Sea Salt Backscatter Coefficient #............. | ............ | ..... | ..... | ............ | .................................. SSEM | kg m-2 s-1 | xy | N | self%nbins | Sea Salt Emission (Bin %d) SSSD | kg m-2 s-1 | xy | N | self%nbins | Sea Salt Sedimentation (Bin %d) @@ -82,7 +81,6 @@ category: INTERNAL NAME | UNITS | DIMS | VLOC | UNGRIDDED | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME #---------------------------------------------------------------------------------------- SS |kg kg-1| xyz | C | self%nbins | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sea Salt Mixing Ratio (bin %d) - DEEP_LAKES_MASK | 1 | xy | N | | MAPL_RestartSkip | F | | Deep Lakes Mask #******************************************************** # diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc index de6c6ddb..e74cd906 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc @@ -90,7 +90,6 @@ category: EXPORT SUSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | SO4 Scattering Coefficient SUSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | SO4 Scattering Coefficient - Fixed RH=20% SUSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | SO4 Scattering Coefficient - Fixed RH=80% - SUBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | SO4 Backscatter Coefficient SUANGSTR | 1 | xy | N | | SO4 Angstrom parameter [470-870 nm] SUFLUXU | kg m-1 s-1 | xy | N | | SO4 column u-wind mass flux SUFLUXV | kg m-1 s-1 | xy | N | | SO4 column v-wind mass flux @@ -112,7 +111,6 @@ category: INTERNAL SO2 |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphur dioxide SO4 |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Sulphate aerosol MSA |kg kg-1| xyz | C | MAPL_RestartOptional | T | DYNAMICS:TURBULENCE:MOIST | Methanesulphonic acid - H2O2_INIT |kg kg-1| xyz | C | | F | | private H2O2 that is saved and used to initialize #******************************************************** From 283ad7efc3df0f32c208301e1ac3acd4dc585aa5 Mon Sep 17 00:00:00 2001 From: acollow Date: Mon, 29 Apr 2024 14:26:32 -0400 Subject: [PATCH 3/7] Modified to align with branch for R21C --- ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc | 90 ------------------- 1 file changed, 90 deletions(-) diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc index b6c43cc6..7aeb4838 100644 --- a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc @@ -36,9 +36,6 @@ category: EXPORT 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% - 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 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 @@ -82,90 +79,3 @@ category: INTERNAL # E | VLOC | MAPL_VlocationEdge # N | VLOC | MAPL_VlocationNone #-------------------------------------------- - -schema_version: 2.0.0 -component: GOCART2G - -category: IMPORT -#---------------------------------------------------------------------------------------- -# VARIABLE | DIMENSIONS | Additional Metadata -#---------------------------------------------------------------------------------------- - NAME | UNITS | DIMS | VLOC | RESTART | LONG NAME -#---------------------------------------------------------------------------------------- - DELP | Pa | xyz | C | | pressure_thickness -# RH2 | 1 | xyz | C | | Rel_Hum_after_moist - AIRDENS | kg/m^3 | xyz | C | OPT | moist_air_density - T | K | xyz | C | OPT | air_temperature - PLE | Pa | xyz | E | OPT | air_pressure - -category: EXPORT -#---------------------------------------------------------------------------------------- -# VARIABLE | DIMENSIONS | Additional Metadata -#---------------------------------------------------------------------------------------- - NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME -#---------------------------------------------------------------------------------------- - PSO4TOT | kg m-2 s-1 | xyz | C | | Total Sulfate Produced in GOCART -#........................................................................................ - 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% - 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 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 -#---------------------------------------------------------------------------------------- -# VARIABLE | DIMENSION | Additional Metadata -#---------------------------------------------------------------------------------------- - NAME | UNITS | DIMS | VLOC | UNGRIDDED | RESTART | ADD2EXPORT | FRIENDLYTO | LONG NAME -#---------------------------------------------------------------------------------------- - - - -#******************************************************** -# -# Legend -# -#------------------------------------------------------------------ -# Column label | MAPL keyword/interpretation | Default -#--------------|--------------------------------------------------- -# NAME | short_name | -# UNITS | units | -# DIMS | dims | -# VLOC | VLocation | MAPL_VLocationNone -# LONG NAME | long_name | -# COND | if () then | .FALSE. -# NUM_SUBTILES | num_subtiles -# ... -#------------------------------------------------------------------ -# -#-------------------------------------------- -# Entry alias | Column | MAPL keyword/interpretation -#--------------|----------------------------- -# xyz | DIMS | MAPL_HorzVert -# xy | DIMS | MAPL_HorzOnly -# z | DIMS | MAPL_VertOnly (plus ungridded) -# C | VLOC | MAPL_VlocationCenter -# E | VLOC | MAPL_VlocationEdge -# N | VLOC | MAPL_VlocationNone -#-------------------------------------------- - - From 790f9a9c7e93abbf4c45c0efc5ad836cb7252919 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 May 2024 12:41:56 -0400 Subject: [PATCH 4/7] Fix up R21C CI --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 37bc9c57..0bea1689 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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 From 47a8b7dc97a22b9b8f53cd4fc9a5a8a7e9ef0a1e Mon Sep 17 00:00:00 2001 From: Allie Collow <31133739+acollow@users.noreply.github.com> Date: Thu, 16 May 2024 15:18:16 -0400 Subject: [PATCH 5/7] Update GOCART2G_StateSpecs.rc --- ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc index 7aeb4838..000b62ae 100644 --- a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc @@ -7,11 +7,9 @@ category: IMPORT #---------------------------------------------------------------------------------------- NAME | UNITS | DIMS | VLOC | RESTART | LONG NAME #---------------------------------------------------------------------------------------- - DELP | Pa | xyz | C | | pressure_thickness +# DELP | Pa | xyz | C | | pressure_thickness # RH2 | 1 | xyz | C | | Rel_Hum_after_moist - AIRDENS | kg/m^3 | xyz | C | OPT | moist_air_density - T | K | xyz | C | OPT | air_temperature - PLE | Pa | xyz | E | OPT | air_pressure + category: EXPORT #---------------------------------------------------------------------------------------- From 2410fb9ae30289ab3e731da84a733194889d527d Mon Sep 17 00:00:00 2001 From: Allie Collow <31133739+acollow@users.noreply.github.com> Date: Thu, 16 May 2024 15:19:37 -0400 Subject: [PATCH 6/7] Update GOCART2G_StateSpecs.rc --- ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc index 000b62ae..1b014263 100644 --- a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc +++ b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc @@ -5,7 +5,7 @@ category: IMPORT #---------------------------------------------------------------------------------------- # VARIABLE | DIMENSIONS | Additional Metadata #---------------------------------------------------------------------------------------- - NAME | UNITS | DIMS | VLOC | RESTART | LONG NAME + NAME | UNITS | DIMS | VLOC | COND | LONG NAME #---------------------------------------------------------------------------------------- # DELP | Pa | xyz | C | | pressure_thickness # RH2 | 1 | xyz | C | | Rel_Hum_after_moist From cdce3cd7332967594d030ca3bf9f011a876edd21 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 May 2024 16:33:45 -0400 Subject: [PATCH 7/7] Restore missing label enforcer --- .github/workflows/enforce-labels.yml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/enforce-labels.yml diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml new file mode 100644 index 00000000..6e1720ef --- /dev/null +++ b/.github/workflows/enforce-labels.yml @@ -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