From 38f2407e2f7542a4b04b977839fcb23e50b6027b Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 21:47:12 +0100 Subject: [PATCH 01/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 285a694..0dc2cb2 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -34,7 +34,7 @@ class BmiVariable: output=False, units="cm s-1", grid=0, - keys=["ForcingData", "Precip_msr"], + keys=["ForcingData", "Precip_msr11"], all_timesteps=True, ), BmiVariable( From 5694328819862c1268aa171be1b8d24155e793a5 Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 21:49:00 +0100 Subject: [PATCH 02/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 0dc2cb2..88efb22 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -34,19 +34,19 @@ class BmiVariable: output=False, units="cm s-1", grid=0, - keys=["ForcingData", "Precip_msr11"], - all_timesteps=True, - ), - BmiVariable( - name="applied_infiltration", - dtype="float64", - input=False, - output=True, - units="cm s-1", - grid=0, - keys=["ForcingData", "applied_inf"], + keys=["ForcingData", "Precip_msr"], all_timesteps=True, ), + #BmiVariable( + # name="applied_infiltration", + # dtype="float64", + # input=False, + # output=True, + # units="cm s-1", + # grid=0, + # keys=["ForcingData", "applied_inf"], + # all_timesteps=True, + #), BmiVariable( name="soil_evaporation", dtype="float64", From 8e5c0ee9ac6773614eca36a070efff12c924549b Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 21:52:59 +0100 Subject: [PATCH 03/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 88efb22..af347b8 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -35,7 +35,7 @@ class BmiVariable: units="cm s-1", grid=0, keys=["ForcingData", "Precip_msr"], - all_timesteps=True, + #all_timesteps=True, ), #BmiVariable( # name="applied_infiltration", From c617669e5f6912e0d7004d4bfa5d1505e55ec53b Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 21:55:28 +0100 Subject: [PATCH 04/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index af347b8..a35a410 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -30,8 +30,8 @@ class BmiVariable: BmiVariable( name="precipitation", dtype="float64", - input=True, - output=False, + input=False,#True, + output=True,#False, units="cm s-1", grid=0, keys=["ForcingData", "Precip_msr"], From f5c6154ea4bd973725b029306657dc45075b6f0e Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 22:04:41 +0100 Subject: [PATCH 05/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index a35a410..285a694 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -30,23 +30,23 @@ class BmiVariable: BmiVariable( name="precipitation", dtype="float64", - input=False,#True, - output=True,#False, + input=True, + output=False, units="cm s-1", grid=0, keys=["ForcingData", "Precip_msr"], - #all_timesteps=True, - ), - #BmiVariable( - # name="applied_infiltration", - # dtype="float64", - # input=False, - # output=True, - # units="cm s-1", - # grid=0, - # keys=["ForcingData", "applied_inf"], - # all_timesteps=True, - #), + all_timesteps=True, + ), + BmiVariable( + name="applied_infiltration", + dtype="float64", + input=False, + output=True, + units="cm s-1", + grid=0, + keys=["ForcingData", "applied_inf"], + all_timesteps=True, + ), BmiVariable( name="soil_evaporation", dtype="float64", From 8248f156ae6cfb6fb8134cd63f140e211594fdf0 Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 22:18:48 +0100 Subject: [PATCH 06/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 285a694..e6816b0 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -33,7 +33,7 @@ class BmiVariable: input=True, output=False, units="cm s-1", - grid=0, + grid=1, keys=["ForcingData", "Precip_msr"], all_timesteps=True, ), From b3337600d1ab4a5668cc3ef97040b688fa84decf Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 22:30:22 +0100 Subject: [PATCH 07/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index e6816b0..958e05e 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -43,7 +43,7 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=0, + grid=1, keys=["ForcingData", "applied_inf"], all_timesteps=True, ), @@ -100,8 +100,9 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=0, + grid=1, keys=["RS"], + all_timesteps=True, ), BmiVariable( name="surface_runoff_hortonian", @@ -109,7 +110,7 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=0, + grid=1, keys=["ForcingData", "R_Dunn"], all_timesteps=True, ), @@ -119,7 +120,7 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=0, + grid=1, keys=["ForcingData", "R_Hort"], all_timesteps=True, ), From a057b4fde48f183696ac4375fd400c98f596dd9f Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 22:32:02 +0100 Subject: [PATCH 08/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 958e05e..9a5b386 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -100,9 +100,9 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=1, + grid=0, keys=["RS"], - all_timesteps=True, + #all_timesteps=True, ), BmiVariable( name="surface_runoff_hortonian", From bdde98daa976357b1100743348b980ae2a63ec32 Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Thu, 6 Feb 2025 23:51:21 +0100 Subject: [PATCH 09/18] correction_trial --- PyStemmusScope/bmi/variable_reference.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 9a5b386..285a694 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -33,7 +33,7 @@ class BmiVariable: input=True, output=False, units="cm s-1", - grid=1, + grid=0, keys=["ForcingData", "Precip_msr"], all_timesteps=True, ), @@ -43,7 +43,7 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=1, + grid=0, keys=["ForcingData", "applied_inf"], all_timesteps=True, ), @@ -102,7 +102,6 @@ class BmiVariable: units="cm s-1", grid=0, keys=["RS"], - #all_timesteps=True, ), BmiVariable( name="surface_runoff_hortonian", @@ -110,7 +109,7 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=1, + grid=0, keys=["ForcingData", "R_Dunn"], all_timesteps=True, ), @@ -120,7 +119,7 @@ class BmiVariable: input=False, output=True, units="cm s-1", - grid=1, + grid=0, keys=["ForcingData", "R_Hort"], all_timesteps=True, ), From 6f5d7108336adea53663e6b0b290408fa60a0a1d Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Sun, 16 Feb 2025 13:07:02 +0100 Subject: [PATCH 10/18] add_precip_snow_to_bmi --- PyStemmusScope/bmi/variable_reference.py | 41 ++++++++++++++++++------ 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 285a694..f1dc254 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -28,14 +28,40 @@ class BmiVariable: keys=["fluxes", "Resp"], ), BmiVariable( - name="precipitation", + name="precipitation_total", dtype="float64", input=True, output=False, units="cm s-1", grid=0, - keys=["ForcingData", "Precip_msr"], - all_timesteps=True, + keys=["ForcingData", "Precip"], + ), + BmiVariable( + name="precipitation_liquid", + dtype="float64", + input=False, + output=True, + units="cm s-1", + grid=0, + keys=["ForcingData", "Precip_liquid"], + ), + BmiVariable( + name="precipitation_snow", + dtype="float64", + input=False, + output=True, + units="cm s-1", + grid=0, + keys=["ForcingData", "Precip_snow"], + ), + BmiVariable( + name="precipitation_snow_accumulated", + dtype="float64", + input=False, + output=True, + units="cm s-1", + grid=0, + keys=["ForcingData", "Precip_snowAccum"], ), BmiVariable( name="applied_infiltration", @@ -45,7 +71,6 @@ class BmiVariable: units="cm s-1", grid=0, keys=["ForcingData", "applied_inf"], - all_timesteps=True, ), BmiVariable( name="soil_evaporation", @@ -101,7 +126,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["RS"], + keys=["ForcingData","RS"], ), BmiVariable( name="surface_runoff_hortonian", @@ -110,8 +135,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "R_Dunn"], - all_timesteps=True, + keys=["ForcingData", "R_Hort"], ), BmiVariable( name="surface_runoff_dunnian", @@ -120,8 +144,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "R_Hort"], - all_timesteps=True, + keys=["ForcingData", "R_Dunn"], ), # groundwater vars (STEMMUS_SCOPE) BmiVariable( From cfdea711fa187f12631461ad8e55c16d694b6ece Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Sun, 16 Feb 2025 13:27:03 +0100 Subject: [PATCH 11/18] add_precip_snow_to_bmi --- PyStemmusScope/bmi/variable_reference.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index f1dc254..34746d2 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -126,7 +126,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData","RS"], + keys=["ForcingData", "RS"], ), BmiVariable( name="surface_runoff_hortonian", From 1ad64792f77c81f478737c5d6dbc348e24c6d8c5 Mon Sep 17 00:00:00 2001 From: Mostafa Gomaa Daoud <54531356+MostafaGomaa93@users.noreply.github.com> Date: Mon, 24 Feb 2025 14:33:38 +0100 Subject: [PATCH 12/18] add_energyfluxes_to_BMI --- PyStemmusScope/bmi/variable_reference.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 34746d2..87a174e 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -70,7 +70,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "applied_inf"], + keys=["ForcingData", "infiltration"], ), BmiVariable( name="soil_evaporation", @@ -174,6 +174,24 @@ class BmiVariable: grid=0, keys=["gwfluxes", "indxRchrg"], ), + BmiVariable( + name="energy_flux_top", + dtype="float64", + input=False, + output=True, + units="w s-1", + grid=0, + keys=["gwfluxes", "energyfluxTop"], + ), + BmiVariable( + name="energy_flux_bottom", + dtype="float64", + input=False, + output=True, + units="w s-1", + grid=0, + keys=["gwfluxes", "energyfluxBotm"], + ), # groundwater (coupling) vars BmiVariable( name="groundwater_coupling_enabled", From ffcb3ffa3785bd1808ff76018c748c797c5db5c5 Mon Sep 17 00:00:00 2001 From: Mostafa Gomaa Daoud <54531356+MostafaGomaa93@users.noreply.github.com> Date: Mon, 24 Feb 2025 14:35:19 +0100 Subject: [PATCH 13/18] add_energyfluxes_to_BMI --- PyStemmusScope/bmi/variable_reference.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 87a174e..3d3a542 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -175,22 +175,22 @@ class BmiVariable: keys=["gwfluxes", "indxRchrg"], ), BmiVariable( - name="energy_flux_top", + name="energy_top_flux", dtype="float64", input=False, output=True, units="w s-1", grid=0, - keys=["gwfluxes", "energyfluxTop"], + keys=["gwfluxes", "energyTopflux"], ), BmiVariable( - name="energy_flux_bottom", + name="energy_bottom_flux", dtype="float64", input=False, output=True, units="w s-1", grid=0, - keys=["gwfluxes", "energyfluxBotm"], + keys=["gwfluxes", "energyBotmflux"], ), # groundwater (coupling) vars BmiVariable( From 18b0de73c23c1437a780464634748e45be80cd1e Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Mon, 24 Feb 2025 14:51:11 +0100 Subject: [PATCH 14/18] modify_variable_reference_names --- PyStemmusScope/bmi/variable_reference.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 3d3a542..37ca780 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -64,7 +64,7 @@ class BmiVariable: keys=["ForcingData", "Precip_snowAccum"], ), BmiVariable( - name="applied_infiltration", + name="infiltration", dtype="float64", input=False, output=True, @@ -126,7 +126,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "RS"], + keys=["ForcingData", "runoff"], ), BmiVariable( name="surface_runoff_hortonian", @@ -135,7 +135,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "R_Hort"], + keys=["ForcingData", "runoffHort"], ), BmiVariable( name="surface_runoff_dunnian", @@ -144,7 +144,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "R_Dunn"], + keys=["ForcingData", "runoffDunn"], ), # groundwater vars (STEMMUS_SCOPE) BmiVariable( From 9db6e443d227323ef476bf0b7aba089a57040b8f Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Mon, 24 Feb 2025 16:24:11 +0100 Subject: [PATCH 15/18] modify_variable_reference_names --- PyStemmusScope/bmi/variable_reference.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 37ca780..6cf5123 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -70,7 +70,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "infiltration"], + keys=["ForcingData", "applied_infiltration"], ), BmiVariable( name="soil_evaporation", From e9596cebff2cd9eb6061ed7576d7354003d10d58 Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Mon, 24 Feb 2025 16:27:30 +0100 Subject: [PATCH 16/18] modify_variable_reference_names --- PyStemmusScope/bmi/variable_reference.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 6cf5123..37ca780 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -70,7 +70,7 @@ class BmiVariable: output=True, units="cm s-1", grid=0, - keys=["ForcingData", "applied_infiltration"], + keys=["ForcingData", "infiltration"], ), BmiVariable( name="soil_evaporation", From 57cd0db5a5b96a3d85a957119b4efe9bf71dea54 Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Wed, 26 Feb 2025 12:33:12 +0100 Subject: [PATCH 17/18] change_BMI_variable_name_from_infiltration_to_effectivePrecip --- PyStemmusScope/bmi/variable_reference.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index 37ca780..d656ec1 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -64,13 +64,13 @@ class BmiVariable: keys=["ForcingData", "Precip_snowAccum"], ), BmiVariable( - name="infiltration", + name="effective_precipitation", dtype="float64", input=False, output=True, units="cm s-1", grid=0, - keys=["ForcingData", "infiltration"], + keys=["ForcingData", "effectivePrecip"], ), BmiVariable( name="soil_evaporation", From faaa867f7d41f043a690ec2422c70463e4fab9c5 Mon Sep 17 00:00:00 2001 From: Mostafa Daoud Date: Wed, 17 Sep 2025 16:55:43 +0200 Subject: [PATCH 18/18] add_precip_snowmelt_to_BMI --- PyStemmusScope/bmi/variable_reference.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/PyStemmusScope/bmi/variable_reference.py b/PyStemmusScope/bmi/variable_reference.py index d656ec1..2ddf62c 100644 --- a/PyStemmusScope/bmi/variable_reference.py +++ b/PyStemmusScope/bmi/variable_reference.py @@ -34,7 +34,7 @@ class BmiVariable: output=False, units="cm s-1", grid=0, - keys=["ForcingData", "Precip"], + keys=["ForcingData", "Precip_totalLiquid"], ), BmiVariable( name="precipitation_liquid", @@ -63,6 +63,15 @@ class BmiVariable: grid=0, keys=["ForcingData", "Precip_snowAccum"], ), + BmiVariable( + name="precipitation_snowmelt", + dtype="float64", + input=False, + output=True, + units="cm s-1", + grid=0, + keys=["ForcingData", "Precip_snowmelt"], + ), BmiVariable( name="effective_precipitation", dtype="float64",