fram-core 0.1.0a1__py3-none-any.whl → 0.1.0a2__py3-none-any.whl

{fram_core-0.1.0a1.dist-info → fram_core-0.1.0a2.dist-info}/METADATA

@@ -1,18 +1,19 @@
 Metadata-Version: 2.4
 Name: fram-core
-Version: 0.1.0a1
+Version: 0.1.0a2
 Summary: 
 License: LICENSE.md
 License-File: LICENSE.md
 Author: The Norwegian Water Resources and Energy Directorate
 Author-email: fram@nve.no
-Requires-Python: >=3.11
+Requires-Python: >=3.11,<4
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: juliacall (>=0.9.28,<0.10.0)
 Requires-Dist: numexpr (>=2.10.2)
 Requires-Dist: numpy (>=2.2.2)
 Requires-Dist: pandas (>=2.2.3)

{fram_core-0.1.0a1.dist-info → fram_core-0.1.0a2.dist-info}/RECORD

@@ -2,7 +2,7 @@ framcore/Base.py,sha256=2MP0T1HAjU3gqkSvdGnbvd3t1JZmdXGCcwueETIhrrs,5326
 framcore/Model.py,sha256=TraN6dRQoJgm4veePEVszpdGAMGiTJA1dKSG4s_DtZg,2580
 framcore/__init__.py,sha256=5Ryn1oUwtxaPX95dfleE5GVYo9_QSBAwMG8UiUNrg74,128
 framcore/aggregators/Aggregator.py,sha256=n9jL4iAGk_N0An80BJNntkYYaXaQzGW1xGD3oFjUYzk,6473
-framcore/aggregators/HydroAggregator.py,sha256=ubV16QcJ63Uh8g_HzSexsHDFdUszODpBiEfaUhWZ8ko,47174
+framcore/aggregators/HydroAggregator.py,sha256=nsSzAqbTTwkifXyMeKXflMWSJWu6eNwICQuZVE20Qp0,47211
 framcore/aggregators/NodeAggregator.py,sha256=Zz4D1H42EmDU0jgYJtAR4C0_eRDN6nacLA3guRt_r2M,20716
 framcore/aggregators/WindSolarAggregator.py,sha256=3cHIxYZixTIH8kmkuR8GL6eROd8oU7z5txRVCMOvOrg,19620
 framcore/aggregators/__init__.py,sha256=ZoBqilfv0XhFkYVROBPQhJHzSY1IcvhJmJ_FOo_Z5Pw,426
@@ -94,7 +94,7 @@ framcore/utils/isolate_subnodes.py,sha256=iRiqgTU_c6W1jLmIBGO7fQoK_abPA3N8beGJbr
 framcore/utils/loaders.py,sha256=8llunmOC6XkbqNXSxL1XVNipGj7OpjIZ-2AyJUj-5v8,3320
 framcore/utils/node_flow_utils.py,sha256=4Z6eB4oUqhOWWeHFNYRZY0c0UQlJ8tM9duYvLzkJQ3k,7800
 framcore/utils/storage_subsystems.py,sha256=PmkV9rhiVUrmPz1zsyKcEwjJzYUkXQUcGM511tttsXc,4158
-fram_core-0.1.0a1.dist-info/METADATA,sha256=3PisZPX4tBGbm57LLFn_qEmV70e9HqsiMwBxO3sms1c,1204
-fram_core-0.1.0a1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fram_core-0.1.0a1.dist-info/licenses/LICENSE.md,sha256=fxh4ZxuR8dM2HDs-pIUitPrJdxQ4fEFh1GvEYZA2m1E,1075
-fram_core-0.1.0a1.dist-info/RECORD,,
+fram_core-0.1.0a2.dist-info/METADATA,sha256=sCfBTgaBnPmQOiyYov3DDdMrC9tfVkpH12uVideaToo,1251
+fram_core-0.1.0a2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fram_core-0.1.0a2.dist-info/licenses/LICENSE.md,sha256=fxh4ZxuR8dM2HDs-pIUitPrJdxQ4fEFh1GvEYZA2m1E,1075
+fram_core-0.1.0a2.dist-info/RECORD,,

framcore/aggregators/HydroAggregator.py

@@ -54,7 +54,7 @@ class HydroAggregator(Aggregator):
     3a. Aggregate results if all modules in group have results.
         - Production is the sum of production levels with weighted profiles
         - Reservoir filling is the sum of energy reservoir filling levels (filling*energy_equivalent_downstream/agg_energy_equivalent) with weighted profiles
-        - TODO: Spill, bypass and pumping results are currently ignored in the aggregation.
+        - TODO: Water values, spill, bypass and pumping results are currently ignored in the aggregation.
         - TODO: Add possibility to skip results aggregation.
     3b. Make new hydro module and delete original modules from model data.
     4. Add mapping from detailed to aggregated modules to self._aggregation_map.
@@ -62,7 +62,7 @@ class HydroAggregator(Aggregator):
     Disaggregation steps (self._disaggregate):
     1. Restore original modules from self._original_data. NB! Changes to aggregated modules are lost except for results (TODO)
     2. Move production and filling results from aggregated modules to detailed modules, weighted based on production capacity and reservoir capacity.
-        - TODO: Spill and bypass results are currently ignored in the disaggregation.
+        - TODO: Water values, spill, bypass and pumping results are currently ignored in the disaggregation.
     3. Delete aggregated modules.
 
     NB! Watershed that crosses power nodes should not be aggregated in two different HydroAggregators as the aggregator will remove all connected modules