- fixed command line parameter evaluation

InteractiveComputerGraphics · Dec 16, 2021 · 299beaa · 299beaa
1 parent a85d4f4
commit 299beaa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,4 +1,8 @@
+2.11.2
+	- fixed command line parameter evaluation
 	- updated documentation
+
+2.11.1
 	- implemented a non-avx version of the elasticity solver by Kugelstadt et al. "Fast Corotated Elastic SPH Solids with Implicit Zero-Energy Mode Control", 2021
 	- Linux fixes
 

diff --git a/Simulator/SimulatorBase.cpp b/Simulator/SimulatorBase.cpp
@@ -273,9 +273,11 @@ void SimulatorBase::init(int argc, char **argv, const std::string &windowName)
 			setUseGUI(false);
 		}
 
+		m_cmdLineStopAt = false;
 		if (result.count("stopAt"))
 		{
 			m_stopAt = result["stopAt"].as<Real>();
+			m_cmdLineStopAt = true;
 		}
 
 		if (result.count("param"))
@@ -330,9 +332,11 @@ void SimulatorBase::init(int argc, char **argv, const std::string &windowName)
 			m_outputPath = result["output-dir"].as<std::string>();
 		}
 
+		m_cmdLineNoInitialPause = false;
 		if (result.count("no-initial-pause"))
 		{
 			m_doPause = false;
+			m_cmdLineNoInitialPause = true;
 		}
 
 		setStateFile("");
@@ -543,7 +547,15 @@ void SimulatorBase::runSimulation()
 	deferredInit();
 
 	if (getStateFile() != "")
+	{
+		// avoid that command line parameter is overwritten
+		const Real temp = m_stopAt;
 		loadState(getStateFile());
+		if (m_cmdLineStopAt)
+			m_stopAt = temp;
+		if (m_cmdLineNoInitialPause)
+			m_doPause = false;
+	}
 	setCommandLineParameter();
 
 	if (!m_useGUI)

diff --git a/Simulator/SimulatorBase.h b/Simulator/SimulatorBase.h
@@ -50,6 +50,8 @@ namespace SPH
 		bool m_doPause;
 		Real m_pauseAt;
 		Real m_stopAt;
+		bool m_cmdLineStopAt;
+		bool m_cmdLineNoInitialPause;
 		bool m_enableRigidBodyVTKExport;
 		bool m_enableRigidBodyExport;
 		bool m_enableStateExport;

diff --git a/version b/version
@@ -1 +1 @@
-2.11.1
+2.11.2