rtc-tools 2.7.1__tar.gz → 2.7.2__tar.gz

{rtc_tools-2.7.1/src/rtc_tools.egg-info → rtc_tools-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtc-tools
-Version: 2.7.1
+Version: 2.7.2
 Summary: Toolbox for control and optimization of water systems.
 Home-page: https://oss.deltares.nl/web/rtc-tools/home
 Download-URL: http://github.com/deltares/rtc-tools/
@@ -25,7 +25,7 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 License-File: COPYING.LESSER
-Requires-Dist: casadi!=3.6.6,<=3.7,>=3.6.3
+Requires-Dist: casadi!=3.6.6,<3.8,>=3.6.3
 Requires-Dist: numpy>=1.16.0
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: pymoca==0.9.*,>=0.9.1

{rtc_tools-2.7.1 → rtc_tools-2.7.2}/README.md

@@ -1,7 +1,7 @@
 # Deltares RTC-Tools
 
-[![Pipeline](https://github.com/deltares/rtc-tools/actions/workflows/rtc-tools.yml/badge.svg)](
-    https://github.com/deltares/rtc-tools/actions/workflows/rtc-tools.yml
+[![Pipeline](https://github.com/rtc-tools/rtc-tools/actions/workflows/ci.yml/badge.svg)](
+    https://github.com/rtc-tools/rtc-tools/actions/workflows/ci.yml
 )
 [![Coverage](
     https://sonarcloud.io/api/project_badges/measure?project=Deltares_rtc-tools&metric=coverage
@@ -53,15 +53,15 @@ Documentation and examples can be found on [readthedocs](https://rtc-tools.readt
 
 ## Migration from GitLab
 
-The rtc-tools repository has been migrated from gitlab (https://gitlab.com/deltares/rtc-tools)
+The rtc-tools repository has been migrated from gitlab (https://gitlab.com/rtc-tools/rtc-tools)
 to here.
 To change the git remote url, run
 
-`git remote set-url origin https://github.com/Deltares/rtc-tools.git`
+`git remote set-url origin https://github.com/rtc-tools/rtc-tools.git`
 
 and
 
-`git remote set-url --push origin https://github.com/Deltares/rtc-tools.git`.
+`git remote set-url --push origin https://github.com/rtc-tools/rtc-tools.git`.
 
 
 ## License
@@ -73,4 +73,4 @@ and can be used free of charge. Deltares offers support packages for users who r
 If you use RTC-Tools in your work, please acknowledge it in any resulting publications.
 You can do this by citing RTC-Tools and providing a link to our
 [website](https://oss.deltares.nl/web/rtc-tools/home) or
-[GitHub repository](https://github.com/deltares/rtc-tools).
+[GitHub repository](https://github.com/rtc-tools/rtc-tools).

{rtc_tools-2.7.1 → rtc_tools-2.7.2}/setup.py

@@ -45,7 +45,7 @@ setup(
     packages=find_packages("src"),
     package_dir={"": "src"},
     install_requires=[
-        "casadi >= 3.6.3, <= 3.7, !=3.6.6",
+        "casadi >= 3.6.3, < 3.8, !=3.6.6",
         "numpy >= 1.16.0",
         "scipy >= 1.0.0",
         "pymoca >= 0.9.1, == 0.9.*",

{rtc_tools-2.7.1 → rtc_tools-2.7.2/src/rtc_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtc-tools
-Version: 2.7.1
+Version: 2.7.2
 Summary: Toolbox for control and optimization of water systems.
 Home-page: https://oss.deltares.nl/web/rtc-tools/home
 Download-URL: http://github.com/deltares/rtc-tools/
@@ -25,7 +25,7 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 License-File: COPYING.LESSER
-Requires-Dist: casadi!=3.6.6,<=3.7,>=3.6.3
+Requires-Dist: casadi!=3.6.6,<3.8,>=3.6.3
 Requires-Dist: numpy>=1.16.0
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: pymoca==0.9.*,>=0.9.1

{rtc_tools-2.7.1 → rtc_tools-2.7.2}/src/rtc_tools.egg-info/requires.txt

@@ -1,4 +1,4 @@
-casadi!=3.6.6,<=3.7,>=3.6.3
+casadi!=3.6.6,<3.8,>=3.6.3
 numpy>=1.16.0
 scipy>=1.0.0
 pymoca==0.9.*,>=0.9.1

{rtc_tools-2.7.1 → rtc_tools-2.7.2}/src/rtctools/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-07-23T09:21:39+0200",
+ "date": "2025-11-25T14:13:12+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "a3a2e2f821b5239481f43285b7dbf495a27de52e",
- "version": "2.7.1"
+ "full-revisionid": "280b3e8717728329dcbec06fd57fd2e61d5dadbf",
+ "version": "2.7.2"
 }
 '''  # END VERSION_JSON
 

{rtc_tools-2.7.1 → rtc_tools-2.7.2}/src/rtctools/data/pi.py

@@ -411,6 +411,7 @@ class Timeseries:
             self.__forecast_index = None
             self.__contains_ensemble = False
             self.__ensemble_size = 1
+            ensemble_indexes = set()
             for series in self.__xml_root.findall("pi:series", ns):
                 header = series.find("pi:header", ns)
 
@@ -471,14 +472,23 @@ class Timeseries:
 
                 el = header.find("pi:ensembleMemberIndex", ns)
                 if el is not None:
-                    contains_ensemble = True
-                    if int(el.text) > self.__ensemble_size - 1:  # Assume zero-based
-                        self.__ensemble_size = int(el.text) + 1
-                else:
-                    contains_ensemble = False
-                if self.__contains_ensemble is False:
-                    # Only overwrite when _contains_ensemble was False before
-                    self.__contains_ensemble = contains_ensemble
+                    ensemble_indexes.add(int(el.text))
+
+            # We assume the ensemble ids are zero-based and increasing by 1
+            if len(ensemble_indexes) > 1:
+                # check if ids are zero-based and increasing by 1
+                sorted_ensemble_indexes = sorted(ensemble_indexes)
+                if sorted_ensemble_indexes != list(range(len(sorted_ensemble_indexes))):
+                    raise ValueError(
+                        "PI: Ensemble ids must be zero-based and increasing by 1 when more than one"
+                        " ensemble member is present."
+                    )
+                self.__contains_ensemble = True
+                self.__ensemble_size = len(ensemble_indexes)
+            else:
+                # There are no ensemble members, or a single ensemble member of arbitrary id
+                self.__contains_ensemble = False
+                self.__ensemble_size = 1
 
             # Define the times, and floor the global forecast_datetime to the
             # global time step to get its index
@@ -538,24 +548,27 @@ class Timeseries:
                 end_datetime = self.__parse_date_time(header.find("pi:endDate", ns))
 
                 make_virtual_ensemble = False
-                el = header.find("pi:ensembleMemberIndex", ns)
-                if el is not None:
-                    ensemble_member = int(el.text)
-                    while ensemble_member >= len(self.__values):
-                        self.__values.append({})
-                    while ensemble_member >= len(self.__units):
-                        self.__units.append({})
+                if self.__contains_ensemble:
+                    el = header.find("pi:ensembleMemberIndex", ns)
+                    if el is not None:
+                        ensemble_member = int(el.text)
+                        while ensemble_member >= len(self.__values):
+                            self.__values.append({})
+                        while ensemble_member >= len(self.__units):
+                            self.__units.append({})
+                    else:
+                        ensemble_member = 0
+                    if el is None:
+                        # Expand values dict to accommodate referencing of (virtual)
+                        # ensemble series to the input values. This is e.g. needed
+                        # for initial states that have a single historical values.
+                        while self.ensemble_size > len(self.__values):
+                            self.__values.append({})
+                        while self.ensemble_size > len(self.__units):
+                            self.__units.append({})
+                        make_virtual_ensemble = True
                 else:
                     ensemble_member = 0
-                if el is None and self.contains_ensemble is True:
-                    # Expand values dict to accommodate referencing of (virtual)
-                    # ensemble series to the input values. This is e.g. needed
-                    # for initial states that have a single historical values.
-                    while self.ensemble_size > len(self.__values):
-                        self.__values.append({})
-                    while self.ensemble_size > len(self.__units):
-                        self.__units.append({})
-                    make_virtual_ensemble = True
 
                 if self.__dt:
                     n_values = int(

{rtc_tools-2.7.1 → rtc_tools-2.7.2}/src/rtctools/rtctoolsapp.py

@@ -105,7 +105,7 @@ def download_examples(*args):
 
     version = rtctools.__version__
     try:
-        url = "https://github.com/deltares/rtc-tools/zipball/{}".format(version)
+        url = "https://github.com/rtc-tools/rtc-tools/zipball/{}".format(version)
 
         opener = urllib.request.build_opener()
         urllib.request.install_opener(opener)