-fixed merge conflicts

SimulationRuntime/cpp/Solver/Newton/Newton.cpp

@@ -28,64 +28,27 @@ Newton::Newton(IAlgLoop* algLoop, INonLinSolverSettings* settings)
 	, _fnew             (NULL)
 	, _fold             (NULL)
 , _f                  (NULL)
-, _ihelpArray         (NULL)
-
-	, _fHelp			(NULL)
-	, _delta_s            (NULL)
-	, _delta_b            (NULL)
-	, _iHelp               (NULL)<<<<<<< .mine
-	, _fold             (NULL)
-, _f                  (NULL)
 , _ihelpArray         (NULL)
 
 	, _fHelp			(NULL)
 	, _delta_s            (NULL)
 	, _delta_b            (NULL)
 	, _iHelp               (NULL)
-=======
-	, _fHelp            (NULL)
-	, _iHelp            (NULL)
 
-
-
-
-
-
->>>>>>> .theirs
 	, _jac                (NULL)
 	, _jacHelpVec1            (NULL)
 	, _jacHelpVec2            (NULL)
 	, _jacHelpMat1            (NULL)
 	, _jacHelpMat2            (NULL)
-	, _work						(NULL)
-, _kluSymbolic 			(NULL)
-, _kluNumeric			(NULL)
-, _kluCommon			(NULL)
-, _Ai					(NULL)
-, _Ap					(NULL)
-, _Ax					(NULL)<<<<<<< .mine
-	, _jacHelpVec2            (NULL)
-	, _jacHelpMat1            (NULL)
-	, _jacHelpMat2            (NULL)
+
 	, _work						(NULL)
 , _kluSymbolic 			(NULL)
 , _kluNumeric			(NULL)
 , _kluCommon			(NULL)
 , _Ai					(NULL)
 , _Ap					(NULL)
 , _Ax					(NULL)
-=======
-  , _y_new              (NULL)
-	, _zeroVec            (NULL)
-
-
-
-
-
 
-
-
->>>>>>> .theirs
 	, _dimSys            (0)
 	, _firstCall        (true)
 	, _iterationStatus    (CONTINUE)
@@ -260,7 +223,7 @@ void Newton::initialize()
 			_iterationStatus = SOLVERERROR;
 		}
 	}
-<<<<<<< .mine
+
 	// DEBUG AREA
 	/*
 	double
@@ -326,9 +289,6 @@ void Newton::initialize()
 		calcJacobian();
 		//memcpy(_jacHelpMat1,_jac,_dimSys*_dimSys*sizeof(double));
 
-=======
-	LOGGER_WRITE("Newton: initialized",LC_NLS,LL_DEBUG);
-
 
 
 
@@ -390,73 +350,6 @@ void Newton::initialize()
 
 
 
-
-
->>>>>>> .theirs
-	// DEBUG AREA
-	/*
-	double
-		*DBGMatA,
-		*DBGMatB,
-		*DBGMatC,
-		*DBGVecu,
-		*DBGVecv,
-		*DBGVecw;
-
-	double dbg;
-
-	DBGMatA        = new double[9];
-	DBGMatB        = new double[9];
-	DBGMatC        = new double[9];
-
-	memset(DBGMatA,0,9*sizeof(double));
-	memset(DBGMatB,0,9*sizeof(double));
-	memset(DBGMatC,0,9*sizeof(double));
-
-	DBGVecv        = new double[3];
-	DBGVecu        = new double[3];
-	DBGVecw        = new double[3];
-
-	memset(DBGVecv,0,3*sizeof(double));
-	memset(DBGVecu,0,3*sizeof(double));
-	memset(DBGVecw,0,3*sizeof(double));
-
-	for(int i=0;i<9;i++)
-	{
-		DBGMatA[i] = 1;
-		DBGMatB[i] = i+1;
-	}
-
-	for (int i=0;i<3;i++)
-	{
-		DBGVecu[i] = i+1;
-		DBGVecv[i] = 3+i;
-		DBGVecw[i] = 1;
-	}
-
-	matVecMult(3, 3, DBGMatB, DBGVecu, DBGVecw);
-	dbg= 1;
-	vecMatMult(3, 3, DBGMatB, DBGVecu, DBGVecw);
-	dbg=1;
-	vecprod(3, DBGVecu, DBGVecv, DBGMatC);
-	dbg=1;
-
-	// DEBUG AREA
-	*/
-	long int
-		irtrn    = 0;
-
-	calcFunction(_y,_fold);
-	if(!_algLoop->isLinear())
-	{
-		/*
-		for(int i=0;i<_dimSys;i++)
-		{
-			_jac[i*_dimSys+i] = 1;
-		}
-		*/
-		calcJacobian();
-		//memcpy(_jacHelpMat1,_jac,_dimSys*_dimSys*sizeof(double));
 
 
 
@@ -471,20 +364,8 @@ void Newton::initialize()
 	}
 
 	Logger::write("Newton: initialized",LC_NLS,LL_DEBUG);
-<<<<<<< .mine
 
-		if(_broydenMethod==2)
-		{
-			//dgetrf_(&_dimSys, &_dimSys, _jac, &_dimSys, _iHelp, &irtrn);
-			//dgetri_(&_dimSys, _jac, &_dimSys, _iHelp,_work, &_lwork, &irtrn);
-			dgesv_(&_dimSys,&_dimSys,_jac,&_dimSys,_ihelpArray,_identity,&_dimSys,&irtrn);
-			memcpy(_jac,_identity,_dimSys*_dimSys*sizeof(double));
-		}
 
-	}
-
-	Logger::write("Newton: initialized",LC_NLS,LL_DEBUG);
-=======
 
 
 
@@ -497,7 +378,6 @@ void Newton::initialize()
 
 
 
->>>>>>> .theirs
 }
 
 void Newton::solve()