Skip to content

Commit

Permalink
Fix st tes input parameter in sub network.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfreissmann
jfreissmann committed Mar 25, 2024
1 parent 4db24af commit 2736378
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 110 deletions.
4 changes: 2 additions & 2 deletions optimization/energy_system.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,15 @@ def primary_network(data, param, use_hp=True, return_unsolved=False):
nominal_storage_capacity=param['st-tes']['Q'],
inputs={
hnw: solph.Flow(
nominal_value=param['st-tes']['Q_N_in'],
nominal_value=param['st-tes']['Q_in'],
max=param['st-tes']['Q_rel_in_max'],
min=param['st-tes']['Q_rel_in_min'],
variable_costs=param['st-tes']['op_cost_var'],
nonconvex=solph.NonConvex()
)},
outputs={
hnw: solph.Flow(
nominal_value=param['st-tes']['Q_N_out'],
nominal_value=param['st-tes']['Q_out'],
max=param['st-tes']['Q_rel_out_max'],
min=param['st-tes']['Q_rel_out_min'],
nonconvex=solph.NonConvex())},
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn19_invest_param_HeatPumpPCEconOpen_R1234ZE(Z).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn19_invest_param_HeatPumpPCEconOpen_R717.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn19_invest_param_HeatPumpSimple_R717.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn40DG_invest_param_HeatPumpPCEconOpen_R1234ZE(Z).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn40DG_invest_param_HeatPumpPCEconOpen_R717.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn40DG_invest_param_HeatPumpSimple_R717.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,9 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
"balanced": true,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn40GCA_invest_param_HeatPumpPCEconOpen_R1234ZE(Z).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn40GCA_invest_param_HeatPumpPCEconOpen_R717.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down
16 changes: 4 additions & 12 deletions optimization/sub_network/input/sn40GCA_invest_param_HeatPumpSimple_R717.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@
"inv_spez_m": 236.49,
"inv_spez_b": 207314.97,
"Q": 8472,
"Q_N_in": 353,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_N_out": 353,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 382.8,
"Q_out": 382.8,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand All @@ -57,12 +53,8 @@
"inv_spez_b": 207314.97,
"cap_max": 846.792,
"cap_min": 8,
"Q_in_to_cap": 0.041666667,
"Q_rel_in_max": 1.0,
"Q_rel_in_min": 0.02,
"Q_out_to_cap": 0.041666667,
"Q_rel_out_max": 1.0,
"Q_rel_out_min": 0.02,
"Q_in": 38.3,
"Q_out": 38.3,
"Q_rel_loss": 5e-05,
"op_cost_var": 0.01,
"op_cost_fix": 3.0,
Expand Down

0 comments on commit 2736378

Please sign in to comment.