rtc-tools 2.8.2__tar.gz → 2.9.0a2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (460) hide show
  1. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.github/actions/setup-python/action.yml +1 -1
  2. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.github/workflows/ci.yml +36 -9
  3. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/CHARTER.md +1 -1
  4. rtc_tools-2.9.0a2/CODE_OF_CONDUCT.md +18 -0
  5. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/CONTRIBUTING.md +10 -10
  6. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/GOVERNANCE.md +1 -1
  7. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/PKG-INFO +20 -8
  8. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/README.md +8 -1
  9. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/debugging.rst +35 -0
  10. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/pumped_hydropower_system.rst +1 -1
  11. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/getting-started.rst +1 -1
  12. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/modelica_models.rst +1 -1
  13. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/cascading_channels/model/Example.mo +5 -5
  14. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/model/Example.mo +2 -2
  15. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/model/Example.mo +5 -5
  16. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/model/ExampleOptimization.mo +1 -1
  17. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/integrator_delay/model/Example.mo +1 -1
  18. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/pumped_hydropower_system/model/PumpedStoragePlant.mo +0 -2
  19. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/pumped_hydropower_system/reference_output/timeseries_export.csv +22 -22
  20. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/pumped_hydropower_system/src/example.py +1 -2
  21. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation/model/Example.mo +1 -1
  22. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/step_response/model/Example.mo +4 -4
  23. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/pyproject.toml +12 -7
  24. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/sonar-project.properties +1 -1
  25. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/_internal/casadi_to_lp.py +54 -19
  26. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/pi.py +2 -0
  27. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/collocated_integrated_optimization_problem.py +91 -7
  28. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/csv_lookup_table_mixin.py +2 -0
  29. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/goal_programming_mixin.py +17 -8
  30. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/goal_programming_mixin_base.py +23 -1
  31. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/homotopy_mixin.py +89 -17
  32. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/min_abs_goal_programming_mixin.py +10 -8
  33. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/modelica_mixin.py +34 -15
  34. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/optimization_problem.py +44 -12
  35. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/single_pass_goal_programming_mixin.py +16 -6
  36. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/test_data.py +8 -0
  37. rtc_tools-2.9.0a2/tests/modelica/install_msl.mos +4 -0
  38. rtc_tools-2.9.0a2/tests/modelica/test_omc_conformance.py +270 -0
  39. rtc_tools-2.9.0a2/tests/optimization/__init__.py +0 -0
  40. rtc_tools-2.9.0a2/tests/optimization/data/ModelHomotopyInput.mo +13 -0
  41. rtc_tools-2.9.0a2/tests/optimization/data/ModelHomotopyInputAlias.mo +13 -0
  42. rtc_tools-2.9.0a2/tests/optimization/test_constraint_names.py +179 -0
  43. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_csv_lookuptable_mixin.py +13 -0
  44. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_export_lp.py +125 -0
  45. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_goal_programming.py +1 -1
  46. rtc_tools-2.9.0a2/tests/optimization/test_homotopy_mixin.py +178 -0
  47. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_modelica_mixin.py +32 -0
  48. rtc_tools-2.9.0a2/tests/simulation/__init__.py +0 -0
  49. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tox.ini +5 -1
  50. rtc_tools-2.9.0a2/uv.lock +2107 -0
  51. rtc_tools-2.8.2/src/rtctools/data/__init__.py +0 -4
  52. rtc_tools-2.8.2/tests/optimization/test_homotopy_mixin.py +0 -92
  53. rtc_tools-2.8.2/uv.lock +0 -2194
  54. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.codecov.yml +0 -0
  55. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.coveragerc +0 -0
  56. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.git-blame-ignore-revs +0 -0
  57. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.gitignore +0 -0
  58. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.pre-commit-config.yaml +0 -0
  59. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/.readthedocs.yaml +0 -0
  60. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/AUTHORS +0 -0
  61. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/COPYING +0 -0
  62. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/COPYING.LESSER +0 -0
  63. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/.gitignore +0 -0
  64. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/Makefile +0 -0
  65. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/_static/external_links.js +0 -0
  66. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/_static/theme_overrides.css +0 -0
  67. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/conf.py +0 -0
  68. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/basic.rst +0 -0
  69. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/cascading_channels.rst +0 -0
  70. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/channel_pulse.rst +0 -0
  71. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/channel_wave_damping.rst +0 -0
  72. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/ensemble.rst +0 -0
  73. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/fallback_options.rst +0 -0
  74. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/goal_programming.rst +0 -0
  75. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/integrator_delay.rst +0 -0
  76. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/lookup_table.rst +0 -0
  77. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/mixed_integer.rst +0 -0
  78. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization/step_response.rst +0 -0
  79. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/optimization.rst +0 -0
  80. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/basic_results.py +0 -0
  81. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/cascading_channels_results.py +0 -0
  82. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/channel_pulse_results.py +0 -0
  83. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/channel_wave_damping.py +0 -0
  84. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/ensemble_results.py +0 -0
  85. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/goal_programming_results.py +0 -0
  86. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/integrator_delay.py +0 -0
  87. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/lookup_table_results.py +0 -0
  88. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/mixed_integer_results.py +0 -0
  89. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/pumped_hydropower_system_results.py +0 -0
  90. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/pyplots/simulation_results.py +0 -0
  91. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/simulation/custom_equation.rst +0 -0
  92. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/simulation/setpoint.rst +0 -0
  93. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples/simulation.rst +0 -0
  94. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/examples.rst +0 -0
  95. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/Aggregation_01.png +0 -0
  96. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/Lake-Hartwell-24012016.jpg +0 -0
  97. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/PumpedStoragePlant_openmodelica.png +0 -0
  98. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/Woudagemaal.jpg +0 -0
  99. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/basic_example_console.png +0 -0
  100. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/cascading_channels_omedit.png +0 -0
  101. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/channel_impulse_xs.png +0 -0
  102. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/channel_wave_damping_omedit.png +0 -0
  103. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/graig-coch-2117306_640.jpg +0 -0
  104. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/integrator_delay_modelica.png +0 -0
  105. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/lavant-2976738_1280.jpg +0 -0
  106. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/orifice_vs_pump_openmodelica.png +0 -0
  107. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/pont-du-gard-1742029_1280.jpg +0 -0
  108. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/rtc-tools-horizontal-color.svg +0 -0
  109. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/rtc-tools-horizontal-white.svg +0 -0
  110. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/simple_storage_openmodelica.png +0 -0
  111. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/single_channel.png +0 -0
  112. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/single_channel_hec-ras.png +0 -0
  113. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/validation/Downstream_150.png +0 -0
  114. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/images/validation/Upstream_150.png +0 -0
  115. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/index.rst +0 -0
  116. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/literature.bib +0 -0
  117. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/make.bat +0 -0
  118. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/basics.rst +0 -0
  119. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/csv_io.rst +0 -0
  120. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/fews_io.rst +0 -0
  121. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/forecast_uncertainty.rst +0 -0
  122. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/goal_programming/converting_goals_to_constraints.rst +0 -0
  123. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/goal_programming/goals.rst +0 -0
  124. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/goal_programming/linearized_order.rst +0 -0
  125. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/goal_programming/main_idea.rst +0 -0
  126. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/goal_programming/minimize_absolute_value.rst +0 -0
  127. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/homotopy.rst +0 -0
  128. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/initial_state_estimation.rst +0 -0
  129. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/linearization.rst +0 -0
  130. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/lookup_tables.rst +0 -0
  131. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/multi_objective.rst +0 -0
  132. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/solver_configuration.rst +0 -0
  133. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization/time_discretization.rst +0 -0
  134. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/optimization.rst +0 -0
  135. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/related-projects.rst +0 -0
  136. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/simulation/basics.rst +0 -0
  137. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/simulation/csv_io.rst +0 -0
  138. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/simulation/fews_io.rst +0 -0
  139. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/simulation.rst +0 -0
  140. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/doc/time-series.rst +0 -0
  141. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/basic/input/initial_state.csv +0 -0
  142. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/basic/input/timeseries_import.csv +0 -0
  143. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/basic/model/Example.mo +0 -0
  144. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/basic/output/.gitignore +0 -0
  145. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/basic/reference_output/timeseries_export.csv +0 -0
  146. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/basic/src/example.py +0 -0
  147. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/cascading_channels/input/initial_state.csv +0 -0
  148. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/cascading_channels/input/timeseries_import.csv +0 -0
  149. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/cascading_channels/model/.gitignore +0 -0
  150. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/cascading_channels/output/.gitignore +0 -0
  151. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/cascading_channels/reference_output/timeseries_export.csv +0 -0
  152. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/cascading_channels/src/example.py +0 -0
  153. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/HEC-RAS.zip +0 -0
  154. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/input/timeseries_import.csv +0 -0
  155. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/output/.gitignore +0 -0
  156. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/reference_output/HEC-RAS_export.csv +0 -0
  157. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/reference_output/timeseries_export.csv +0 -0
  158. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/reference_output/timeseries_export_inertial_wave.csv +0 -0
  159. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/reference_output/timeseries_export_inertial_wave_semi_implicit.csv +0 -0
  160. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/reference_output/timeseries_export_saint_venant.csv +0 -0
  161. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/reference_output/timeseries_export_saint_venant_upwind.csv +0 -0
  162. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_pulse/src/example.py +0 -0
  163. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/input/timeseries_import.csv +0 -0
  164. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/model/ExampleLocalControl.mo +0 -0
  165. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/model/PIDController.mo +0 -0
  166. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/output/.gitignore +0 -0
  167. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/reference_output/timeseries_export.csv +0 -0
  168. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/reference_output/timeseries_export_local_control.csv +0 -0
  169. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/src/example_local_control.py +0 -0
  170. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/src/example_optimization.py +0 -0
  171. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/src/steady_state_initialization_mixin.py +0 -0
  172. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/channel_wave_damping/src/step_size_parameter_mixin.py +0 -0
  173. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/.gitignore +0 -0
  174. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/ensemble.csv +0 -0
  175. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/forecast1/.gitignore +0 -0
  176. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/forecast1/initial_state.csv +0 -0
  177. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/forecast1/timeseries_import.csv +0 -0
  178. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/forecast2/.gitignore +0 -0
  179. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/forecast2/initial_state.csv +0 -0
  180. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/forecast2/timeseries_import.csv +0 -0
  181. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/lookup_tables/.gitignore +0 -0
  182. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/lookup_tables/curvefit_options.ini +0 -0
  183. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/input/lookup_tables/storage_V.csv +0 -0
  184. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/model/Example.mo +0 -0
  185. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/output/forecast1/.gitignore +0 -0
  186. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/output/forecast2/.gitignore +0 -0
  187. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/reference_output/forecast1/timeseries_export.csv +0 -0
  188. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/reference_output/forecast2/timeseries_export.csv +0 -0
  189. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/ensemble/src/example.py +0 -0
  190. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/fallback_option/output/.gitignore +0 -0
  191. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/fallback_option/src/example.py +0 -0
  192. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/fallback_option/src/example_with_gp.py +0 -0
  193. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/goal_programming/input/initial_state.csv +0 -0
  194. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/goal_programming/input/timeseries_import.csv +0 -0
  195. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/goal_programming/model/Example.mo +0 -0
  196. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/goal_programming/output/.gitignore +0 -0
  197. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/goal_programming/reference_output/timeseries_export.csv +0 -0
  198. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/goal_programming/src/example.py +0 -0
  199. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/integrator_delay/input/initial_state.csv +0 -0
  200. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/integrator_delay/input/timeseries_import.csv +0 -0
  201. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/integrator_delay/input/timeseries_import_simulation.csv +0 -0
  202. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/integrator_delay/src/example.py +0 -0
  203. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/input/.gitignore +0 -0
  204. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/input/initial_state.csv +0 -0
  205. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/input/lookup_tables/.gitignore +0 -0
  206. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/input/lookup_tables/curvefit_options.ini +0 -0
  207. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/input/lookup_tables/storage_V.csv +0 -0
  208. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/input/timeseries_import.csv +0 -0
  209. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/model/Example.mo +0 -0
  210. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/output/.gitignore +0 -0
  211. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/reference_output/timeseries_export.csv +0 -0
  212. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/lookup_table/src/example.py +0 -0
  213. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/mixed_integer/input/initial_state.csv +0 -0
  214. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/mixed_integer/input/timeseries_import.csv +0 -0
  215. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/mixed_integer/model/Example.mo +0 -0
  216. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/mixed_integer/output/.gitignore +0 -0
  217. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/mixed_integer/reference_output/timeseries_export.csv +0 -0
  218. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/mixed_integer/src/example.py +0 -0
  219. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/pumped_hydropower_system/input/initial_state.csv +0 -0
  220. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/pumped_hydropower_system/input/timeseries_import.csv +0 -0
  221. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/pumped_hydropower_system/output/.gitignore +0 -0
  222. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation/input/parameters.csv +0 -0
  223. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation/input/timeseries_import.csv +0 -0
  224. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation/output/.gitignore +0 -0
  225. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation/reference_output/timeseries_export.csv +0 -0
  226. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation/src/example.py +0 -0
  227. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation_with_custom_equations/input/initial_state.csv +0 -0
  228. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation_with_custom_equations/input/timeseries_import.csv +0 -0
  229. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation_with_custom_equations/model/SimpleModel.mo +0 -0
  230. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation_with_custom_equations/output/.gitignore +0 -0
  231. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation_with_custom_equations/reference_output/timeseries_export.csv +0 -0
  232. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/simulation_with_custom_equations/src/simple_model.py +0 -0
  233. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/single_reservoir/input/initial_state.csv +0 -0
  234. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/single_reservoir/input/timeseries_import.csv +0 -0
  235. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/single_reservoir/model/single_reservoir.mo +0 -0
  236. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/single_reservoir/output/.gitignore +0 -0
  237. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/single_reservoir/reference_output/timeseries_export.csv +0 -0
  238. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/single_reservoir/src/single_reservoir.py +0 -0
  239. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/step_response/input/initial_state.csv +0 -0
  240. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/step_response/input/timeseries_import.csv +0 -0
  241. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/step_response/output/.gitignore +0 -0
  242. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/step_response/reference_output/timeseries_export_saint_venant.csv +0 -0
  243. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/examples/step_response/src/example.py +0 -0
  244. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/__init__.py +0 -0
  245. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/_internal/__init__.py +0 -0
  246. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/_internal/alias_tools.py +0 -0
  247. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/_internal/caching.py +0 -0
  248. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/_internal/casadi_helpers.py +0 -0
  249. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/_internal/debug_check_helpers.py +0 -0
  250. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/_internal/ensemble_bounds_decorator.py +0 -0
  251. {rtc_tools-2.8.2/src/rtctools/optimization → rtc_tools-2.9.0a2/src/rtctools/data}/__init__.py +0 -0
  252. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/csv.py +0 -0
  253. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/interpolation/__init__.py +0 -0
  254. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/interpolation/bspline.py +0 -0
  255. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/interpolation/bspline1d.py +0 -0
  256. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/interpolation/bspline2d.py +0 -0
  257. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/netcdf.py +0 -0
  258. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/rtc.py +0 -0
  259. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/data/storage.py +0 -0
  260. {rtc_tools-2.8.2/src/rtctools/simulation → rtc_tools-2.9.0a2/src/rtctools/optimization}/__init__.py +0 -0
  261. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/control_tree_mixin.py +0 -0
  262. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/csv_mixin.py +0 -0
  263. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/initial_state_estimation_mixin.py +0 -0
  264. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/io_mixin.py +0 -0
  265. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/linearization_mixin.py +0 -0
  266. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/linearized_order_goal_programming_mixin.py +0 -0
  267. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/netcdf_mixin.py +0 -0
  268. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/pi_mixin.py +0 -0
  269. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/planning_mixin.py +0 -0
  270. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/optimization/timeseries.py +0 -0
  271. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/rtctoolsapp.py +0 -0
  272. {rtc_tools-2.8.2/tests → rtc_tools-2.9.0a2/src/rtctools/simulation}/__init__.py +0 -0
  273. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/simulation/csv_mixin.py +0 -0
  274. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/simulation/io_mixin.py +0 -0
  275. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/simulation/pi_mixin.py +0 -0
  276. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/simulation/simulation_problem.py +0 -0
  277. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/util.py +0 -0
  278. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/src/rtctools/version.py +0 -0
  279. {rtc_tools-2.8.2/tests/data → rtc_tools-2.9.0a2/tests}/__init__.py +0 -0
  280. {rtc_tools-2.8.2/tests/examples → rtc_tools-2.9.0a2/tests/data}/__init__.py +0 -0
  281. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/.gitignore +0 -0
  282. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/curve.dat +0 -0
  283. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/diag.xml +0 -0
  284. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/initial_state_0.csv +0 -0
  285. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/initial_state_1.csv +0 -0
  286. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/look_up_table_0.csv +0 -0
  287. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/look_up_table_1.csv +0 -0
  288. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/look_up_table_2.csv +0 -0
  289. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/pi_run.xml +0 -0
  290. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/rtcDataConfig.xml +0 -0
  291. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/rtcParameterConfig.xml +0 -0
  292. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/surface.dat +0 -0
  293. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_export.xml +0 -0
  294. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import.bin +0 -0
  295. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import.xml +0 -0
  296. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_0.csv +0 -0
  297. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_1.csv +0 -0
  298. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_2.csv +0 -0
  299. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_ensemble.nc +0 -0
  300. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_ensemble.xml +0 -0
  301. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_ensemblesize1_noRealization.nc +0 -0
  302. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_ensemblesize1_withRealization.nc +0 -0
  303. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data/timeseries_import_neq.xml +0 -0
  304. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/data_path.py +0 -0
  305. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/test_csv.py +0 -0
  306. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/test_diag.py +0 -0
  307. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/test_interpolate.py +0 -0
  308. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/test_netcdf.py +0 -0
  309. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data/test_storage.py +0 -0
  310. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/data_path.py +0 -0
  311. {rtc_tools-2.8.2/tests/internal → rtc_tools-2.9.0a2/tests/examples}/__init__.py +0 -0
  312. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/examples/test_examples.py +0 -0
  313. {rtc_tools-2.8.2/tests/optimization → rtc_tools-2.9.0a2/tests/internal}/__init__.py +0 -0
  314. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/internal/test_alias_tools.py +0 -0
  315. {rtc_tools-2.8.2/tests/simulation → rtc_tools-2.9.0a2/tests/modelica}/__init__.py +0 -0
  316. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/.gitignore +0 -0
  317. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/EmptyModel.mo +0 -0
  318. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/Model.mo +0 -0
  319. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelAlgebraic.mo +0 -0
  320. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelDebugChecks.mo +0 -0
  321. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelDelay.mo +0 -0
  322. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelDelayLoop.mo +0 -0
  323. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelHomotopyParameter.mo +0 -0
  324. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelMixedInteger.mo +0 -0
  325. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelNestedDelay.mo +0 -0
  326. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelSIUnits.mo +0 -0
  327. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelSymbolicParameters.mo +0 -0
  328. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelWithInitial.mo +0 -0
  329. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelWithInitialLinear.mo +0 -0
  330. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ModelWithLookupTable.mo +0 -0
  331. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/SingleShootingModel.mo +0 -0
  332. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/ensemble.csv +0 -0
  333. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/initial_state.csv +0 -0
  334. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/lookup_tables/.gitignore +0 -0
  335. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/lookup_tables/curvefit_options.ini +0 -0
  336. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/lookup_tables/x_prime.csv +0 -0
  337. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member0/.gitignore +0 -0
  338. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member0/initial_state.csv +0 -0
  339. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member0/parameters.csv +0 -0
  340. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member0/timeseries_import.csv +0 -0
  341. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member1/.gitignore +0 -0
  342. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member1/initial_state.csv +0 -0
  343. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member1/parameters.csv +0 -0
  344. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/member1/timeseries_import.csv +0 -0
  345. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/.gitignore +0 -0
  346. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/Model.mo +0 -0
  347. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/ensemble.csv +0 -0
  348. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member0/timeseries_import.csv +0 -0
  349. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member1/timeseries_import.csv +0 -0
  350. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member2/timeseries_import.csv +0 -0
  351. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member3/timeseries_import.csv +0 -0
  352. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/rtcDataConfig.xml +0 -0
  353. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/rtcParameterConfig.xml +0 -0
  354. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/timeseries_import.nc +0 -0
  355. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/timeseries_import.xml +0 -0
  356. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_initial_date/ensemble.csv +0 -0
  357. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_initial_date/member0/timeseries_import.csv +0 -0
  358. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_initial_date/member1/timeseries_import.csv +0 -0
  359. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_initial_date/rtcDataConfig.xml +0 -0
  360. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_initial_date/rtcParameterConfig.xml +0 -0
  361. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_initial_date/timeseries_import.nc +0 -0
  362. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_initial_date/timeseries_import.xml +0 -0
  363. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_timestep/ensemble.csv +0 -0
  364. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_timestep/member0/timeseries_import.csv +0 -0
  365. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_timestep/member1/timeseries_import.csv +0 -0
  366. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_timestep/rtcDataConfig.xml +0 -0
  367. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_timestep/rtcParameterConfig.xml +0 -0
  368. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_timestep/timeseries_import.nc +0 -0
  369. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_timestep/timeseries_import.xml +0 -0
  370. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/ensemble.csv +0 -0
  371. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/member0/parameters.csv +0 -0
  372. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/member0/timeseries_import.csv +0 -0
  373. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/member1/parameters.csv +0 -0
  374. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/member1/timeseries_import.csv +0 -0
  375. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/rtcDataConfig.xml +0 -0
  376. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/rtcParameterConfig.xml +0 -0
  377. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/timeseries_import.nc +0 -0
  378. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/multiple_io_mixins/different_values/timeseries_import.xml +0 -0
  379. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/non_zero_indexed_ensembles/Model.mo +0 -0
  380. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/non_zero_indexed_ensembles/rtcDataConfig.xml +0 -0
  381. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/non_zero_indexed_ensembles/rtcParameterConfig.xml +0 -0
  382. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/non_zero_indexed_ensembles/rtcParameterConfig_extra.xml +0 -0
  383. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/non_zero_indexed_ensembles/timeseries_import.xml +0 -0
  384. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/one-member-ensemble/ensemble.csv +0 -0
  385. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/one-member-ensemble/member0/.gitignore +0 -0
  386. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/one-member-ensemble/member0/initial_state.csv +0 -0
  387. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/one-member-ensemble/member0/parameters.csv +0 -0
  388. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/one-member-ensemble/member0/timeseries_import.csv +0 -0
  389. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/parameters.csv +0 -0
  390. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/reference_linear_model.lp +0 -0
  391. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/rtcDataConfig.xml +0 -0
  392. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/rtcParameterConfig.xml +0 -0
  393. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/rtcParameterConfig_extra.xml +0 -0
  394. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/single_non_zero_ensemble_index/Model.mo +0 -0
  395. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/single_non_zero_ensemble_index/rtcDataConfig.xml +0 -0
  396. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/single_non_zero_ensemble_index/rtcParameterConfig.xml +0 -0
  397. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/single_non_zero_ensemble_index/rtcParameterConfig_extra.xml +0 -0
  398. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/single_non_zero_ensemble_index/timeseries_import.xml +0 -0
  399. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/timeseries_import.csv +0 -0
  400. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/timeseries_import.nc +0 -0
  401. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data/timeseries_import.xml +0 -0
  402. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/data_path.py +0 -0
  403. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/regenerate_lp_reference.py +0 -0
  404. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_control_tree_mixin.py +0 -0
  405. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_csv_mixin.py +0 -0
  406. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_debug_checks.py +0 -0
  407. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_delay_expressions.py +0 -0
  408. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_extra_casadipath.py +0 -0
  409. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_integration.py +0 -0
  410. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_interpolation.py +0 -0
  411. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_io_mixin.py +0 -0
  412. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_linearized_order_goal_programming_mixin.py +0 -0
  413. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_min_abs_goal_programming.py +0 -0
  414. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_multiple_io_mixins.py +0 -0
  415. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_netcdf_mixin.py +0 -0
  416. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_optimization_problem.py +0 -0
  417. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_path_extra_variables.py +0 -0
  418. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_path_variable_assembly.py +0 -0
  419. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_pi_mixin.py +0 -0
  420. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_planning_and_control_tree_mixin.py +0 -0
  421. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_planning_mixin.py +0 -0
  422. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_problem_class_check.py +0 -0
  423. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_single_pass_goal_programming.py +0 -0
  424. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_solvers.py +0 -0
  425. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_timeseries.py +0 -0
  426. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_vector_constraints_variables.py +0 -0
  427. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/optimization/test_vector_goals.py +0 -0
  428. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/.gitignore +0 -0
  429. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/Model.mo +0 -0
  430. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/ModelCustomEquation.mo +0 -0
  431. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/Model_base.mo +0 -0
  432. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/Model_delay.mo +0 -0
  433. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/Model_nominal.mo +0 -0
  434. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/initial_state.csv +0 -0
  435. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_infeasible.mo +0 -0
  436. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_out_of_bounds.mo +0 -0
  437. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_out_of_sym_bounds.mo +0 -0
  438. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_with_bounds.mo +0 -0
  439. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_with_input_series.mo +0 -0
  440. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_with_sym_ystart.mo +0 -0
  441. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_with_xstart.mo +0 -0
  442. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/model_with_zero_xstart.mo +0 -0
  443. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/timeseries_import.csv +0 -0
  444. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/infeasible_initial_value/timeseries_import_with_x.csv +0 -0
  445. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/initial_state.csv +0 -0
  446. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/parameters.csv +0 -0
  447. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/rtcDataConfig.xml +0 -0
  448. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/rtcParameterConfig.xml +0 -0
  449. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/timeseries_import.csv +0 -0
  450. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data/timeseries_import.xml +0 -0
  451. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/data_path.py +0 -0
  452. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/test_csv_mixin.py +0 -0
  453. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/test_io_mixin.py +0 -0
  454. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/test_pi_mixin.py +0 -0
  455. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/test_problem_class_check.py +0 -0
  456. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/simulation/test_simulation.py +0 -0
  457. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/test_case.py +0 -0
  458. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/tests/test_rtctoolsapp.py +0 -0
  459. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/xsd/rtcDataConfig.xsd +0 -0
  460. {rtc_tools-2.8.2 → rtc_tools-2.9.0a2}/xsd/rtcSharedTypes.xsd +0 -0
@@ -5,7 +5,7 @@ inputs:
5
5
  uv-version:
6
6
  description: "Version of uv to install"
7
7
  required: false
8
- default: "0.7.9"
8
+ default: "0.13.5"
9
9
  dependency-groups:
10
10
  description: "Space-separated list of dependency groups to install (e.g. 'deploy tests')"
11
11
  required: false
@@ -30,7 +30,7 @@ jobs:
30
30
  needs: [style]
31
31
  runs-on: ubuntu-latest
32
32
  container:
33
- image: python:3.10
33
+ image: python:3.11
34
34
  timeout-minutes: 30
35
35
  steps:
36
36
  - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -57,16 +57,16 @@ jobs:
57
57
  strategy:
58
58
  matrix:
59
59
  include:
60
- - version: '3.10'
61
60
  - version: '3.11'
62
61
  - version: '3.12'
63
62
  - version: '3.13'
64
63
  - version: '3.14'
64
+ - version: '3.15'
65
65
  # Lowest and highest resolution modes to test oldest and newest dependencies.
66
- - version: '3.10'
66
+ - version: '3.11'
67
67
  resolution_mode: 'lowest'
68
68
  label: ' (Oldest Dependencies)'
69
- - version: '3.14'
69
+ - version: '3.15'
70
70
  resolution_mode: 'highest'
71
71
  label: ' (Newest Dependencies)'
72
72
  steps:
@@ -81,7 +81,7 @@ jobs:
81
81
  needs: build
82
82
  runs-on: ubuntu-latest
83
83
  container:
84
- image: python:3.10
84
+ image: python:3.11
85
85
  timeout-minutes: 30
86
86
  env:
87
87
  TOXENV: coverage
@@ -120,20 +120,47 @@ jobs:
120
120
  strategy:
121
121
  matrix:
122
122
  version:
123
- - '3.10'
124
123
  - '3.11'
125
124
  - '3.12'
126
125
  - '3.13'
127
126
  - '3.14'
127
+ - '3.15'
128
+ steps:
129
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
130
+ - uses: ./.github/actions/setup-python
131
+ with:
132
+ dependency-groups: "tests"
133
+ - run: uv run tox -vv
134
+
135
+ # Check example models with OpenModelica, to track models that pymoca
136
+ # accepts but that are not valid Modelica. See tests/modelica.
137
+ modelica-conformance:
138
+ name: Modelica Conformance (OpenModelica ${{ matrix.omc_version }})
139
+ needs: [style]
140
+ runs-on: ubuntu-latest
141
+ strategy:
142
+ matrix:
143
+ # The test records the known failures for this version, and only runs with it.
144
+ omc_version: ['1.27.1']
145
+ container:
146
+ image: openmodelica/openmodelica:v${{ matrix.omc_version }}-ompython
147
+ timeout-minutes: 30
148
+ env:
149
+ TOXENV: omc
150
+ OMC_VERSION: ${{ matrix.omc_version }}
151
+ # The image has no git, so hatch-vcs cannot determine the version.
152
+ SETUPTOOLS_SCM_PRETEND_VERSION: "0+omc"
128
153
  steps:
