Skip to content
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

Corrections to args spec regarding evapotranspiration and preciptation #1716

Merged
merged 4 commits into from
Dec 17, 2024
Merged

Corrections to args spec regarding evapotranspiration and preciptation #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a987332
evapotranspiration inputs are all meant to be reference evapotranspir…
davemfish Dec 17, 2024
4d8fdeb
SWY args spec additions. #1694
davemfish Dec 17, 2024
80c682a
revert an invalid change. #1693
davemfish Dec 17, 2024
8850bc4
not using the shared definition for ET0. #1694
davemfish Dec 17, 2024
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
15 changes: 12 additions & 3 deletions src/natcap/invest/seasonal_water_yield/seasonal_water_yield.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,14 @@
"contents": {
# monthly et0 maps, each file ending in a number 1-12
"[MONTH]": {
**spec_utils.ET0,
"name": gettext("reference evapotranspiration"),
"type": "raster",
"bands": {
1: {
"type": "number",
"units": u.millimeter/u.month
}
},
"about": gettext(
"Twelve files, one for each month. File names must "
"end with the month number (1-12). For example, "
Expand All @@ -62,7 +69,8 @@
"about": gettext(
"Directory containing maps of reference evapotranspiration "
"for each month. Only .tif files should be in this folder "
"(no .tfw, .xml, etc files)."),
"(no .tfw, .xml, etc files). Required if User-Defined Local "
"Recharge is not selected."),
"name": gettext("ET0 directory")
},
"precip_dir": {
Expand All @@ -89,7 +97,8 @@
"about": gettext(
"Directory containing maps of monthly precipitation for each "
"month. Only .tif files should be in this folder (no .tfw, "
".xml, etc files)."),
".xml, etc files). Required if User-Defined Local Recharge is "
"not selected."),
"name": gettext("precipitation directory")
},
"dem_raster_path": {
Expand Down
4 changes: 2 additions & 2 deletions src/natcap/invest/spec_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@
"name": gettext("precipitation")
}
ET0 = {
"name": gettext("evapotranspiration"),
"name": gettext("reference evapotranspiration"),
"type": "raster",
"bands": {
1: {
"type": "number",
"units": u.millimeter
}
},
"about": gettext("Map of evapotranspiration values.")
"about": gettext("Map of reference evapotranspiration values.")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirmed that the 3 models that use spec_utils.ET0 all expect "reference" evapotranspiration. They are SWY, Urban Cooling, and AWY.

}
SOIL_GROUP = {
"type": "raster",
Expand Down
Loading