Skip to content

Separate initialisation of rainfed and irrigated harvest dates #3

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
jnnsbrr merged 4 commits into from
Jun 24, 2025
Merged

Separate initialisation of rainfed and irrigated harvest dates #3

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
5df23a6
Separate initialisation of rainfed and irrigated harvest date structu…
stephnwirth Jun 19, 2025
9ca1071
FIxed black linting issue
stephnwirth Jun 19, 2025
da151e9
Fix irrigated winter sowing
stephnwirth Jun 20, 2025
a2cc80a
Increment version number.
stephnwirth Jun 24, 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
2 changes: 1 addition & 1 deletion CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cff-version: 1.2.0
message: If you use this software, please cite it using the metadata from this file.
type: software
title: 'models build around LPJmL based on the copan:LPJmL modeling framework'
version: 0.1.4
version: 0.1.5
date-released: '2025-04-11'
abstract: x
authors:
Expand Down
10 changes: 6 additions & 4 deletions landmanager/components/management/crop_calendar/world.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,10 @@ def calc_harvest_date(

# Precompute max temperature once
max_temp = monthly_climate["max_temp"]
hdate_rf = hdate_ir = xr.full_like(self.world.grid.cell, 0, dtype=int)
hreason_rf = hreason_ir = xr.full_like(self.world.grid.cell, "", dtype="<U20") # noqa
hdate_rf = xr.full_like(self.world.grid.cell, 0, dtype=int)
hdate_ir = xr.full_like(self.world.grid.cell, 0, dtype=int)
hreason_rf = xr.full_like(self.world.grid.cell, "", dtype="<U20") # noqa
hreason_ir = xr.full_like(self.world.grid.cell, "", dtype="<U20") # noqa

hdate_rf.values = np.select(
[
Expand Down Expand Up @@ -623,7 +625,7 @@ def calc_harvest_date(
hdate_first,
np.where(
(smonth == 0) & (max_temp < self.temp_fall),
hdate_temp_opt,
hdate_first,
np.minimum(np.maximum(hdate_first, hdate_temp_base), hdate_last), # noqa
),
np.minimum(np.maximum(hdate_first, hdate_temp_opt), hdate_last), # noqa
Expand Down Expand Up @@ -678,7 +680,7 @@ def calc_harvest_date(
hdate_first,
np.where(
(smonth == 0) & (max_temp < self.temp_fall),
hdate_temp_opt,
hdate_first,
np.minimum(np.maximum(hdate_first, hdate_temp_base), hdate_last), # noqa
),
np.minimum(np.maximum(hdate_first, hdate_temp_opt), hdate_last), # noqa
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "landmanager"
version = "0.1.4"
version = "0.1.5"
description = "Models build around LPJmL based on the copan:LPJmL modeling framework"
readme = "README.md"
license = {file = "LICENSE.md"}
Expand Down