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@22177 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@OpenModelica-Hudson
OpenModelica-Hudson committed Sep 8, 2014
1 parent 16759ba commit 87e118f
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 130 deletions.
232 changes: 116 additions & 116 deletions SimulationRuntime/cpp/Solver/CVode/CVode.cpp
View file
Expand Up @@ -27,8 +27,8 @@ Cvode::Cvode(IMixedSystem* system, ISolverSettings* settings)
_event_system(NULL),
_mixed_system(NULL),
_time_system(NULL),
_delta(NULL),
_ysave(NULL)
_delta(NULL),
_ysave(NULL)
{
_data = ((void*) this);
}
Expand All @@ -51,18 +51,18 @@ Cvode::~Cvode()
N_VDestroy_Serial(_CV_absTol);
CVodeFree(&_cvodeMem);
}


if (_sparsePattern_index)
delete [] _sparsePattern_leadindex;
delete [] _sparsePattern_leadindex;
if (_sparsePattern_colorCols)
delete [] _sparsePattern_colorCols;
delete [] _sparsePattern_colorCols;
if(_sparsePattern_index)
delete [] _sparsePattern_index;
delete [] _sparsePattern_index;
if(_delta)
delete [] _delta;
delete [] _delta;
if(_ysave)
delete [] _ysave;
delete [] _ysave;

}

Expand Down Expand Up @@ -100,22 +100,22 @@ void Cvode::initialize()
delete[] _zeroSign;
if (_absTol)
delete[] _absTol;
if(_delta)
delete [] _delta;
if(_ysave)
delete [] _ysave;
if(_delta)
delete [] _delta;
if(_ysave)
delete [] _ysave;

_z = new double[_dimSys];
_zInit = new double[_dimSys];
_zWrite = new double[_dimSys];
_zeroSign = new int[_dimZeroFunc];
_absTol = new double[_dimSys];
_delta =new double[_dimSys];
_ysave =new double[_dimSys];
_delta =new double[_dimSys];
_ysave =new double[_dimSys];

memset(_z, 0, _dimSys * sizeof(double));
memset(_zInit, 0, _dimSys * sizeof(double));
memset(_ysave, 0, _dimSys * sizeof(double));
memset(_ysave, 0, _dimSys * sizeof(double));

// Counter initialisieren
_outStps = 0;
Expand Down Expand Up @@ -214,13 +214,13 @@ void Cvode::initialize()
throw std::invalid_argument(/*_idid,_tCurrent,*/"Cvode::initialize()");

// Initialize linear solver
_idid = CVDense(_cvodeMem, _dimSys);
_idid = CVDense(_cvodeMem, _dimSys);
if (_idid < 0)
throw std::invalid_argument("Cvode::initialize()");

// Use own jacobian matrix
_idid = CVDlsSetDenseJacFn(_cvodeMem, CV_JCallback);
if (_idid < 0)
// Use own jacobian matrix
_idid = CVDlsSetDenseJacFn(_cvodeMem, CV_JCallback);
if (_idid < 0)
throw std::invalid_argument("CVode::initialize()");

if (_dimZeroFunc)
Expand All @@ -235,8 +235,8 @@ void Cvode::initialize()
memset(_zeroVal, -1, _dimZeroFunc * sizeof(int));

}
initializeColoredJac();

initializeColoredJac();
_cvode_initialized = true;

//
Expand Down Expand Up @@ -570,81 +570,81 @@ int Cvode::calcJacobian(double t, long int N, N_Vector fHelp, N_Vector errorWeig
try
{
int j,k,l;
double fnorm, minInc, *f_data, *fHelp_data, *errorWeight_data, h, srur;
f_data = NV_DATA_S(fy);
errorWeight_data = NV_DATA_S(errorWeight);
fHelp_data = NV_DATA_S(fHelp);
//Get relevant info
_idid = CVodeGetErrWeights(_cvodeMem, errorWeight);
if (_idid < 0)
double fnorm, minInc, *f_data, *fHelp_data, *errorWeight_data, h, srur;

f_data = NV_DATA_S(fy);
errorWeight_data = NV_DATA_S(errorWeight);
fHelp_data = NV_DATA_S(fHelp);


//Get relevant info
_idid = CVodeGetErrWeights(_cvodeMem, errorWeight);
if (_idid < 0)
{
_idid = -5;
throw std::invalid_argument("Cvode::calcJacobian()");
}
_idid = CVodeGetCurrentStep(_cvodeMem, &h);
if (_idid < 0)
}
_idid = CVodeGetCurrentStep(_cvodeMem, &h);
if (_idid < 0)
{
_idid = -5;
throw std::invalid_argument("Cvode::calcJacobian()");
}
srur = sqrt(UROUND);
fnorm = N_VWrmsNorm(fy, errorWeight);
minInc = (fnorm != 0.0) ?
}

