Models with stock by Yann-Temudjin · Pull Request #33 · AntaresSimulatorTeam/GemsPy

Yann-Temudjin · 2024-04-26T10:00:42Z

# Conflicts: # tests/unittests/test_quota_co2.py

…puts

…Team/andromede-modeling-prototype into model_test_yaml

# Conflicts: # src/andromede/libs/standard_sc.yml # tests/models/test_electrolyzer_n_inputs.py # tests/models/test_quota_co2.py # tests/unittests/model/test_electrolyzer_n_inputs.py # tests/unittests/model/test_quota_co2.py # tests/unittests/test_electrolyzer_n_inputs.py # tests/unittests/test_quota_co2.py

…tock final model

# Conflicts: # src/andromede/libs/standard_sc.yml

flomnes

Please add a description such as (if my understanding is correct)

A link with storage behaves like a short-term storage that can inject/withdraw to/from 2 areas.

What about N areas ? Is there any technical barrrier ?

flomnes · 2024-05-03T11:34:28Z

src/andromede/libs/standard_sc.py

+        float_parameter("f_from_max", CONSTANT),
+        float_parameter("f_to_max", CONSTANT),


Suggested change

float_parameter("f_from_max", CONSTANT),

float_parameter("f_to_max", CONSTANT),

float_parameter("f_from_min", CONSTANT),

float_parameter("f_to_min", CONSTANT),

float_parameter("f_from_max", CONSTANT),

float_parameter("f_to_max", CONSTANT),

flomnes · 2024-05-03T11:34:55Z

src/andromede/libs/standard_sc.py

