From eef0250ed34c210347cd168494f1ca2eccd512fa Mon Sep 17 00:00:00 2001 From: Jens de Bruijn Date: Wed, 25 Sep 2024 17:24:50 +0200 Subject: [PATCH] check ruff check --- .github/workflows/ruff.yml | 2 +- geb/agents/crop_farmers.py | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 91748f8a..09113612 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: chartboost/ruff-action@v1 + # - uses: chartboost/ruff-action@v1 - uses: chartboost/ruff-action@v1 with: args: 'format --check' \ No newline at end of file diff --git a/geb/agents/crop_farmers.py b/geb/agents/crop_farmers.py index 5c475874..cc65f5d9 100644 --- a/geb/agents/crop_farmers.py +++ b/geb/agents/crop_farmers.py @@ -257,7 +257,7 @@ def withdraw_channel( ): # channel abstraction channel_abstraction_cell_m3 = min( - available_channel_storage_m3[grid_cell], + max(available_channel_storage_m3[grid_cell] - 100, 0), irrigation_water_demand_field * cell_area[field], ) assert channel_abstraction_cell_m3 >= 0 @@ -532,17 +532,17 @@ def abstract_water( ) if surface_irrigated[farmer]: - irrigation_water_demand_field = withdraw_channel( - available_channel_storage_m3=available_channel_storage_m3, - grid_cell=grid_cell, - cell_area=cell_area, - field=field, - farmer=farmer, - water_withdrawal_m=water_withdrawal_m, - irrigation_water_demand_field=irrigation_water_demand_field, - remaining_irrigation_limit_m3=remaining_irrigation_limit_m3, - channel_abstraction_m3_by_farmer=channel_abstraction_m3_by_farmer, - ) + # irrigation_water_demand_field = withdraw_channel( + # available_channel_storage_m3=available_channel_storage_m3, + # grid_cell=grid_cell, + # cell_area=cell_area, + # field=field, + # farmer=farmer, + # water_withdrawal_m=water_withdrawal_m, + # irrigation_water_demand_field=irrigation_water_demand_field, + # remaining_irrigation_limit_m3=remaining_irrigation_limit_m3, + # channel_abstraction_m3_by_farmer=channel_abstraction_m3_by_farmer, + # ) assert water_withdrawal_m[field] >= 0 # command areas @@ -1613,6 +1613,10 @@ def abstract_water( assert (available_groundwater_m3 >= 0).all() assert (available_reservoir_storage_m3 >= 0).all() + self.activation_order_by_elevation_ = AgentArray( + self.activation_order_by_elevation, max_n=self.max_n + ) + if __debug__: irrigation_limit_pre = self.remaining_irrigation_limit_m3.copy() available_channel_storage_m3_pre = available_channel_storage_m3.copy()