Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20640 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed May 16, 2014
1 parent b0c21e0 commit dcc1f1d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions Compiler/Template/CodegenCpp.tpl
Expand Up @@ -1542,7 +1542,7 @@ match eq
<%getAMatrixCode(simCode,eq)%>
<%isLinearCode(simCode,eq)%>
<%isLinearTearingCode(simCode,eq)%>
>>
end algloopCppFile;
Expand Down Expand Up @@ -3171,7 +3171,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
return false;
}
>>
case SES_LINEAR(__) then
<<
bool <%modelname%>Algloop<%index%>::isLinear()
Expand Down Expand Up @@ -3492,7 +3492,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
>>
%>
}
}
<%writeoutput1(modelInfo)%>
>>
Expand Down
Expand Up @@ -7,14 +7,14 @@
#elif defined(SIMSTER_BUILD)




/*Defines*/
#define PATH fs::path

#include <Genericfactory/Factory.h>
#elif defined(OMC_BUILD)


/*Defines*/
#define PATH fs::path
Expand Down
36 changes: 18 additions & 18 deletions SimulationRuntime/cpp/Solver/Kinsol/Kinsol.cpp
Expand Up @@ -13,10 +13,10 @@ Kinsol::Kinsol(IAlgLoop* algLoop, INonLinSolverSettings* settings)
, _fScale (NULL)
, _f (NULL)
, _helpArray (NULL)
, _zeroVec (NULL)
, _zeroVec (NULL)
, _jac (NULL)
,_fHelp(NULL)
,_yHelp(NULL)
,_fHelp(NULL)
,_yHelp(NULL)
, _dimSys (0)
, _fnorm(10.0)
, _currentIterateNorm (100.0)
Expand All @@ -36,7 +36,7 @@ Kinsol::~Kinsol()
if(_helpArray) delete [] _helpArray;
if(_jac) delete [] _jac;
if(_fHelp) delete [] _fHelp;
if(_zeroVec) delete [] _zeroVec;
if(_zeroVec) delete [] _zeroVec;
N_VDestroy_Serial(_Kin_y);
N_VDestroy_Serial(_Kin_y0);
N_VDestroy_Serial(_Kin_yScale);
Expand Down Expand Up @@ -77,14 +77,14 @@ void Kinsol::initialize()
if(_jac) delete [] _jac;
if(_yHelp) delete [] _yHelp;
if(_fHelp) delete [] _fHelp;
if(_zeroVec) delete [] _zeroVec;
if(_zeroVec) delete [] _zeroVec;
_y = new double[_dimSys];
_y0 = new double[_dimSys];
_yScale = new double[_dimSys];
_fScale = new double[_dimSys];
_f = new double[_dimSys];
_helpArray = new double[_dimSys];
_zeroVec = new double[_dimSys];
_zeroVec = new double[_dimSys];

_jac = new double[_dimSys*_dimSys];
_yHelp = new double[_dimSys];
Expand All @@ -97,7 +97,7 @@ void Kinsol::initialize()
memset(_yHelp,0,_dimSys*sizeof(double));
memset(_fHelp,0,_dimSys*sizeof(double));
memset(_jac,0,_dimSys*_dimSys*sizeof(double));
memset(_zeroVec,0,_dimSys*sizeof(double));
memset(_zeroVec,0,_dimSys*sizeof(double));

_algLoop->getNominalReal(_yScale);

Expand Down Expand Up @@ -166,23 +166,23 @@ void Kinsol::solve()
long int dimRHS = 1; // Dimension of right hand side of linear system (=b)
long int dimSys = _dimSys;
long int irtrn = 0; // Retrun-flag of Fortran code
_algLoop->setReal(_zeroVec);
_algLoop->evaluate();

_algLoop->setReal(_zeroVec);
_algLoop->evaluate();
_algLoop->getRHS(_f);
_algLoop->getReal(_y);
calcJacobian(_f,_y);
_algLoop->getReal(_y);
calcJacobian(_f,_y);
dgesv_(&dimSys,&dimRHS,_jac,&dimSys,_fHelp,_f,&dimSys,&irtrn);
for(int i=0;i<_dimSys;i++)
_f[i]*=-1.0;
for(int i=0;i<_dimSys;i++)
_f[i]*=-1.0;
memcpy(_y,_f,_dimSys*sizeof(double));
_algLoop->setReal(_y);
//_algLoop->evaluate();
if(irtrn != 0)
_algLoop->setReal(_y);
//_algLoop->evaluate();
if(irtrn != 0)
throw std::runtime_error("error solving linear tearing system");
else
_iterationStatus = DONE;

}
else
{
Expand Down

0 comments on commit dcc1f1d

Please sign in to comment.