From 262ca974cd3549cabdc25bcfbb47c195b3310404 Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Fri, 8 Mar 2019 12:04:24 +0100 Subject: [PATCH 1/2] adjusted control files for power plant --- tests/powerplant/testcase.powerplant_ctrl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/powerplant/testcase.powerplant_ctrl.json b/tests/powerplant/testcase.powerplant_ctrl.json index 352e626..535da02 100644 --- a/tests/powerplant/testcase.powerplant_ctrl.json +++ b/tests/powerplant/testcase.powerplant_ctrl.json @@ -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, From 8e0e2603b71472d58e1c7f26a2a45afb9af956e5 Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Fri, 8 Mar 2019 12:05:35 +0100 Subject: [PATCH 2/2] adjusted powerplant control file in testdata files --- testdata/powerplant/testcase.powerplant_ctrl.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testdata/powerplant/testcase.powerplant_ctrl.json b/testdata/powerplant/testcase.powerplant_ctrl.json index 5baba72..535da02 100644 --- a/testdata/powerplant/testcase.powerplant_ctrl.json +++ b/testdata/powerplant/testcase.powerplant_ctrl.json @@ -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, @@ -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" }