Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed Mar 8, 2019
2 parents a0728b3 + 8e0e260 commit 9581b01
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions testdata/powerplant/testcase.powerplant_ctrl.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"method": "tespy",
"tespy_charge_path": "TES_comp",
"tespy_discharge_path": "TES_exp",
"massflow_min_rel": 0.25,
"massflow_max_rel": 1.05,
"massflow_max_rel": 1.00,
"power_nominal_charge": 1e7,
"power_nominal_discharge": -1e7,
"pressure_nominal_charge": 70,
Expand All @@ -13,10 +16,7 @@
"pressure_conn_discharge": "pipe:in1",
"pipe_charge": "pipe",
"pipe_discharge": "pipe",
"method": "tespy",
"tespy_charge_path": "TES_comp",
"tespy_discharge_path": "TES_exp",
"spline_create_lut": "False",
"spline_charge_path": "TES_comp/lut_TES_comp.csv",
"spline_discharge_path": "TES_exp/lut_TES_exp.csv"
"create_lut": "False",
"lut_charge_path": "testcase_lut_charge.csv",
"lut_discharge_path": "testcase_lut_discharge.csv"
}
2 changes: 1 addition & 1 deletion tests/powerplant/testcase.powerplant_ctrl.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"tespy_charge_path": "TES_comp",
"tespy_discharge_path": "TES_exp",
"massflow_min_rel": 0.25,
"massflow_max_rel": 1.05,
"massflow_max_rel": 1.00,
"power_nominal_charge": 1e7,
"power_nominal_discharge": -1e7,
"pressure_nominal_charge": 70,
Expand Down

0 comments on commit 9581b01

Please sign in to comment.