Skip to content

0723 agricolture #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 4, 2025
Merged

0723 agricolture #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db453f8
set-up linux
mzecc Jun 23, 2025
21c0ee2
Reclassified some AFOLU back into Agriculture
mzecc Jun 24, 2025
d48c0fc
AWB instances reclassified back into Agriculture
mzecc Jun 26, 2025
82df5e5
Updated salted-202504-scenariomip-input_gridding_workflow_emissions.csv
mzecc Jul 1, 2025
dfc28ed
C02 AFOLU gridding
mzecc Jul 2, 2025
d30b7c8
Added CO2 as input_species for Agriculture
mzecc Jul 4, 2025
4ad416f
Merge branch 'new-agri' into 0723_agricolture
mzecc Jul 4, 2025
3fbaa4b
Added CO2 as input_species for Agriculture
mzecc Jul 4, 2025
ce379a2
Merge branch 'new-agri' into 0723_agricolture
mzecc Jul 4, 2025
024aed7
Added CO2 as input_species for Agriculture
mzecc Jul 4, 2025
58cc03c
Added CO2 as input_species_optional in Agriculture
mzecc Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/gcages/cmip7_scenariomip/pre_processing/reaggregation/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,8 @@ def to_required_variables(self, all_species: tuple[str, ...]) -> tuple[str, ...]
GriddingSectorComponentsReporting(
gridding_sector="Agriculture",
spatial_resolution=SpatialResolutionOption.MODEL_REGION,
input_sectors=("AFOLU|Agriculture",),
input_sectors_optional=(),
input_species_optional=(),
),
GriddingSectorComponentsReporting(
gridding_sector="Agricultural Waste Burning",
spatial_resolution=SpatialResolutionOption.MODEL_REGION,
input_sectors=(
"AFOLU|Agricultural Waste Burning",
"AFOLU|Agriculture",
"AFOLU|Land|Harvested Wood Products",
"AFOLU|Land|Land Use and Land-Use Change",
"AFOLU|Land|Other",
Expand All @@ -128,9 +121,17 @@ def to_required_variables(self, all_species: tuple[str, ...]) -> tuple[str, ...]
"BC",
"CO",
"OC",
"CO2",
"Sulfur",
),
),
GriddingSectorComponentsReporting(
gridding_sector="Agricultural Waste Burning",
spatial_resolution=SpatialResolutionOption.MODEL_REGION,
input_sectors=("AFOLU|Agricultural Waste Burning",),
input_sectors_optional=(),
input_species_optional=(),
),
GriddingSectorComponentsReporting(
gridding_sector="Aircraft",
spatial_resolution=SpatialResolutionOption.WORLD,
Expand Down Expand Up @@ -1009,18 +1010,17 @@ def to_gridding_sectors(
# because we assume that the users have used `to_complete`
# before calling this function.
for gridding_sector, components in (
("Agriculture", ["AFOLU|Agriculture"]),
(
"Agricultural Waste Burning",
"Agriculture",
[
"AFOLU|Agricultural Waste Burning",
# Hmmm, almost definitely wrong
"AFOLU|Agriculture",
"AFOLU|Land|Harvested Wood Products",
"AFOLU|Land|Land Use and Land-Use Change",
"AFOLU|Land|Other",
"AFOLU|Land|Wetlands",
],
),
("Agricultural Waste Burning", ["AFOLU|Agricultural Waste Burning"]),
("Energy Sector", ["Energy|Supply"]),
("Forest Burning", ["AFOLU|Land|Fires|Forest Burning"]),
("Grassland Burning", ["AFOLU|Land|Fires|Grassland Burning"]),
Expand Down
17 changes: 9 additions & 8 deletions ...ng/reaggregation/test_integration_cmip7_scenariomip_pre_processing_reaggregation_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,8 @@ def to_required_variables(self, all_species: tuple[str, ...]) -> tuple[str, ...]
GriddingSectorComponentsReporting(
gridding_sector="Agriculture",
spatial_resolution="model region",
input_sectors=("AFOLU|Agriculture",),
input_sectors_optional=(),
input_species_optional=(),
),
GriddingSectorComponentsReporting(
gridding_sector="Agricultural Waste Burning",
spatial_resolution="model region",
input_sectors=(
"AFOLU|Agricultural Waste Burning",
"AFOLU|Agriculture",
"AFOLU|Land|Harvested Wood Products",
"AFOLU|Land|Land Use and Land-Use Change",
"AFOLU|Land|Other",
Expand All @@ -146,8 +139,16 @@ def to_required_variables(self, all_species: tuple[str, ...]) -> tuple[str, ...]
"CO",
"OC",
"Sulfur",
"CO2",
),
),
GriddingSectorComponentsReporting(
gridding_sector="Agricultural Waste Burning",
spatial_resolution="model region",
input_sectors=("AFOLU|Agricultural Waste Burning",),
input_sectors_optional=(),
input_species_optional=(),
),
GriddingSectorComponentsReporting(
gridding_sector="Aircraft",
spatial_resolution="world",
Expand Down
Loading