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

Commit 34f3bd7

Browse files
qichenghuaOpenModelica-Hudson
authored andcommitted
Softened tolerance for homotopy solver
1 parent 46e1cff commit 34f3bd7

File tree

1 file changed

+11
-1
lines changed
  • SimulationRuntime/cpp/Solver/Nox

1 file changed

+11
-1
lines changed

SimulationRuntime/cpp/Solver/Nox/Nox.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,18 @@ void Nox::LocaHomotopySolve(const int numberofhomotopytries)
557557
Teuchos::RCP<LOCA::MultiContinuation::AbstractGroup> grp = Teuchos::rcp(new LOCA::LAPACK::Group(globalData, *LocaLapackInterface));
558558
grp->setParams(p);
559559

560+
// Set up the status tests
561+
Teuchos::RCP<NOX::StatusTest::NormF> statusTestNormF = Teuchos::rcp(new NOX::StatusTest::NormF(1.0e-7));
562+
Teuchos::RCP<NOX::StatusTest::MaxIters> statusTestMaxIters = Teuchos::rcp(new NOX::StatusTest::MaxIters(100));
563+
Teuchos::RCP<NOX::StatusTest::Stagnation> statusTestStagnation = Teuchos::rcp(new NOX::StatusTest::Stagnation(15,0.99));
564+
Teuchos::RCP<NOX::StatusTest::Divergence> statusTestDivergence = Teuchos::rcp(new NOX::StatusTest::Divergence(1.0e13));
565+
//statusTestSgnChange = Teuchos::rcp(new NOX::StatusTest::SgnChange(5.0e-7));
566+
Teuchos::RCP<NOX::StatusTest::Combo> statusTestsCombo = Teuchos::rcp(new NOX::StatusTest::Combo(NOX::StatusTest::Combo::OR, statusTestNormF, statusTestMaxIters));
567+
statusTestsCombo->addStatusTest(statusTestStagnation);
568+
statusTestsCombo->addStatusTest(statusTestDivergence);
569+
560570
// Create the stepper
561-
LOCA::Stepper stepper(globalData, grp, _statusTestsCombo, paramList);
571+
LOCA::Stepper stepper(globalData, grp, statusTestsCombo, paramList);
562572

563573
try{
564574
// Perform continuation run

0 commit comments

Comments
 (0)