srur = sqrt(UROUND);

fnorm = N_VWrmsNorm(fy, errorWeight);
minInc = (fnorm != 0.0) ?
(1000.0 * abs(h) * UROUND * N * fnorm) : 1.0;

for(j=0;j<N;j++)
{
_delta[j] = max(srur*abs(y[j]), minInc/errorWeight_data[j]);
}
// Calculation of the jacobian
for(int i=0; i < _sparsePattern_maxColors; i++)
{
for(int ii=0; ii < _dimSys; ii++)
{
if((_sparsePattern_colorCols[ii] - 1) == i)
{
_ysave[ii] = y[ii];
y[ii]+= _delta[ii];
}
}

calcFunction(t, y, fHelp_data);

for(int ii = 0; ii < _dimSys; ii++)
{
if((_sparsePattern_colorCols[ii] - 1) == i)
{

y[ii] = _ysave[ii];

if(ii==0)
{
j = 0;
}
else
{
j = _sparsePattern_leadindex[ii-1];

}
while(j <_sparsePattern_leadindex[ii])
{
l = _sparsePattern_index[j];
k = l + ii * _dimSys;
Jac->data[k] = (fHelp_data[l] - f_data[l])/_delta[l];
j++;
}
}
}
}
for(j=0;j<N;j++)
{
_delta[j] = max(srur*abs(y[j]), minInc/errorWeight_data[j]);
}

// Calculation of the jacobian
for(int i=0; i < _sparsePattern_maxColors; i++)
{
for(int ii=0; ii < _dimSys; ii++)
{
if((_sparsePattern_colorCols[ii] - 1) == i)
{
_ysave[ii] = y[ii];
y[ii]+= _delta[ii];
}

}

calcFunction(t, y, fHelp_data);

for(int ii = 0; ii < _dimSys; ii++)
{
if((_sparsePattern_colorCols[ii] - 1) == i)
{

y[ii] = _ysave[ii];

if(ii==0)
{
j = 0;
}
else
{
j = _sparsePattern_leadindex[ii-1];

}
while(j <_sparsePattern_leadindex[ii])
{
l = _sparsePattern_index[j];
k = l + ii * _dimSys;
Jac->data[k] = (fHelp_data[l] - f_data[l])/_delta[l];
j++;
}
}
}
}


} //workaround until exception can be catch from c- libraries
catch (std::exception& ex)
{
Expand All @@ -654,54 +654,54 @@ int Cvode::calcJacobian(double t, long int N, N_Vector fHelp, N_Vector errorWeig
}

/* Calculation of J without colouring
for (j = 0; j < N; j++)
{
for (j = 0; j < N; j++)
{
//Generate the jth col of J(tn,y)
//Generate the jth col of J(tn,y)
//N_VSetArrayPointer(DENSE_COL(Jac,j), jthCol);
//N_VSetArrayPointer(DENSE_COL(Jac,j), jthCol);
yjsaved = y[j];
yjsaved = y[j];
y[j] += _delta[j];
y[j] += _delta[j];
calcFunction(t, y, fHelp_data);
calcFunction(t, y, fHelp_data);
y[j] = yjsaved;
y[j] = yjsaved;
delta_inv = 1.0/_delta[j];
N_VLinearSum(delta_inv, fHelp, -delta_inv, fy, jthCol);
delta_inv = 1.0/_delta[j];
N_VLinearSum(delta_inv, fHelp, -delta_inv, fy, jthCol);
for(int i=0; i<_dimSys; ++i)
for(int i=0; i<_dimSys; ++i)
{
Jac->data[i+j*_dimSys] = NV_Ith_S(jthCol,i);
}
//DENSE_COL(Jac,j) = N_VGetArrayPointer(jthCol);
}
*/
//DENSE_COL(Jac,j) = N_VGetArrayPointer(jthCol);
}
*/