129
154
  - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
130
155
  - uses: ./.github/actions/setup-python
131
156
  with:
132
157
  dependency-groups: "tests"
158
+ - name: Install the Modelica Standard Library
159
+ run: omc tests/modelica/install_msl.mos
133
160
  - run: uv run tox -vv
134
161
 
135
162
  deploy:
136
- needs: [build, test-linux, coverage, examples-linux]
163
+ needs: [build, test-linux, coverage, examples-linux, modelica-conformance]
137
164
  runs-on: ubuntu-latest
138
165
  if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/2.') }}
139
166
  permissions:
@@ -150,7 +177,7 @@ jobs:
150
177
  uses: pypa/gh-action-pypi-publish@release/v1
151
178
 
152
179
  deploy-nexus:
153
- needs: [build, test-linux, coverage, examples-linux]
180
+ needs: [build, test-linux, coverage, examples-linux, modelica-conformance]
154
181
  runs-on: ubuntu-latest
155
182
  if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/2.') }}
156
183
  permissions:
@@ -159,7 +186,7 @@ jobs:
159
186
  - name: Set up uv
160
187
  uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
161
188
  with:
162
- version: "0.7.9"
189
+ version: "0.13.5"
163
190
  enable-cache: false
164
191
 
165
192
  - name: Download build distributions
@@ -106,7 +106,7 @@ a. Collaborators acknowledge that the copyright in all new contributions will be
106
106
 
107
107
  b. Except as described in Section 7.c., all contributions to the Project are subject to the following:
108
108
 
109
- i. All new inbound code contributions to the Project must be made using GNU Lesser General Public License v3.0GNU Library General Public License, Version 3.0, available at https://github.com/Deltares/rtc-tools/blob/master/COPYING (the “Project License”).
109
+ i. All new inbound code contributions to the Project must be made using GNU Lesser General Public License v3.0GNU Library General Public License, Version 3.0, available at https://github.com/rtc-tools/rtc-tools/blob/master/COPYING (the “Project License”).
110
110
 