+    variables=[
+        float_variable("r", lower_bound=literal(0), upper_bound=param("capacity")),
+        float_variable(
+            "f_from", lower_bound=-param("f_from_max"), upper_bound=param("f_from_max")


Suggested change

"f_from", lower_bound=-param("f_from_max"), upper_bound=param("f_from_max")

"f_from", lower_bound=param("f_from_min"), upper_bound=param("f_from_max")

flomnes · 2024-05-03T11:35:08Z

src/andromede/libs/standard_sc.py

+            "f_from", lower_bound=-param("f_from_max"), upper_bound=param("f_from_max")
+        ),
+        float_variable(
+            "f_to", lower_bound=-param("f_to_max"), upper_bound=param("f_to_max")


Suggested change

"f_to", lower_bound=-param("f_to_max"), upper_bound=param("f_to_max")

"f_to", lower_bound=param("f_to_min"), upper_bound=param("f_to_max")

flomnes · 2024-05-03T11:40:03Z

src/andromede/libs/standard_sc.py

+    constraints=[
+        Constraint(
+            name="Level",
+            expression=var("f_from") == (var("f_from+") - var("f_from-")),
+        ),
+    ],


This model is incomplete (missing shift operators at least). Was it superseded by the yml ? If so, I suggest removing standard_sc.py completely.

Yes it seems to be superseeded by the model in the yml

tbittar · 2024-06-14T12:55:26Z

src/andromede/libs/standard_sc.py

+    constraints=[
+        Constraint(
+            name="Level",
+            expression=var("f_from") == (var("f_from+") - var("f_from-")),
+        ),
+    ],


Yes it seems to be superseeded by the model in the yml

tbittar · 2024-06-14T12:57:49Z

src/andromede/libs/standard_sc.yml

+          field: flow
+          definition: f_to
+      constraints:
+        - name: max0_from


More explicit name : positive_part_flow_from

tbittar · 2024-06-14T12:58:12Z

src/andromede/libs/standard_sc.yml

+      constraints:
+        - name: max0_from
+          expression: f_from = f_from_p - f_from_m
+        - name: max0_to


tbittar · 2024-06-14T12:58:56Z

src/andromede/libs/standard_sc.yml

+          expression: f_from = f_from_p - f_from_m
+        - name: max0_to
+          expression: f_to = f_to_p - f_to_m
+        - name: r_t1


More explicit name : storage_dynamics

tbittar · 2024-06-14T12:59:22Z

src/andromede/libs/standard_sc.yml

+          expression: f_to = f_to_p - f_to_m
+        - name: r_t1
+          expression: r[t+1] = r[t] + f_from - f_to
+        - name: r0


initial_level

tbittar · 2024-06-14T13:24:54Z

tests/models/components_for_test_gas_stock_2_elec_compressor.yml

+        - name: p_max
+          type: constant
+          value: 200
+    - id: GS


Be more explicit in names for faster understanding (gas_storage)

applies for all components and nodes

tbittar · 2024-06-14T13:39:00Z

tests/models/models_for_test_gas_stock_2_elec_compressor.yml

+          type: flow
+      binding-constraints:
+        - name: sum
+          expression: sum_connections(flow_k.flow) = 0


I think the syntax for sum(alpha) is not defined in lower level for now, we need to add parameters in the sum operator

tbittar · 2024-06-14T13:44:23Z

src/andromede/libs/standard_sc.yml

Some models are defined in local libraries for tests, delete the incomplete, unsed ones from here (storage_final_level, storage_final_level_input), maybe others ?

tbittar · 2024-06-14T13:51:10Z

tests/models/models_for_test_stock_hydro_2_input.yml

+          expression: r[t+1] = r[t] - u1[t] - u2[t]
+        - name: r0
+          expression: r[0] = initial_level
+        - name: rt


Final level probably not working for now

tbittar · 2024-06-14T13:56:04Z

tests/models/test_gas_link_elec_compressor.py

+        PortRef(gaz_node_2, "injection_port"), PortRef(gaz_prod, "injection_port")
+    )
+    network.connect(PortRef(gaz_node_2, "injection_port"), PortRef(pipeline, "flow_to"))
+    network.connect(PortRef(gaz_node_2, "injection_port"), PortRef(pipeline, "flow_to"))


Same as previous line....

Yann-Temudjin and others added 30 commits February 26, 2024 10:44

test Quota CO2

5b72beb

reformatage du fichier test_quota_co2

7465997

Ajout de Short term storage complex dans les modeles standard

8b687c6

Merge branch 'main' into modelesSC

966b4de

# Conflicts: # tests/unittests/test_quota_co2.py

Ajout du test electrolyzer n inputs

927cc47

fix taking in account the comments on the pull request

18a4b1f

Ajout du isclose et modification des tests pour les electrolyzer n_in…

d0e8e26

…puts

Fixed test 3 and 4 of the electrolyzer_n_inputs

82efdad

Merge branch 'main' into stock_pipeline

4400c46

test electrolyzer_n_inputs with yaml models

51de9e4

quota C02 test with yaml model

ffcc3de

print to test the path

dc08c71

fixed path for the first n_input_electrolyzer_yaml test

f6218bd

model stock pipeline

25b567f

moved test for models

f5a0eec

added standard_sc.yml

d7ce092

fix of libs path and move of the tests to models

fccf367

factorisation, removal of unused import and move of test files

006131b

reformat test

cddd635

move tests of model to tests/model

25d4b79

Merge branch 'main' into model_test_yaml

7739a77

Fix formatting

ed4f8a0

re-added libs_dir to model/conftest.py

4b949d6

Merge branch 'model_test_yaml' of https://github.com/AntaresSimulator…

f912f0d

…Team/andromede-modeling-prototype into model_test_yaml

added type declaration and removed unused argument

b3ed8e7

changed ports on link with storage model

eb30fbc

test stock pipeline fix and added test gas_link_elec_compressor and s…

564d10f

…tock final model

Merge branch 'main' into stock_pipeline

7b9fb16

# Conflicts: # src/andromede/libs/standard_sc.yml

Merge branch 'main' into stock_pipeline

651ca02

flomnes reviewed May 3, 2024

View reviewed changes

Yann-Temudjin added 5 commits May 17, 2024 16:49

added two test for stock pipeline and test and model for gas stock

14bc1e5

Merge branch 'main' into stock_pipeline

e668672

fix test gas link elec compressor

24d0c06

Added test for gas stock 2 elec compressor with yaml components

6e16230

added stock hydro test

8fba186

tbittar requested changes Jun 14, 2024

View reviewed changes

killian-scalian added 2 commits July 1, 2024 17:22

remove model stock_final_level_input

5bfdfcc

move TODO things from stock_pipeline to scalian-stock-pipeline-dev

3765536

		float_parameter("f_from_max", CONSTANT),
		float_parameter("f_to_max", CONSTANT),

	"f_from", lower_bound=-param("f_from_max"), upper_bound=param("f_from_max")
	"f_from", lower_bound=param("f_from_min"), upper_bound=param("f_from_max")

	"f_to", lower_bound=-param("f_to_max"), upper_bound=param("f_to_max")
	"f_to", lower_bound=param("f_to_min"), upper_bound=param("f_to_max")

Conversation

Yann-Temudjin commented Apr 26, 2024

Uh oh!

flomnes left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants