Check if USER_SOLUTION_TIMES exceed section times

cadet · Mar 26, 2022 · 895538d · 895538d
1 parent 926a763
commit 895538d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/common/Driver.hpp b/include/common/Driver.hpp
@@ -253,25 +253,25 @@ class Driver
 
 		// Configure main solver parameters
 		pp.pushScope("solver");
-		_sim->configure(pp);
-
+
 		// Configure section times
 		std::vector<double> secTimes;
 		std::vector<bool> secCont;
 		extractSectionTimes(pp, secTimes, secCont);
+		_sim->setSectionTimes(secTimes, secCont);
+		_sim->configure(pp);
 
 		pp.popScope(); // solver scope
 
+		// Create and configure model
 		pp.pushScope("model");
 
-		// Create and configure model
 		cadet::IModelSystem* model = _builder->createSystem(pp);
 
 		// Hand model over to simulator
 		_sim->initializeModel(*model);
-		_sim->setSectionTimes(secTimes, secCont);
 
-		// Specify initial values
+	// Specify initial values
 		if (pp.exists("INIT_STATE_Y"))
 		{
 			const std::vector<double> initY = pp.getDoubleArray("INIT_STATE_Y");

diff --git a/src/libcadet/SimulatorImpl.cpp b/src/libcadet/SimulatorImpl.cpp
@@ -1490,6 +1490,11 @@ namespace cadet
 		if (paramProvider.exists("USER_SOLUTION_TIMES"))
 			_solutionTimes = paramProvider.getDoubleArray("USER_SOLUTION_TIMES");
 
+		if (static_cast<double>(_solutionTimes.back()) > static_cast<double>(_sectionTimes.back()))
+		{
+			throw InvalidParameterException("USER_SOLUTION_TIMES exceed section times");
+		}
+
 		if (paramProvider.exists("CONSISTENT_INIT_MODE"))
 			_consistentInitMode = toConsistentInitialization(paramProvider.getInt("CONSISTENT_INIT_MODE"));