Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit ffcf1b1

Browse files
Niklas WorschechOpenModelica-Hudson
authored andcommitted
fixed errors in commits cca3ace and 6e5cf6b
1 parent e19e1ee commit ffcf1b1

File tree

2 files changed

+3
-2
lines changed
  • SimulationRuntime/cpp

2 files changed

+3
-2
lines changed

SimulationRuntime/cpp/Include/Solver/Nox/Nox.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class Nox : public IAlgLoopSolver
3939
void printLogger();
4040
void divisionbyzerohandling(double const * const y0);
4141
bool CheckWhetherSolutionIsNearby(double const * const y);
42+
void CheckWhetherSolutionIsNearbyWrapper();
4243
bool isdivisionbyzeroerror(const std::exception &ex);
4344
void modifySolverParameters(const Teuchos::RCP<Teuchos::ParameterList> solverParametersPtr,const int iter);
4445
Teuchos::RCP<Teuchos::ParameterList> setLocaParams();

SimulationRuntime/cpp/Solver/Nox/Nox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ void Nox::initialize()
102102

103103

104104
// Set up the status tests
105-
_statusTestNormF = Teuchos::rcp(new NOX::StatusTest::NormF(_noxsettings->getRtol()));
106-
_statusTestMaxIters = Teuchos::rcp(new NOX::StatusTest::MaxIters(_noxsettings->getNewtMax()));
105+
_statusTestNormF = Teuchos::rcp(new NOX::StatusTest::NormF(_noxSettings->getRtol()));
106+
_statusTestMaxIters = Teuchos::rcp(new NOX::StatusTest::MaxIters(_noxSettings->getNewtMax()));
107107
_statusTestStagnation = Teuchos::rcp(new NOX::StatusTest::Stagnation(15,0.99));
108108
_statusTestDivergence = Teuchos::rcp(new NOX::StatusTest::Divergence(1.0e13));
109109
//_statusTestSgnChange = Teuchos::rcp(new NOX::StatusTest::SgnChange(5.0e-7));

0 commit comments

Comments
 (0)