refactored nox.solve()

Author: qichenghua

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

@@ -94,5 +94,7 @@ class Nox : public IAlgLoopSolver
   bool _firstCall;
   bool _generateoutput;
   bool _useDomainScaling;
+
+  bool _OutOfProperMethods;
 };
 /** @} */ // end of solverNox

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

@@ -6,7 +6,7 @@ class NoxLapackInterface : public LOCA::LAPACK::Interface {
   public:
 
     //! Constructor
-    NoxLapackInterface(INonLinearAlgLoop *algLoop, int numberofhomotopytries);
+    NoxLapackInterface(INonLinearAlgLoop *algLoop);
 
     //! Destructor
     ~NoxLapackInterface();
@@ -17,6 +17,9 @@ class NoxLapackInterface : public LOCA::LAPACK::Interface {
 
     bool computeJacobian(NOX::LAPACK::Matrix<double>& J, const NOX::LAPACK::Vector & x);
 
+    void setNumberOfHomotopyTries(const int & number);
+    int getMaxNumberOfHomotopyTries();
+
 	//! Sets parameters
 	void setParams(const LOCA::ParameterVector& p);