rename label of user_demand.inflow, set time-out back to 1hr default …

…and ribasim branch to main
Deltares · Oct 8, 2024 · 307158e · 307158e
1 parent ffa9738
commit 307158e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.teamcity/IMODCollector/buildTypes/IMODCollector_X64development.kt b/.teamcity/IMODCollector/buildTypes/IMODCollector_X64development.kt
@@ -107,7 +107,7 @@ object IMODCollector_X64development : BuildType({
             }
         }
         artifacts(AbsoluteId("Ribasim_Windows_BuildRibasim")) {
-            buildRule = lastSuccessful(branch="more-solvers")
+            buildRule = lastSuccessful()
             artifactRules = "ribasim_windows.zip!** => ribasim"
         }
     }

diff --git a/.teamcity/_Self/buildTypes/TestbenchCouplerWin64_2.kt b/.teamcity/_Self/buildTypes/TestbenchCouplerWin64_2.kt
@@ -92,10 +92,6 @@ object TestbenchCouplerWin64_2 : BuildType({
         }
     }
 
-    failureConditions {
-        executionTimeoutMin = 120
-    }
-
     dependencies {
         dependency(IMODCollector.buildTypes.IMODCollector_X64development) {
             snapshot {

diff --git a/imod_coupler/drivers/ribametamod/ribametamod.py b/imod_coupler/drivers/ribametamod/ribametamod.py
@@ -214,7 +214,7 @@ def couple_ribasim(self, mf6_flowmodel_key: str) -> ChainMap[str, Any]:
             self.ribasim_storage = self.ribasim.get_value_ptr("basin.storage")
             self.ribasim_user_demand = self.ribasim.get_value_ptr("user_demand.demand")
             self.ribasim_user_realized = self.ribasim.get_value_ptr(
-                "user_demand.inflow"
+                "user_demand.cumulative_inflow"
             )
             self.ribasim_user_realized_save = np.empty_like(self.ribasim_user_realized)
             self.subgrid_level = self.ribasim.get_value_ptr("basin.subgrid_level")