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

Commit

Permalink
muted output and disabled tolerance alleviation in nonlinear solver n…
Browse files Browse the repository at this point in the history
…ox completely.
  • Loading branch information
qichenghua authored and OpenModelica-Hudson committed Jul 18, 2017
1 parent 6beb4f4 commit 9a13343
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions SimulationRuntime/cpp/Solver/Nox/Nox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ void Nox::solve()
delete [] rhs2;

if(_statusTestNormF->getNormF()<2*threshold){
std::cout << "threshold (this should typically be a very small value (we vary the real value by ). In case of occurence of rounding errors, the threshold should be big though.) = " << threshold << ", simtime = " << _algLoop->getSimTime() << ", algloop " << _algLoop->getEquationIndex() << std::endl;
//std::cout << "threshold (this should typically be a very small value (we vary the real value by ). In case of occurence of rounding errors, the threshold should be big though.) = " << threshold << ", simtime = " << _algLoop->getSimTime() << ", algloop " << _algLoop->getEquationIndex() << std::endl;
_algLoop->setReal(_y);
_algLoop->evaluate();
_algLoop->getRHS(rhs);
Expand Down Expand Up @@ -422,14 +422,14 @@ void Nox::solve()

//Tensor failed or other failure
default:
if(_currentIterateNorm<_locTol){
memcpy(_y,_currentIterate,_dimSys*sizeof(double));
_iterationStatus=DONE;
break;
}
if(_currentIterateNorm<_locTol){
std::cout << "you should not see this." << std::endl;
}
// if(_currentIterateNorm<_locTol){
// memcpy(_y,_currentIterate,_dimSys*sizeof(double));
// _iterationStatus=DONE;
// break;
// }
// if(_currentIterateNorm<_locTol){
// std::cout << "you should not see this." << std::endl;
// }
int numberofhomotopytries = 0;
while((_iterationStatus!=DONE)){
//todo: This is implemented in the worst way possible. Please fix this.
Expand Down

0 comments on commit 9a13343

Please sign in to comment.