fixed errors in commits cca3ace0a656a71348290808b13138057a06c732 and …

…6e5cf6bf01ad7cde7a8a461969924e361ef4b24d
OpenModelica · Jul 18, 2017 · ffcf1b1 · ffcf1b1
1 parent e19e1ee
commit ffcf1b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/SimulationRuntime/cpp/Include/Solver/Nox/Nox.h b/SimulationRuntime/cpp/Include/Solver/Nox/Nox.h
@@ -39,6 +39,7 @@ class Nox : public IAlgLoopSolver
   void printLogger();
   void divisionbyzerohandling(double const * const y0);
   bool CheckWhetherSolutionIsNearby(double const * const y);
+  void CheckWhetherSolutionIsNearbyWrapper();
   bool isdivisionbyzeroerror(const std::exception &ex);
   void modifySolverParameters(const Teuchos::RCP<Teuchos::ParameterList> solverParametersPtr,const int iter);
   Teuchos::RCP<Teuchos::ParameterList> setLocaParams();

diff --git a/SimulationRuntime/cpp/Solver/Nox/Nox.cpp b/SimulationRuntime/cpp/Solver/Nox/Nox.cpp
@@ -102,8 +102,8 @@ void Nox::initialize()
 
 
 	// Set up the status tests
-  _statusTestNormF = Teuchos::rcp(new NOX::StatusTest::NormF(_noxsettings->getRtol()));
-  _statusTestMaxIters = Teuchos::rcp(new NOX::StatusTest::MaxIters(_noxsettings->getNewtMax()));
+  _statusTestNormF = Teuchos::rcp(new NOX::StatusTest::NormF(_noxSettings->getRtol()));
+  _statusTestMaxIters = Teuchos::rcp(new NOX::StatusTest::MaxIters(_noxSettings->getNewtMax()));
   _statusTestStagnation = Teuchos::rcp(new NOX::StatusTest::Stagnation(15,0.99));
   _statusTestDivergence = Teuchos::rcp(new NOX::StatusTest::Divergence(1.0e13));
   //_statusTestSgnChange = Teuchos::rcp(new NOX::StatusTest::SgnChange(5.0e-7));