From d8f2796dff94308ba5c5637f07c6c90a14b70db0 Mon Sep 17 00:00:00 2001 From: Bernard Knueven Date: Fri, 18 Nov 2022 18:46:14 +0000 Subject: [PATCH] testing main for coverage --- watertap/examples/flowsheets/oaro/oaro.py | 8 +++++++- watertap/examples/flowsheets/oaro/tests/test_oaro.py | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/watertap/examples/flowsheets/oaro/oaro.py b/watertap/examples/flowsheets/oaro/oaro.py index d730de50ee..c261a63e68 100644 --- a/watertap/examples/flowsheets/oaro/oaro.py +++ b/watertap/examples/flowsheets/oaro/oaro.py @@ -67,7 +67,7 @@ def erd_type_not_found(erd_type): ) -def main(erd_type=ERDtype.pump_as_turbine): +def main(erd_type=ERDtype.pump_as_turbine, raise_on_failure=False): # set up solver solver = get_solver() @@ -77,6 +77,12 @@ def main(erd_type=ERDtype.pump_as_turbine): initialize_system(m, solver=solver) results = solve(m, solver=solver) + if not check_optimal_termination(results): + msg = "Simulation did not converge" + if raise_on_failure: + raise RuntimeError(msg) + else: + print(f"WARNING: {msg}") print("\n***---Simulation results---***") display_system(m) diff --git a/watertap/examples/flowsheets/oaro/tests/test_oaro.py b/watertap/examples/flowsheets/oaro/tests/test_oaro.py index 73e721e4ec..76115eb5c7 100644 --- a/watertap/examples/flowsheets/oaro/tests/test_oaro.py +++ b/watertap/examples/flowsheets/oaro/tests/test_oaro.py @@ -29,6 +29,7 @@ from watertap.unit_models.pressure_changer import Pump, EnergyRecoveryDevice from watertap.examples.flowsheets.oaro.oaro import ( + main, build, set_operating_conditions, initialize_system, @@ -118,3 +119,7 @@ def test_solution(self, system_frame): def test_config_error(self, system_frame): with pytest.raises(Exception): build(erd_type="not_a_configuration") + + @pytest.mark.component + def test_main(self): + main(raise_on_failure=True)