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

fix pyc-ypc typo in io.py #14

Merged
merged 1 commit into from
Dec 31, 2024
Merged

fix pyc-ypc typo in io.py #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions pyCIAM/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ def prep_sliiders(
expand_exposure=True,
storage_options={},
):
"""Import the SLIIDERS dataset (or a different dataset formatted analogously),
format, and calculate derived variables so that it can be used by the functions that
implement pyCIAM.
"""Import the SLIIDERS dataset (or a different dataset formatted analogously).

Input, format, and calculate derived variables so that it can be used by the
functions that implement pyCIAM.

Parameters
----------
Expand Down Expand Up @@ -140,7 +141,7 @@ def prep_sliiders(
if "dfact" not in inputs.data_vars and "npv_start" in inputs.data_vars:
inputs["dfact"] = (1 / (1 + inputs.dr)) ** (inputs.year - inputs.npv_start)

if "landrent" or "ypc" not in inputs.data_vars:
if "landrent" not in inputs.data_vars or "ypc" not in inputs.data_vars:
area = inputs.landarea
if calc_popdens_with_wetland_area:
area = area + inputs.wetland
Expand All @@ -161,7 +162,7 @@ def prep_sliiders(

if (
"ypc" not in inputs.data_vars
and "min_pyc_scale" in inputs.data_vars
and "min_ypc_scale" in inputs.data_vars
and "ypc_scale_denom" in inputs.data_vars
and "ypc_scale_elast" in inputs.data_vars
):
Expand Down
Loading