111
111
  ii. All new inbound code contributions must also be accompanied by a Developer Certificate of Origin (http://developercertificate.org) sign-off in the source code system that is submitted through a TSC-approved contribution process which will bind the authorized contributor and, if not self-employed, their employer to the applicable license;
112
112
 
@@ -0,0 +1,18 @@
1
+ # Code of Conduct
2
+
3
+ RTC-Tools follows the [LF Projects Code of Conduct](https://lfprojects.org/policies/code-of-conduct/),
4
+ consistent with [GOVERNANCE.md](GOVERNANCE.md) and the [Technical Charter](CHARTER.md).
5
+
6
+ All participants in the project are expected to act respectfully and professionally
7
+ in accordance with that policy.
8
+
9
+ ## Reporting
10
+
11
+ Do **not** report Code of Conduct violations or other sensitive abuse via public
12
+ GitHub issues.
13
+
14
+ Report privately by emailing
15
+ [info@rtctools.energy](mailto:info@rtctools.energy) — the same private channel
16
+ already documented in [CONTRIBUTING.md](CONTRIBUTING.md) for sensitive reports.
17
+ All complaints will be reviewed and investigated promptly and fairly, with
18
+ regard for the privacy and security of the reporter.
@@ -6,7 +6,7 @@
6
6
  - [Ways to Contribute](#ways-to-contribute)
7
7
  - [Guidelines for Creating Issues](#guidelines-for-creating-issues)
8
8
  - [Security Reporting](#security-reporting)
9
- - [Guidelines for Creating Merge Requests](#guidelines-for-creating-merge-requests)
9
+ - [Guidelines for Creating Pull Requests](#guidelines-for-creating-pull-requests)
10
10
  - [Commits and Commit Messages](#commits-and-commit-messages)
11
11
  - [Code Quality Guidelines](#code-quality-guidelines)
12
12
  - [Setting up a Development Environment](#setting-up-a-development-environment)
@@ -39,13 +39,13 @@ Please follow the issue template and provide as much information as possible to
39
39
  - **Suggesting features**: If you have any ideas or suggestions for new features or improvements,
40
40
  please share them on our [issue tracker](https://github.com/rtc-tools/rtc-tools/issues).
41
41
  Please use the appropriate category and tag for your topic and explain your motivation and use case clearly.
42
- - **Submitting pull requests**: If you want to contribute code or documentation to RTC-Tools, please create a pull request. Before submitting, please follow the [Guidelines for Creating Merge Requests](#guidelines-for-creating-merge-requests) below.
42
+ - **Submitting pull requests**: If you want to contribute code or documentation to RTC-Tools, please create a pull request. Before submitting, please follow the [Guidelines for Creating Pull Requests](#guidelines-for-creating-pull-requests) below.
43
43
  - **Improving documentation**: If you find any errors, typos, or inconsistencies in the documentation,
44
44
  or if you want to add more examples, tutorials, or explanations,
45
- please feel free to edit the documentation files in the docs folder and submit a merge request.
45
+ please feel free to edit the documentation files in the docs folder and submit a pull request.
46
46
  Please follow the [Sphinx syntax and style guide](https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html) for writing documentation.
47
- - **Reviewing merge requests**: If you are familiar with RTC-Tools and want to help us maintain the quality and consistency of the code and documentation,
48
- please review the open merge requests and provide constructive feedback and suggestions.
47
+ - **Reviewing pull requests**: If you are familiar with RTC-Tools and want to help us maintain the quality and consistency of the code and documentation,
48
+ please review the open pull requests and provide constructive feedback and suggestions.
49
49
  - **Testing new releases**: If you want to help us test the new features and bug fixes before they are officially released,
50
50
  please install the latest development version of RTC-Tools from the [GitHub repository](https://github.com/rtc-tools/rtc-tools)
51
51
  and report any issues or feedback on the [issue tracker](https://github.com/rtc-tools/rtc-tools/issues).
@@ -71,9 +71,9 @@ If you discover a security vulnerability, please report it responsibly by emaili
71
71
  - Exposure of sensitive data or credentials
72
72
  - Input data (known or crafted) that causes crashes or data corruption
73
73
 
74
- ## Guidelines for Creating Merge Requests
74
+ ## Guidelines for Creating Pull Requests
75
75
 
76
- 1. **Identify or create an issue**: Before making any changes, open an issue following the [guidelines](#guidelines-for-creating-issues) above, or comment on an existing one in the [issue tracker](https://github.com/deltares/rtc-tools/issues) to discuss your ideas with the maintainers. This helps avoid duplication and ensures your contribution aligns with project goals and the [governance model](GOVERNANCE.md).
76
+ 1. **Identify or create an issue**: Before making any changes, open an issue following the [guidelines](#guidelines-for-creating-issues) above, or comment on an existing one in the [issue tracker](https://github.com/rtc-tools/rtc-tools/issues) to discuss your ideas with the maintainers. This helps avoid duplication and ensures your contribution aligns with project goals and the [governance model](GOVERNANCE.md).
77
77
  2. **Fork or Branch**:
78
78
  - New Contributors: Fork the repository and create a new branch in your fork.
79
79
  - Committers: Create a new branch directly in the main repository. Use a descriptive branch name, such as `feat/short-description`, `fix/issue-123`, or `docs/update-readme`.
@@ -82,7 +82,7 @@ If you discover a security vulnerability, please report it responsibly by emaili
82
82
  - Use existing test datasets from the `tests/data` directory when applicable.
83
83
  - For new functionality requiring specific test data, include minimal test datasets with your contribution. Keep test data files small and focused.
84
84
  5. **Documentation**: Update documentation and add examples to the `examples` folder if necessary.
85
- 6. **Create a pull request**: Reference the corresponding issue in your PR description. Clearly describe what changes you've made, why, and any relevant context.
85
+ 6. **Create a pull request**: Reference the corresponding issue in your PR description (e.g. `Fixes #123`). Clearly describe what changes you've made, why, and any relevant context. Keep the description factual: only state what you have verified, and say how you tested. The repository is rebase-merged, so each commit message lands on `master` as written. Put the reasoning in the commit message body and keep the PR description to what a reviewer needs.
86
86
  7. **Check CI status**: Ensure all automated checks and tests pass before requesting a review.
87
87
  8. **Request review**: Request a code review from a maintainer or committer (see [Governance Roles](GOVERNANCE.md#governance-roles) and [Operational Roles](GOVERNANCE.md#operational-roles)) and address any comments or suggestions.
88
88
 
@@ -153,7 +153,7 @@ By following these guidelines, you help ensure RTC-Tools remains robust, maintai
153
153
 
154
154
  To set up your development environment, you will need:
155
155
 
156
- - Python 3.10 or higher (up to 3.14)
156
+ - Python 3.11 or higher (up to 3.15)
157
157
  - Git
158
158
  - uv: see the [official installation guide](https://docs.astral.sh/uv/getting-started/installation/).
159
159
 
@@ -216,7 +216,7 @@ All contributors are expected to follow the governance model outlined in the [Te
216
216
  ## Licensing and Developer Certificate of Origin (DCO)
217
217
 
218
218
  - **Code contributions**: All code must be contributed under the GNU Lesser General Public License v3.0 (LGPL-3.0).
219
- See [COPYING](https://github.com/Deltares/rtc-tools/blob/master/COPYING) and [COPYING.LESSER](https://github.com/Deltares/rtc-tools/blob/master/COPYING.LESSER) for details.
219
+ See [COPYING](https://github.com/rtc-tools/rtc-tools/blob/master/COPYING) and [COPYING.LESSER](https://github.com/rtc-tools/rtc-tools/blob/master/COPYING.LESSER) for details.
220
220
  - **Documentation contributions**: All documentation is licensed under the [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/).
221
221
  - **SPDX Identifiers**: Please include appropriate SPDX license identifiers in new files.
222
222
 
@@ -50,7 +50,7 @@ Decisions are made by consensus when possible; if a vote is required, each votin
50
50
 
51
51
  ### Becoming a Committer
52
52
 
53
- Anyone can contribute to RTC-Tools by following the [Guidelines for Creating Merge Requests](CONTRIBUTING.md#guidelines-for-creating-merge-requests). Contributors who have demonstrated sustained commitment to the project may be nominated to become Committers. The path typically involves:
53
+ Anyone can contribute to RTC-Tools by following the [Guidelines for Creating Pull Requests](CONTRIBUTING.md#guidelines-for-creating-pull-requests). Contributors who have demonstrated sustained commitment to the project may be nominated to become Committers. The path typically involves:
54
54
 
55
55
  1. **Building a track record**: Make regular, high-quality contributions as described in [Ways to Contribute](CONTRIBUTING.md#ways-to-contribute).
56
56
  2. **Nomination**: Any existing Committer can nominate a Contributor, or Contributors can express interest by contacting an existing Committer or emailing [info@rtctools.energy](mailto:info@rtctools.energy).
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: rtc-tools
3
- Version: 2.8.2
3
+ Version: 2.9.0a2
4
4
  Summary: Toolbox for control and optimization of water systems.
5
5
  Project-URL: Homepage, https://oss.deltares.nl/web/rtc-tools/home
6
6
  Project-URL: Download, https://github.com/rtc-tools/rtc-tools/
@@ -184,21 +184,26 @@ Classifier: Operating System :: POSIX
184
184
  Classifier: Operating System :: Unix
185
185
  Classifier: Programming Language :: Python
186
186
  Classifier: Programming Language :: Python :: 3
187
+ Classifier: Programming Language :: Python :: 3.11
188
+ Classifier: Programming Language :: Python :: 3.12
189
+ Classifier: Programming Language :: Python :: 3.13
190
+ Classifier: Programming Language :: Python :: 3.14
191
+ Classifier: Programming Language :: Python :: 3.15
187
192
  Classifier: Topic :: Scientific/Engineering :: GIS
188
193
  Classifier: Topic :: Scientific/Engineering :: Mathematics
189
194
  Classifier: Topic :: Scientific/Engineering :: Physics
190
- Requires-Python: >=3.10
195
+ Requires-Python: >=3.11
191
196
  Requires-Dist: casadi!=3.6.6,<3.9,>=3.6.3
192
197
  Requires-Dist: defusedxml>=0.7.0
193
- Requires-Dist: numpy>=1.21.2
198
+ Requires-Dist: numpy>=1.23.2
194
199
  Requires-Dist: pymoca==0.9.*,>=0.9.3
195
- Requires-Dist: rtc-tools-channel-flow>=1.2.0
200
+ Requires-Dist: rtc-tools-channel-flow>=1.4.0
196
201
  Requires-Dist: rtc-tools-standard-library>=0.1.2
197
- Requires-Dist: scipy>=1.7.2
202
+ Requires-Dist: scipy>=1.9.2
198
203
  Provides-Extra: all
199
- Requires-Dist: netcdf4; extra == 'all'
204
+ Requires-Dist: netcdf4>=1.6.1; extra == 'all'
200
205
  Provides-Extra: netcdf
201
- Requires-Dist: netcdf4; extra == 'netcdf'
206
+ Requires-Dist: netcdf4>=1.6.1; extra == 'netcdf'
202
207
  Description-Content-Type: text/markdown
203
208
 
204
209
  <p align="center">
@@ -209,11 +214,14 @@ Description-Content-Type: text/markdown
209
214
  [![TeamCity](https://dpcbuild.deltares.nl/app/rest/builds/buildType:RTCT_RtcTools2_RtcToolsFullModelTests/statusIcon.svg)](https://dpcbuild.deltares.nl/buildConfiguration/RTCT_RtcTools2_RtcToolsFullModelTests)
210
215
  [![SonarCloud Alert Status](https://sonarcloud.io/api/project_badges/measure?project=rtc-tools_rtc-tools&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=rtc-tools_rtc-tools)
211
216
  [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=rtc-tools_rtc-tools&metric=coverage)](https://sonarcloud.io/summary/new_code?id=rtc-tools_rtc-tools)
212
- [![PyPI](https://img.shields.io/pypi/v/rtc-tools)](https://pypi.org/project/rtc-tools/)
217
+ [![Latest Version](https://img.shields.io/pypi/v/rtc-tools)](https://pypi.org/project/rtc-tools/)
213
218
  [![PyPI Downloads](https://static.pepy.tech/badge/rtc-tools/month)](https://pepy.tech/project/rtc-tools)
219
+ [![Total Downloads](https://static.pepy.tech/badge/rtc-tools)](https://pepy.tech/project/rtc-tools)
214
220
  [![Python](https://img.shields.io/pypi/pyversions/rtc-tools)](https://pypi.org/project/rtc-tools/)
215
221
  [![License: LGPL v3](https://img.shields.io/badge/License-LGPL_v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0)
216
222
  [![LFX Health Score](https://insights.linuxfoundation.org/api/badge/health-score?project=rtc-tools)](https://insights.linuxfoundation.org/project/rtc-tools)
223
+ [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/15480/badge)](https://www.bestpractices.dev/projects/15480)
224
+ [![Docs](https://img.shields.io/readthedocs/rtc-tools/stable)](https://rtc-tools.readthedocs.io/en/stable/)
217
225
 
218
226
  > **NOTE** The RTC-Tools repository has been migrated from GitLab to here;
219
227
  see [Migration from GitLab](#migration-from-gitlab).
@@ -336,3 +344,7 @@ RTC-Tools is part of the LF Energy ecosystem and actively welcomes collaboration
336
344
  ## Acknowledgment
337
345
 
338
346
  If you use RTC-Tools in your work, please acknowledge it in any resulting publications. You can do this by citing the RTC-Tools software and providing a link to our [GitHub repository](https://github.com/rtc-tools/rtc-tools).
347
+
348
+ ## Code of Conduct
349
+
350
+ See [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
@@ -6,11 +6,14 @@
6
6
  [![TeamCity](https://dpcbuild.deltares.nl/app/rest/builds/buildType:RTCT_RtcTools2_RtcToolsFullModelTests/statusIcon.svg)](https://dpcbuild.deltares.nl/buildConfiguration/RTCT_RtcTools2_RtcToolsFullModelTests)
7
7
  [![SonarCloud Alert Status](https://sonarcloud.io/api/project_badges/measure?project=rtc-tools_rtc-tools&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=rtc-tools_rtc-tools)
8
8
  [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=rtc-tools_rtc-tools&metric=coverage)](https://sonarcloud.io/summary/new_code?id=rtc-tools_rtc-tools)
9
- [![PyPI](https://img.shields.io/pypi/v/rtc-tools)](https://pypi.org/project/rtc-tools/)
9
+ [![Latest Version](https://img.shields.io/pypi/v/rtc-tools)](https://pypi.org/project/rtc-tools/)
10
10
  [![PyPI Downloads](https://static.pepy.tech/badge/rtc-tools/month)](https://pepy.tech/project/rtc-tools)
11
+ [![Total Downloads](https://static.pepy.tech/badge/rtc-tools)](https://pepy.tech/project/rtc-tools)
11
12
  [![Python](https://img.shields.io/pypi/pyversions/rtc-tools)](https://pypi.org/project/rtc-tools/)
12
13
  [![License: LGPL v3](https://img.shields.io/badge/License-LGPL_v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0)
13
14
  [![LFX Health Score](https://insights.linuxfoundation.org/api/badge/health-score?project=rtc-tools)](https://insights.linuxfoundation.org/project/rtc-tools)
15
+ [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/15480/badge)](https://www.bestpractices.dev/projects/15480)
16
+ [![Docs](https://img.shields.io/readthedocs/rtc-tools/stable)](https://rtc-tools.readthedocs.io/en/stable/)
14
17
 
15
18
  > **NOTE** The RTC-Tools repository has been migrated from GitLab to here;
16
19
  see [Migration from GitLab](#migration-from-gitlab).
@@ -133,3 +136,7 @@ RTC-Tools is part of the LF Energy ecosystem and actively welcomes collaboration
133
136
  ## Acknowledgment
134
137
 
135
138
  If you use RTC-Tools in your work, please acknowledge it in any resulting publications. You can do this by citing the RTC-Tools software and providing a link to our [GitHub repository](https://github.com/rtc-tools/rtc-tools).
139
+
140
+ ## Code of Conduct
141
+
142
+ See [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
@@ -45,6 +45,41 @@ programming solves more than one priority, each priority gets its own file with
45
45
  constant terms an LP file can hold (no NaN, no lower bound of +inf, no upper bound of -inf, no
46
46
  infinite constant). It raises a :exc:`ValueError` otherwise.
47
47
 
48
+ By default the constraint rows are unnamed. Set the class attribute
49
+ ``label_all_constraint_rows = True`` to label each row by its origin:
50
+
51
+ * ``initial_residual_{i}`` and ``initial_derivative_{i}``: model equations at the initial time
52
+ * ``collocation_eq{i}__t{t}``: model equation ``i`` at time index ``t``
53
+ * ``delay_{variable}__t{t}``: delayed feedback
54
+ * ``constraint_{i}`` and ``path_constraint_{i}__t{t}``: entries of
55
+ :meth:`~rtctools.optimization.optimization_problem.OptimizationProblem.constraints` and
56
+ :meth:`~rtctools.optimization.optimization_problem.OptimizationProblem.path_constraints`
57
+ * ``objective_priority_{p}``: objective of an earlier priority, added by
58
+ :class:`~rtctools.optimization.single_pass_goal_programming_mixin.SinglePassGoalProgrammingMixin`
59
+
60
+ Elements of a vector constraint get ``__{k}``, and ensemble members ``__m{i}``. A row with a
61
+ finite lower and upper bound becomes two lines, labelled ``__lb`` and ``__ub``. Characters
62
+ that LP readers reject become ``_``, and repeated labels get ``__d{n}``. The labels are also
63
+ available without exporting, in ``transcribed_problem["g_names"]`` after :meth:`optimize`.
64
+
65
+ To name a constraint yourself, set ``named_constraints = True`` and add the name as 4th
66
+ element of the tuple. With this flag on, constraint lists may mix 3- and 4-tuples, so code
67
+ that reads them, like a mixin calling ``super().constraints()``, must accept both::
68
+
69
+ named_constraints = True
70
+
71
+ def path_constraints(self, ensemble_member):
72
+ return [(self.state("Q_release"), 0.0, 10.0, "release_capacity")]
73
+
74
+ This yields rows labelled ``release_capacity__t0__lb``, ``release_capacity__t0__ub``, and so on.
75
+ The other rows stay unnamed, unless ``label_all_constraint_rows`` is set as well.
76
+
77
+ Goal programming can name the constraints it adds: with ``named_constraints = True``, set the
78
+ goal programming option ``constraint_names`` to label them ``{GoalClass}_p{priority}``,
79
+ ``{GoalClass}_p{priority}_abs_pos`` / ``_abs_neg`` for a
80
+ :class:`~rtctools.optimization.min_abs_goal_programming_mixin.MinAbsGoal`, and
81
+ ``pareto_p{priority}`` for the objective constraint kept with ``keep_soft_constraints``.
82
+
48
83
  Rows with two infinite bounds are left out of the file. A row that reduces to a constant
49
84
  outside its bounds (by more than 1e-9, or with a lower bound above its upper bound) is kept,
50
85
  written against a variable ``__zero`` fixed to 0, so that an LP solver also finds the exported
@@ -61,7 +61,7 @@ In addition to elements, the input variables ``Inflow_Q``, ``PumpFlow``, ``Turbi
61
61
  we want to view the power output and costs in the output file, we also define output
62
62
  variables ``PumpPower``, ``TurbinePower``, ``V_LowerBasin``,``V_UpperBasin``, ``ReservoirPower``,
63
63
  ``TotalSystemPower``,``TotalGeneratingPower``, ``SystemGeneratingRevenue``, ``TotalSystemRevenue``,
64
- ``TotalSystemRevenueSum``, ``PumpCost``.
64
+ ``PumpCost``.
65
65
 
66
66
  To maintain represent the behaviour of a reversible PHS pump/turbine unit, we input the Boolean
67
67
  ``Turbine_is_on`` as a way to ensure the PHS unit cannot be pumping and generating at the same time.
@@ -4,7 +4,7 @@ Getting Started
4
4
  Installation
5
5
  ============
6
6
 
7
- Python 3.10 or newer (up to 3.14) is recommended for running RTC-Tools.
7
+ Python 3.11 or newer (up to 3.15) is recommended for running RTC-Tools.
8
8
 
9
9
  For most users, the easiest way to install RTC-Tools using the `pip <https://pip.pypa.io/>`_ package manager.
10
10
 
@@ -4,5 +4,5 @@ Modelica models
4
4
  To learn the basics of modelling with Modelica, please refer to the online book `Modelica by Example <https://mbe.modelica.university/>`_.
5
5
 
6
6
  .. autoclass:: rtctools.optimization.modelica_mixin.ModelicaMixin
7
- :members: compiler_options
7
+ :members: pymoca_model, compiler_options
8
8
  :show-inheritance:
@@ -46,8 +46,8 @@ model Example
46
46
  Deltares.ChannelFlow.Hydraulic.Structures.Pump LowerControlStructure annotation(Placement(visible = true, transformation(origin = {20, 2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
47
47
  Deltares.ChannelFlow.Hydraulic.Structures.Pump UpperControlStructure annotation(Placement(visible = true, transformation(origin = {-32, 26}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
48
48
  // Parameters
49
- parameter Real theta;
50
- parameter Real step_size;
49
+ parameter Real theta(start = 1.0); // Value driven by HomotopyMixin
50
+ parameter Real step_size(start = 0.0); // Value set in parameters()
51
51
  // Inputs
52
52
  input Real Inflow_Q(fixed = true) = Inflow.Q;
53
53
  input Real UpperControlStructure_Q(fixed = false, min = 0., max = 4.) = UpperControlStructure.Q;
@@ -55,9 +55,9 @@ model Example
55
55
  input Real DrinkingWaterExtractionPump_Q(fixed = false, min = 0., max = 2.) = DrinkingWaterExtractionPump.Q;
56
56
  initial equation
57
57
  // Steady state initialization
58
- der(LowerChannel.Q) = 0;
59
- der(MiddleChannel.Q) = 0;
60
- der(UpperChannel.Q) = 0;
58
+ der(LowerChannel.Q) = fill(0.0, LowerChannel.n_level_nodes + 1);
59
+ der(MiddleChannel.Q) = fill(0.0, MiddleChannel.n_level_nodes + 1);
60
+ der(UpperChannel.Q) = fill(0.0, UpperChannel.n_level_nodes + 1);
61
61
  equation
62
62
  connect(DrinkingWaterExtractionPump.HQDown, DrinkingWaterPlant.HQ) annotation(Line(points = {{20, 26}, {38, 26}, {38, 36}, {38, 36}}, color = {0, 0, 255}));
63
63
  connect(Inflow.HQ, UpperChannel.HQUp) annotation(Line(points = {{-88, 26}, {-70, 26}, {-70, 26}, {-70, 26}}, color = {0, 0, 255}));
@@ -26,8 +26,8 @@ model Example
26
26
  // Inputs
27
27
  input Real Inflow_Q(fixed=true) = Discharge.Q;
28
28
  input Real Level_H(fixed=true) = Level.H;
29
- parameter Real theta;
30
- parameter Real step_size;
29
+ parameter Real theta(start = 1.0); // Value driven by HomotopyMixin
30
+ parameter Real step_size(start = 0.0); // Value set in parameters()
31
31
  // Output Channel states
32
32
  output Real Channel_Q_up = Discharge.Q;
33
33
  output Real Channel_Q_dn = Level.HQ.Q;
@@ -54,8 +54,8 @@ model Example
54
54
  output Modelica.Units.SI.VolumeFlowRate Q_in = Inflow_Q;
55
55
 
56
56
  // Parameters
57
- parameter Modelica.Units.SI.Duration step_size;
58
- parameter Real theta;
57
+ parameter Modelica.Units.SI.Duration step_size(start = 0.0); // Value set in parameters()
58
+ parameter Real theta(start = 1.0); // Value driven by HomotopyMixin
59
59
  equation
60
60
  connect(dam_middle.HQDown, downstream.HQUp) annotation(Line(points = {{38, 0}, {50, 0}}, color = {0, 0, 255}));
61
61
  connect(dam_middle.HQUp, middle.HQDown) annotation(Line(points = {{8, 0}, {22, 0}, {22, 0}, {22, 0}}, color = {0, 0, 255}));
@@ -64,7 +64,7 @@ equation
64
64
  connect(Discharge.HQ, upstream.HQUp) annotation(Line(points = {{-82, 0}, {-68, 0}}, color = {0, 0, 255}));
65
65
  connect(Level.HQ, downstream.HQDown) annotation(Line(points = {{66, 0}, {82, 0}, {82, 0}, {82, 0}}, color = {0, 0, 255}));
66
66
  initial equation
67
- downstream.Q[2:downstream.n_level_nodes + 1] = Inflow_Q;
68
- middle.Q[2:middle.n_level_nodes + 1] = Inflow_Q;
69
- upstream.Q[2:upstream.n_level_nodes + 1] = Inflow_Q;
67
+ downstream.Q[2:downstream.n_level_nodes + 1] = fill(Inflow_Q, downstream.n_level_nodes);
68
+ middle.Q[2:middle.n_level_nodes + 1] = fill(Inflow_Q, middle.n_level_nodes);
69
+ upstream.Q[2:upstream.n_level_nodes + 1] = fill(Inflow_Q, upstream.n_level_nodes);
70
70
  end Example;
@@ -2,4 +2,4 @@ model ExampleOptimization
2
2
  extends Example;
3
3
  input Modelica.Units.SI.VolumeFlowRate Q_dam_middle(fixed = false, min = 0.0, max = 1000.0, nominal = 100.0) = dam_middle.Q;
4
4
  input Modelica.Units.SI.VolumeFlowRate Q_dam_upstream(fixed = false, min = 0.0, max = 1000.0, nominal = 100.0) = dam_upstream.Q;
5
- end Example;
5
+ end ExampleOptimization;
@@ -1,5 +1,5 @@
1
1
  model Example
2
- parameter Integer delay_hours = 24.0;
2
+ parameter Integer delay_hours = 24;
3
3
  Deltares.ChannelFlow.SimpleRouting.BoundaryConditions.Inflow control_inflow annotation(
4
4
  Placement(visible = true, transformation(origin = {-80, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
5
5
  Deltares.ChannelFlow.SimpleRouting.BoundaryConditions.Inflow external_inflow annotation(
@@ -30,7 +30,6 @@ model PumpedStoragePlant
30
30
  output Real TotalGeneratingPower(min = 0.0);
31
31
  output Real SystemGeneratingRevenue;
32
32
  output Real TotalSystemRevenue;
33
- output Real TotalSystemRevenueSum;
34
33
  output Real PumpCost;
35
34
 
36
35
  // Define Boolean to ensure pumped storage turbine and pump cannot be used simultaneously
@@ -62,7 +61,6 @@ equation
62
61
  PumpCost = PumpPower * cost_perP;
63
62
  SystemGeneratingRevenue = TotalGeneratingPower*cost_perP;
64
63
  TotalSystemRevenue = SystemGeneratingRevenue-PumpCost;
65
- TotalSystemRevenueSum = transpose(sum(TotalSystemRevenue));
66
64
 
67
65
  // Connect elements
68
66
  connect(Turbine.QOut, LowerBasin.QLateral[2]) annotation(
@@ -1,22 +1,22 @@
1
- time,PumpCost,PumpFlow,PumpPower,ReservoirPower,ReservoirSpillFlow,ReservoirTurbineFlow,SystemGeneratingRevenue,TotalGeneratingPower,TotalSystemPower,TotalSystemRevenue,TotalSystemRevenueSum,TurbineFlow,TurbinePower,V_LowerBasin,V_UpperBasin
2
- 2013-05-19 22:00:00,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,400000.000000,0.000000
3
- 2013-05-19 23:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,19000.000000,1000000.000000,1000000.000000,19000.000000,19000.000000,0.000000,0.000000,593194.328607,0.000000
4
- 2013-05-20 00:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,19000.000000,1000000.000000,1000000.000000,19000.000000,19000.000000,0.000000,0.000000,786388.657214,0.000000
5
- 2013-05-20 01:00:00,8927.100000,10.000000,686700.000000,1686700.000000,0.000000,78.153091,21927.100000,1686700.000000,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,901037.531276,36000.000000
6
- 2013-05-20 02:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,1094231.859883,36000.000000
7
- 2013-05-20 03:00:00,8352.788889,9.356666,642522.222222,1642522.222222,0.000000,76.106117,21352.788889,1642522.222222,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,1213933.833750,69683.995923
8
- 2013-05-20 04:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,1227870.632935,55747.196738
9
- 2013-05-20 05:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,1241807.432119,41810.397554
10
- 2013-05-20 06:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,1255744.231304,27873.598369
11
- 2013-05-20 07:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,1269681.030488,13936.799185
12
- 2013-05-20 08:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,1283617.829673,0.000000
13
- 2013-05-20 09:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,1476812.158280,0.000000
14
- 2013-05-20 10:00:00,8927.100000,10.000000,686700.000000,1686700.000000,0.000000,78.153091,21927.100000,1686700.000000,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,1591461.032342,36000.000000
15
- 2013-05-20 11:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,1784655.360949,36000.000000
16
- 2013-05-20 12:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,1977849.689556,36000.000000
17
- 2013-05-20 13:00:00,8352.788889,9.356666,642522.222222,1642522.222222,0.000000,76.106117,21352.788889,1642522.222222,1000000.000000,13000.000000,13000.000000,0.000000,0.000000,2097551.663423,69683.995923
18
- 2013-05-20 14:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,2111488.462608,55747.196738
19
- 2013-05-20 15:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,2125425.261792,41810.397554
20
- 2013-05-20 16:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,2139362.060977,27873.598369
21
- 2013-05-20 17:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,2153298.860161,13936.799185
22
- 2013-05-20 18:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,47500.000000,3.871333,341800.000000,2167235.659346,0.000000
1
+ time,PumpCost,PumpFlow,PumpPower,ReservoirPower,ReservoirSpillFlow,ReservoirTurbineFlow,SystemGeneratingRevenue,TotalGeneratingPower,TotalSystemPower,TotalSystemRevenue,TurbineFlow,TurbinePower,V_LowerBasin,V_UpperBasin
2
+ 2013-05-19 22:00:00,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,400000.000000,0.000000
3
+ 2013-05-19 23:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,19000.000000,1000000.000000,1000000.000000,19000.000000,0.000000,0.000000,593194.328607,0.000000
4
+ 2013-05-20 00:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,19000.000000,1000000.000000,1000000.000000,19000.000000,0.000000,0.000000,786388.657214,0.000000
5
+ 2013-05-20 01:00:00,8927.100000,10.000000,686700.000000,1686700.000000,0.000000,78.153091,21927.100000,1686700.000000,1000000.000000,13000.000000,0.000000,0.000000,901037.531276,36000.000000
6
+ 2013-05-20 02:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,0.000000,0.000000,1094231.859883,36000.000000
7
+ 2013-05-20 03:00:00,8352.788889,9.356666,642522.222222,1642522.222222,0.000000,76.106117,21352.788889,1642522.222222,1000000.000000,13000.000000,0.000000,0.000000,1213933.833750,69683.995923
8
+ 2013-05-20 04:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,1227870.632935,55747.196738
9
+ 2013-05-20 05:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,1241807.432119,41810.397554
10
+ 2013-05-20 06:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,1255744.231304,27873.598369
11
+ 2013-05-20 07:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,1269681.030488,13936.799185
12
+ 2013-05-20 08:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,1283617.829673,0.000000
13
+ 2013-05-20 09:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,0.000000,0.000000,1476812.158280,0.000000
14
+ 2013-05-20 10:00:00,8927.100000,10.000000,686700.000000,1686700.000000,0.000000,78.153091,21927.100000,1686700.000000,1000000.000000,13000.000000,0.000000,0.000000,1591461.032342,36000.000000
15
+ 2013-05-20 11:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,0.000000,0.000000,1784655.360949,36000.000000
16
+ 2013-05-20 12:00:00,0.000000,0.000000,0.000000,1000000.000000,0.000000,46.334909,13000.000000,1000000.000000,1000000.000000,13000.000000,0.000000,0.000000,1977849.689556,36000.000000
17
+ 2013-05-20 13:00:00,8352.788889,9.356666,642522.222222,1642522.222222,0.000000,76.106117,21352.788889,1642522.222222,1000000.000000,13000.000000,0.000000,0.000000,2097551.663423,69683.995923
18
+ 2013-05-20 14:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,2111488.462608,55747.196738
19
+ 2013-05-20 15:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,2125425.261792,41810.397554
20
+ 2013-05-20 16:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,2139362.060977,27873.598369
21
+ 2013-05-20 17:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,2153298.860161,13936.799185
22
+ 2013-05-20 18:00:00,0.000000,0.000000,0.000000,2158200.000000,0.000000,100.000000,47500.000000,2500000.000000,2500000.000000,47500.000000,3.871333,341800.000000,2167235.659346,0.000000
@@ -146,8 +146,7 @@ class PumpStorage(
146
146
  def post(self):
147
147
  super().post()
148
148
  results = self.extract_results()
149
- results["TotalSystemRevenueSum"] = np.sum(results["TotalSystemRevenue"])
150
- print("Total Revenue is " + str(results["TotalSystemRevenueSum"]))
149
+ print("Total Revenue is " + str(np.sum(results["TotalSystemRevenue"])))
151
150
 
152
151
 
153
152
  # Run
@@ -4,7 +4,7 @@ model Example
4
4
  Deltares.ChannelFlow.SimpleRouting.Storage.Storage storage(Q_release = P_control, V(start=storage_V_init, fixed=true, nominal=4e5)) annotation(Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
5
5
  Deltares.ChannelFlow.SimpleRouting.BoundaryConditions.Terminal outfall annotation(Placement(visible = true, transformation(origin = {55, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
6
6
  // Initial States
7
- parameter Modelica.Units.SI.Volume storage_V_init;
7
+ parameter Modelica.Units.SI.Volume storage_V_init(start = 0.0); // Value set in parameters.csv
8
8
  // Inputs
9
9
  input Modelica.Units.SI.VolumeFlowRate P_control(fixed = true);
10
10
  input Modelica.Units.SI.VolumeFlowRate Q_in(fixed = true);
@@ -7,10 +7,10 @@ model Example
7
7
  // Inputs
8
8
  input Real Inflow_Q(fixed = true) = Inflow.Q;
9
9
  input Real Outflow_Q(fixed = true) = Outflow.Q;
10
- input SI.Stress reach_1_stress_u(fixed = true);
11
- input SI.Stress reach_1_stress_v(fixed = true);
12
- parameter Real theta;
13
- parameter Real step_size;
10
+ input Modelica.Units.SI.Stress reach_1_stress_u(fixed = true);
11
+ input Modelica.Units.SI.Stress reach_1_stress_v(fixed = true);
12
+ parameter Real theta(start = 1.0); // Value driven by HomotopyMixin
13
+ parameter Real step_size(start = 0.0); // Value set in parameters()
14
14
  // Output Channel states
15
15
  output Real QChannel_Q_up = Inflow.Q;
16
16
  output Real QChannel_Q_dn = Outflow.Q;
@@ -14,7 +14,7 @@ authors = [
14
14
  maintainers = [
15
15
  {name = "Deltares"}
16
16
  ]
17
- requires-python = ">=3.10"
17
+ requires-python = ">=3.11"
18
18
  classifiers = [
19
19
  "Development Status :: 4 - Beta",
20
20
  "Intended Audience :: Science/Research",
@@ -22,6 +22,11 @@ classifiers = [
22
22
  "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
23
23
  "Programming Language :: Python",
24
24
  "Programming Language :: Python :: 3",
25
+ "Programming Language :: Python :: 3.11",
26
+ "Programming Language :: Python :: 3.12",
27
+ "Programming Language :: Python :: 3.13",
28
+ "Programming Language :: Python :: 3.14",
29
+ "Programming Language :: Python :: 3.15",
25
30
  "Topic :: Scientific/Engineering :: GIS",
26
31
  "Topic :: Scientific/Engineering :: Mathematics",
27
32
  "Topic :: Scientific/Engineering :: Physics",
@@ -32,17 +37,17 @@ classifiers = [
32
37
  ]
33
38
  dependencies = [
34
39
  "casadi >= 3.6.3, < 3.9, !=3.6.6",
35
- "numpy >= 1.21.2",
36
- "scipy >= 1.7.2",
40
+ "numpy >= 1.23.2",
41
+ "scipy >= 1.9.2",
37
42
  "pymoca >= 0.9.3, == 0.9.*",
38
- "rtc-tools-channel-flow >= 1.2.0",
43
+ "rtc-tools-channel-flow >= 1.4.0",
39
44
  "rtc-tools-standard-library >= 0.1.2",
40
45
  "defusedxml >= 0.7.0",
41
46
  ]
42
47
 
43
48
  [project.optional-dependencies]
44
- netcdf = ["netCDF4"]
45
- all = ["netCDF4"]
49
+ netcdf = ["netCDF4 >= 1.6.1"]
50
+ all = ["netCDF4 >= 1.6.1"]
46
51
 
47
52
  [dependency-groups]
48
53
  build = [
@@ -50,7 +55,7 @@ build = [
50
55
  "hatch-vcs >= 0.4.0",
51
56
  ]
52
57
  dev = [
53
- "netCDF4 >= 1.6.0",
58
+ "netCDF4 >= 1.6.1",
54
59
  {include-group = "build"},
55
60
  {include-group = "docs"},
56
61
  {include-group = "style"},