Skip to content

Add defaults and checking for per_cell and per_tile #10

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

Open
Whyborn wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add defaults and checking for per_cell and per_tile #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12adba2
Add defaults and checking for per_cell and per_tile
Whyborn Jul 2, 2026
0d74613
Change MappingConf retrieval for per_cell and per_tile
NortonAlex Jul 2, 2026
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
14 changes: 12 additions & 2 deletions adjust_restart_for_new_land_cover/adjust_restart_for_new_land_cover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,22 @@ def prepare_mapping(nVeg, ConfigFile):
with open(ConfigFile, 'r') as conf:
MappingConf = yaml.safe_load(conf)

# At the moment, the only thing that requires defaults is the input to
# output vegetation mapping. By default, it maps in a 1-to-1 manner, i.e.
# By default, the vegetation maps in a 1-to-1 manner, i.e.
# vegetation type 1 in the old vegetation map maps to vegetation type 1 in
# the new vegetation map.
VegetationMapping = {i: [i] for i in range(nVeg)}

# It may be that the user removes either per_tile or per_cell entries in
# the config- apply default values (empty list) that are iterable in that
# case. Also, ensure that it's a list instance
MappingConf['per_cell'] = MappingConf.get('per_cell') or []
if not isinstance(MappingConf['per_cell'], list):
MappingConf['per_cell'] = [MappingConf['per_cell']]

MappingConf['per_tile'] = MappingConf.get('per_tile') or []
if not isinstance(MappingConf['per_tile'], list):
MappingConf['per_tile'] = [MappingConf['per_tile']]

# Apply the supplied mappings
if 'vegetation_map' in MappingConf:
for OutVegType, InVegTypes in MappingConf['vegetation_map'].items():
Expand Down
Loading