Skip to content

Commit

Permalink
Merge pull request #143 from GEOS-ESM/hotfix/bmauer/#140-restartskip_…
Browse files Browse the repository at this point in the history 
…statespec

Hotfix: fixes #140
  • Loading branch information
@amdasilva
amdasilva authored May 2, 2022
2 parents 9077e85 + b1b0326 commit 02262ad
Show file tree
Hide file tree
Showing 7 changed files with 391 additions and 385 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.0.7] - 2021-04-29

### Fixed

- Added a restart column to all statespec.rc files in GOCART2G. Variables being provided by ExtData must be MAPL_RestartSkip

## [2.0.6] - 2021-04-28

### Fixed
Expand Down
190 changes: 95 additions & 95 deletions ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
View file

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,55 @@ schema_version: 2.0.0
component: DU

category: IMPORT
#------------------------------------------------------------------------------------------
#-------------------------------------------------------------------------------------------------------
# VARIABLE | DIMENSIONS | Additional Metadata
#------------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | COND | LONG NAME
#------------------------------------------------------------------------------------------
DU_SRC | 1 | xy | N | scheme == 'ginoux' .OR. scheme == 'k14' | erod - dust emissions
DU_Z0 | 1 | xy | N | scheme == 'k14' | aerodynamic_surface_roughness_for_aeolian_processes
DU_GVF | 1 | xy | N | scheme == 'k14' | GVF
DU_SAND | 1 | xy | N | scheme == 'fengsha' .OR. scheme == 'k14' | volume_fraction_of_sand_in_soil
DU_SILT | 1 | xy | N | scheme == 'fengsha' .OR. scheme == 'k14' | volume_fraction_of_silt_in_soil
DU_CLAY | 1 | xy | N | scheme == 'fengsha' .OR. scheme == 'k14' | volume_fraction_of_clay_in_soil
DU_RDRAG | m-1 | xy | N | scheme == 'fengsha' | drag_partition
DU_SSM | 1 | xy | N | scheme == 'fengsha' | sediment_supply_map
DU_UTHRES | m s-1 | xy | N | scheme == 'fengsha' | surface_dry_threshold_velocity
FRSNOW | 1 | xy | N | scheme == 'fengsha' | surface_snow_area_fraction
SLC | 1 | xy | N | scheme == 'fengsha' | liquid_water_content_of_soil_layer
DU_TEXTURE | 1 | xy | N | scheme == 'k14' | soil_texture
DU_VEG | 1 | xy | N | scheme == 'k14' | vegetation_type
FRLAKE | 1 | xy | N | | fraction_of_lake
FRLAND | 1 | xy | N | scheme == 'k14' | fraction_of_land
ASNOW | 1 | xy | N | scheme == 'k14' | snow_covered_fraction_of_land
WET1 | 1 | xy | N | | surface_soil_wetness
LWI | 1 | xy | N | | land-ocean-ice_mask
TROPP | Pa | xy | N | | tropopause_pressure_based_on_blended_estimate
U10M | m s-1 | xy | N | | 10-meter_eastward_wind
V10M | m s-1 | xy | N | | 10-meter_northward_wind
U10N | m s-1 | xy | N | scheme == 'k14' | equivalent_neutral_10-meter_eastward_wind
V10N | m s-1 | xy | N | scheme == 'k14' | equivalent_neutral_10-meter_northward_wind
AREA | m^2 | xy | N | | agrid_cell_area
USTAR | m s-1 | xy | N | | equivalent_neutral_10-meter_northward_wind
CN_PRCP | kg/m^2/s | xy | N | | surface_conv._rain_flux_needed_by_land
NCN_PRCP | kg/m^2/s | xy | N | | Non-convective precipitation
ZPBL | m | xy | N | | planetary_boundary_layer_height
SH | w m-2 | xy | N | | sensible_heat_flux_from_turbulence
Z0H | m | xy | N | | surface_roughness_for_heat
WCSF | m3 m-3 | xy | N | scheme == 'k14' | water_surface_layer
TSOIL1 | K | xy | N | scheme == 'k14' | soil_temperatures_layer_1
RHOS | kg m-3 | xy | N | scheme == 'k14' | air_density_at_surface
#-------------------------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | RESTART | COND | LONG NAME
#-------------------------------------------------------------------------------------------------------
DU_SRC | 1 | xy | N | SKIP | scheme == 'ginoux' .OR. scheme == 'k14' | erod - dust emissions
DU_Z0 | 1 | xy | N | SKIP | scheme == 'k14' | aerodynamic_surface_roughness_for_aeolian_processes
DU_GVF | 1 | xy | N | OPT | scheme == 'k14' | GVF
DU_SAND | 1 | xy | N | SKIP | scheme == 'fengsha' .OR. scheme == 'k14' | volume_fraction_of_sand_in_soil
DU_SILT | 1 | xy | N | SKIP | scheme == 'fengsha' .OR. scheme == 'k14' | volume_fraction_of_silt_in_soil
DU_CLAY | 1 | xy | N | SKIP | scheme == 'fengsha' .OR. scheme == 'k14' | volume_fraction_of_clay_in_soil
DU_RDRAG | m-1 | xy | N | OPT | scheme == 'fengsha' | drag_partition
DU_SSM | 1 | xy | N | OPT | scheme == 'fengsha' | sediment_supply_map
DU_UTHRES | m s-1 | xy | N | OPT | scheme == 'fengsha' | surface_dry_threshold_velocity
FRSNOW | 1 | xy | N | OPT | scheme == 'fengsha' | surface_snow_area_fraction
SLC | 1 | xy | N | OPT | scheme == 'fengsha' | liquid_water_content_of_soil_layer
DU_TEXTURE | 1 | xy | N | SKIP | scheme == 'k14' | soil_texture
DU_VEG | 1 | xy | N | SKIP | scheme == 'k14' | vegetation_type
FRLAKE | 1 | xy | N | OPT | | fraction_of_lake
FRLAND | 1 | xy | N | OPT | scheme == 'k14' | fraction_of_land
ASNOW | 1 | xy | N | OPT | scheme == 'k14' | snow_covered_fraction_of_land
WET1 | 1 | xy | N | OPT | | surface_soil_wetness
LWI | 1 | xy | N | OPT | | land-ocean-ice_mask
TROPP | Pa | xy | N | OPT | | tropopause_pressure_based_on_blended_estimate
U10M | m s-1 | xy | N | OPT | | 10-meter_eastward_wind
V10M | m s-1 | xy | N | OPT | | 10-meter_northward_wind
U10N | m s-1 | xy | N | OPT | scheme == 'k14' | equivalent_neutral_10-meter_eastward_wind
V10N | m s-1 | xy | N | OPT | scheme == 'k14' | equivalent_neutral_10-meter_northward_wind
AREA | m^2 | xy | N | OPT | | agrid_cell_area
USTAR | m s-1 | xy | N | OPT | | equivalent_neutral_10-meter_northward_wind
CN_PRCP | kg/m^2/s | xy | N | OPT | | surface_conv._rain_flux_needed_by_land
NCN_PRCP | kg/m^2/s | xy | N | OPT | | Non-convective precipitation
ZPBL | m | xy | N | OPT | | planetary_boundary_layer_height
SH | w m-2 | xy | N | OPT | | sensible_heat_flux_from_turbulence
Z0H | m | xy | N | OPT | | surface_roughness_for_heat
WCSF | m3 m-3 | xy | N | OPT | scheme == 'k14' | water_surface_layer
TSOIL1 | K | xy | N | OPT | scheme == 'k14' | soil_temperatures_layer_1
RHOS | kg m-3 | xy | N | OPT | scheme == 'k14' | air_density_at_surface
#........................................................................................
AIRDENS | kg/m^3 | xyz | C | | moist_air_density
DELP | Pa | xyz | C | | pressure_thickness
RH2 | 1 | xyz | C | | Rel_Hum_after_moist
T | K | xyz | C | | air_temperature
ZLE | m | xyz | E | | geopotential_height
PLE | Pa | xyz | E | | air_pressure
PFL_LSAN | kg/m2/s | xyz | E | | 3D_flux_of_liquid_nonconvective_precipitation
PFI_LSAN | kg/m2/s | xyz | E | | 3D_flux_of_ice_nonconvective_precipitation
U | m s-1 | xyz | C | | eastward_wind
V | m s-1 | xyz | C | | northward_wind
AIRDENS | kg/m^3 | xyz | C | OPT | | moist_air_density
DELP | Pa | xyz | C | OPT | | pressure_thickness
RH2 | 1 | xyz | C | OPT | | Rel_Hum_after_moist
T | K | xyz | C | OPT | | air_temperature
ZLE | m | xyz | E | OPT | | geopotential_height
PLE | Pa | xyz | E | OPT | | air_pressure
PFL_LSAN | kg/m2/s | xyz | E | OPT | | 3D_flux_of_liquid_nonconvective_precipitation
PFI_LSAN | kg/m2/s | xyz | E | OPT | | 3D_flux_of_ice_nonconvective_precipitation
U | m s-1 | xyz | C | OPT | | eastward_wind
V | m s-1 | xyz | C | OPT | | northward_wind

category: EXPORT
#----------------------------------------------------------------------------------------
Expand Down
44 changes: 22 additions & 22 deletions ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@ component: GOCART2G

category: IMPORT
#----------------------------------------------------------------------------------------
# VARIABLE | DIMENSIONS| Additional Metadata
# 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
#----------------------------------------------------------------------------------------
# VARIABLE | DIMENSIONS | Additional Metadata
# VARIABLE | DIMENSIONS | Additional Metadata
#----------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME
NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME
#----------------------------------------------------------------------------------------
PSO4TOT | kg m-2 s-1 | xyz | C | | Total Sulfate Produced in GOCART
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
TOTANGSTR | 1 | xy | N | | Total Aerosol Angstrom parameter [470-870 nm]
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%)
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
TOTANGSTR | 1 | xy | N | | Total Aerosol Angstrom parameter [470-870 nm]
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%)

category: INTERNAL
#----------------------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 02262ad

Please sign in to comment.