Merge pull request #6 from project-angus/master

update master
project-angus · Mar 8, 2019 · 76b4497 · 76b4497
2 parents 944a624 + 9581b01
commit 76b4497
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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"
 }
diff --git 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,