set algloop to 1e12 instead of 1e6 when evaluating the right hand sid…

…e fails
OpenModelica · Jul 18, 2017 · 7187f70 · 7187f70
1 parent 5914059
commit 7187f70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/SimulationRuntime/cpp/Solver/Nox/NOX_StatusTest_SgnChange.C b/SimulationRuntime/cpp/Solver/Nox/NOX_StatusTest_SgnChange.C
@@ -33,7 +33,7 @@ NOX::StatusTest::StatusType NOX::StatusTest::SgnChange::checkStatus(const NOX::S
 {
   if(_firstCall) initialize(problem);
   std::vector<bool> fSignChange(_dimSys, false);
-  Teuchos::RCP<NOX::LAPACK::Group> grp=Teuchos::rcp(new NOX::LAPACK::Group(dynamic_cast<const NOX::LAPACK::Group&>(problem.getSolutionGroup())));//(problem.getSolutionGroup());//solutiongroup is constant, thus we need to assign it to be able to modify it.
+  Teuchos::RCP<NOX::LAPACK::Group> grp=Teuchos::rcp(new NOX::LAPACK::Group(dynamic_cast<const NOX::LAPACK::Group&>(problem.getSolutionGroup())));//(problem.getSolutionGroup());//solutiongroup is constant, thus we need to assign it to be able to modify it.//throws an error if used in conjunction with lapack
   *_x1=*_x0=grp->getX();
   grp->computeF();
   *_f0=grp->getF();

diff --git a/SimulationRuntime/cpp/Solver/Nox/NoxLapackInterface.cpp b/SimulationRuntime/cpp/Solver/Nox/NoxLapackInterface.cpp
@@ -167,7 +167,7 @@ bool NoxLapackInterface::computeActualF(NOX::LAPACK::Vector& f, const NOX::LAPAC
 
 		//new, experimental version. Delete comments, when this is tested.
 		for(int i=0;i<_dimSys;i++){
-			_rhs[i]= ((_rhs[i]<0.0) ? -1.0e6 : 1.0e6);
+			_rhs[i]= ((_rhs[i]<0.0) ? -1.0e12 : 1.0e12);
 		}
 		//Maybe this should have conical form, ie. in case of high values, use 1.0e6*x+1.0e6 instead.