return 0;
}

void Cvode::initializeColoredJac()
{
_sizeof_sparsePattern_colorCols = _system->getA_sizeof_sparsePattern_colorCols();
_sparsePattern_colorCols = new int[_sizeof_sparsePattern_colorCols];
_system->getA_sparsePattern_colorCols( _sparsePattern_colorCols, _sizeof_sparsePattern_colorCols);
_sizeof_sparsePattern_colorCols = _system->getA_sizeof_sparsePattern_colorCols();
_sparsePattern_colorCols = new int[_sizeof_sparsePattern_colorCols];
_system->getA_sparsePattern_colorCols( _sparsePattern_colorCols, _sizeof_sparsePattern_colorCols);

_sizeof_sparsePattern_leadindex = _system->getA_sizeof_sparsePattern_leadindex();
_sparsePattern_leadindex = new int[_sizeof_sparsePattern_leadindex];
_system->getA_sparsePattern_leadindex( _sparsePattern_leadindex, _sizeof_sparsePattern_leadindex);
_sizeof_sparsePattern_leadindex = _system->getA_sizeof_sparsePattern_leadindex();
_sparsePattern_leadindex = new int[_sizeof_sparsePattern_leadindex];
_system->getA_sparsePattern_leadindex( _sparsePattern_leadindex, _sizeof_sparsePattern_leadindex);


_sizeof_sparsePattern_index = _system->getA_sizeof_sparsePattern_index();
_sparsePattern_index = new int[_sizeof_sparsePattern_index];
_system->getA_sparsePattern_index( _sparsePattern_index, _sizeof_sparsePattern_index);
_sizeof_sparsePattern_index = _system->getA_sizeof_sparsePattern_index();
_sparsePattern_index = new int[_sizeof_sparsePattern_index];
_system->getA_sparsePattern_index( _sparsePattern_index, _sizeof_sparsePattern_index);


_sparsePattern_maxColors = _system->getA_sparsePattern_maxColors();
_sparsePattern_maxColors = _system->getA_sparsePattern_maxColors();
}

const int Cvode::reportErrorMessage(ostream& messageStream)
Expand Down
28 changes: 14 additions & 14 deletions SimulationRuntime/cpp/Solver/CVode/CVode.h
View file
Expand Up @@ -144,7 +144,7 @@ class Cvode

// Callback der Nullstellenfunktion
static int CV_ZerofCallback(double t, N_Vector y, double *zeroval, void *user_data);

// Functions for Coloured Jacobian
static int CV_JCallback(long int N, double t, N_Vector y, N_Vector fy, DlsMat Jac,void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
int calcJacobian(double t, long int N, N_Vector fHelp, N_Vector errorWeight, N_Vector jthcol, double* y, N_Vector fy, DlsMat Jac);
Expand Down Expand Up @@ -174,9 +174,9 @@ class Cvode
*_zInit, ///< Temp - Initial state vector
*_zWrite, ///< Temp - Zustand den das System rausschreibt
*_absTol, /// - Vektor für absolute Toleranzen
*_delta,
*_ysave;
*_delta,
*_ysave;


double
_hOut; ///< Temp - Ouput step size for dense output
Expand All @@ -203,22 +203,22 @@ double
_CV_y, ///< Temp - State in Cvode Format
_CV_yWrite, ///< Temp - Vector for dense out
_CV_absTol;

// Variables for Coloured Jacobians
int _sizeof_sparsePattern_colorCols;
int* _sparsePattern_colorCols;

int _sizeof_sparsePattern_leadindex;
int* _sparsePattern_leadindex;
// Variables for Coloured Jacobians
int _sizeof_sparsePattern_colorCols;
int* _sparsePattern_colorCols;

int _sizeof_sparsePattern_leadindex;
int* _sparsePattern_leadindex;


int _sizeof_sparsePattern_index;
int* _sparsePattern_index;
int _sizeof_sparsePattern_index;
int* _sparsePattern_index;


int _sparsePattern_maxColors;
int _sparsePattern_maxColors;

bool _cvode_initialized;
bool _cvode_initialized;


ISystemProperties* _properties;
Expand Down

0 comments on commit 87e118f

Please sign in to comment.