Skip to content

Commit

Permalink
- minor fixes to DSS
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15138 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@lochel
lochel committed Feb 11, 2013
1 parent a16fea9 commit b103a25
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 53 deletions.
156 changes: 106 additions & 50 deletions SimulationRuntime/c/simulation/solver/stateset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,59 +35,82 @@

#include <memory.h>

/* initialize jacobians for state selection */
/*! \fn initializeStateSetJacobians
*
* initialize jacobians for state selection
*
* \param [ref] [data] ???
*
* \author ???
*/
void initializeStateSetJacobians(DATA *data)
{
long i=0;
modelica_integer n=0;
long i = 0;
STATE_SET_DATA *set = NULL;

/* go troug all state sets*/
for (i=0; i<data->modelData.nStateSets; i++)
for(i=0; i<data->modelData.nStateSets; i++)
{
STATE_SET_DATA *set = &(data->simulationInfo.stateSetData[i]);
set = &(data->simulationInfo.stateSetData[i]);
if(set->initialAnalyticalJacobian(data))
{
THROW("Error, can not initialze Jacobians for dynamic state selection");
}
initializeStateSetPivoting(data);
THROW("can not initialze Jacobians for dynamic state selection");
}
}
initializeStateSetPivoting(data);
}

/* initialize pivoting data for state selection */
/*! \fn initializeStateSetPivoting
*
* initialize pivoting data for state selection
*
* \param [ref] [data] ???
*
* \author ???
*/
void initializeStateSetPivoting(DATA *data)
{
long i=0;
modelica_integer n=0;
/* go troug all state sets*/
for (i=0; i<data->modelData.nStateSets; i++)
long i = 0;
long n = 0;
STATE_SET_DATA *set = NULL;
unsigned int aid = 0;
modelica_integer *A = NULL;

/* go troug all state sets */
for(i=0; i<data->modelData.nStateSets; i++)
{
STATE_SET_DATA *set = &(data->simulationInfo.stateSetData[i]);
unsigned int aid = set->A->id - data->modelData.integerVarsData[0].info.id;
modelica_integer *A = &(data->localData[0]->integerVars[aid]);
memset(A, 0, set->nCandidates*set->nStates*sizeof(modelica_integer));
set = &(data->simulationInfo.stateSetData[i]);
aid = set->A->id - data->modelData.integerVarsData[0].info.id;
A = &(data->localData[0]->integerVars[aid]);

memset(A, 0, set->nCandidates*set->nStates*sizeof(modelica_integer));

/* initialize row and col indizes */
for (n=0; n<set->nDummyStates; n++)
{
set->rowPivot[n] = n;
}
for (n=0; n<set->nCandidates; n++)
{
set->colPivot[n] = set->nCandidates-n-1;
}
for (n=0; n<set->nStates; n++)
{
/* set A[row, col] */
set_matrix_elt(A, n, n, set->nStates, 1);
}
for(n=0; n<set->nDummyStates; n++)
set->rowPivot[n] = n;

for(n=0; n<set->nCandidates; n++)
set->colPivot[n] = set->nCandidates-n-1;

for(n=0; n<set->nStates; n++)
set_matrix_elt(A, n, n, set->nStates, 1); /* set A[row, col] */
}
}

/* free jacobians for state selection */
/*! \fn freeStateSetData
*
* free jacobians for state selection
*
* \param [ref] [data] ???
*
* \author ???
*/
void freeStateSetData(DATA *data)
{
long i=0;
modelica_integer n=0;
/* go troug all state sets*/
for (i=0; i<data->modelData.nStateSets; i++)
long i=0;

/* go troug all state sets */
for(i=0; i<data->modelData.nStateSets; i++)
{
STATE_SET_DATA *set = &(data->simulationInfo.stateSetData[i]);
free(set->states);
Expand All @@ -98,17 +121,16 @@ void freeStateSetData(DATA *data)
}
}

/*! \fn getAnalyticalJacobian
/*! \fn getAnalyticalJacobianSet
*
* function calculates analytical jacobian
*
* \param [ref] [data]
* \param [out] [jac]
* \param [ref] [data] ???
* \param [out] [index] ???
*
* \author wbraun
*
*/
void getAnalyticalJacobianSet(DATA* data, unsigned int index)
static void getAnalyticalJacobianSet(DATA* data, unsigned int index)
{
unsigned int i, j, k, l, ii;
unsigned int jacIndex = data->simulationInfo.stateSetData[index].jacobianIndex;
Expand All @@ -127,12 +149,12 @@ void getAnalyticalJacobianSet(DATA* data, unsigned int index)

if(ACTIVE_STREAM(LOG_DSS_JAC))
{
INFO(LOG_DSS_JAC, "Caluculate one col:\n");
INFO(LOG_DSS_JAC, "Caluculate one col:");
for(l=0; l < data->simulationInfo.analyticJacobians[jacIndex].sizeCols; l++)
INFO2(LOG_DSS_JAC, "seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f", l, data->simulationInfo.analyticJacobians[jacIndex].seedVars[l]);
}

((data->simulationInfo.stateSetData[index].analyticalJacobianColumn))(data);
(data->simulationInfo.stateSetData[index].analyticalJacobianColumn)(data);

for(j=0; j < data->simulationInfo.analyticJacobians[jacIndex].sizeCols; j++)
{
Expand All @@ -141,8 +163,10 @@ void getAnalyticalJacobianSet(DATA* data, unsigned int index)
if(j==0)
ii = 0;
else
ii = data->simulationInfo.analyticJacobians[jacIndex].sparsePattern.leadindex[j-1];
INFO2(LOG_DSS_JAC, " take for %d -> %d\n", j, ii);
ii = data->simulationInfo.analyticJacobians[jacIndex].sparsePattern.leadindex[j-1];

INFO2(LOG_DSS_JAC, "take for %d -> %d\n", j, ii);

while(ii < data->simulationInfo.analyticJacobians[jacIndex].sparsePattern.leadindex[j])
{
l = data->simulationInfo.analyticJacobians[jacIndex].sparsePattern.index[ii];
Expand All @@ -154,9 +178,10 @@ void getAnalyticalJacobianSet(DATA* data, unsigned int index)
}
}
for(ii=0; ii < data->simulationInfo.analyticJacobians[jacIndex].sizeCols; ii++)
if(data->simulationInfo.analyticJacobians[jacIndex].sparsePattern.colorCols[ii]-1 == i) data->simulationInfo.analyticJacobians[jacIndex].seedVars[ii] = 0;

if(data->simulationInfo.analyticJacobians[jacIndex].sparsePattern.colorCols[ii]-1 == i)
data->simulationInfo.analyticJacobians[jacIndex].seedVars[ii] = 0;
}

if(ACTIVE_STREAM(LOG_DSS))
{
char buffer[4096];
Expand All @@ -174,7 +199,21 @@ void getAnalyticalJacobianSet(DATA* data, unsigned int index)
}
}

void setAMatrix(modelica_integer* newEnable, modelica_integer nCandidates, modelica_integer nStates, VAR_INFO* Ainfo, VAR_INFO** states, VAR_INFO** statecandidates, DATA *data)
/*! \fn setAMatrix
*
* ??? desc ???
*
* \param [ref] [newEnable]
* \param [ref] [nCandidates]
* \param [ref] [nStates]
* \param [ref] [Ainfo]
* \param [ref] [states]
* \param [ref] [statecandidates]
* \param [ref] [data]
*
* \author ???
*/
static void setAMatrix(modelica_integer* newEnable, modelica_integer nCandidates, modelica_integer nStates, VAR_INFO* Ainfo, VAR_INFO** states, VAR_INFO** statecandidates, DATA *data)
{
modelica_integer col;
modelica_integer row=0;
Expand All @@ -200,7 +239,24 @@ void setAMatrix(modelica_integer* newEnable, modelica_integer nCandidates, model
}
}

int comparePivot(modelica_integer *oldPivot, modelica_integer *newPivot, modelica_integer nCandidates, modelica_integer nDummyStates, modelica_integer nStates, VAR_INFO* A, VAR_INFO** states, VAR_INFO** statecandidates, DATA *data)
/*! \fn comparePivot
*
* ??? desc ???
*
* \param [ref] [oldPivot]
* \param [ref] [newPivot]
* \param [ref] [nCandidates]
* \param [ref] [nDummyStates]
* \param [ref] [nStates]
* \param [ref] [A]
* \param [ref] [states]
* \param [ref] [statecandidates]
* \param [ref] [data]
* \return ???
*
* \author ???
*/
static int comparePivot(modelica_integer *oldPivot, modelica_integer *newPivot, modelica_integer nCandidates, modelica_integer nDummyStates, modelica_integer nStates, VAR_INFO* A, VAR_INFO** states, VAR_INFO** statecandidates, DATA *data)
{
modelica_integer i;
int ret = 0;
Expand Down Expand Up @@ -237,10 +293,10 @@ int comparePivot(modelica_integer *oldPivot, modelica_integer *newPivot, modelic
*
* function to select the actual states
*
* \param [DATA] [data]
* \param [ref] [data]
* \return ???
*
* \author Frenkel TUD
*
*/
int stateSelection(DATA *data, char reportError)
{
Expand Down
5 changes: 2 additions & 3 deletions SimulationRuntime/c/simulation/solver/stateset.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ void freeStateSetData(DATA *data);
int stateSelection(DATA *data, char reportError);

/* do pivoting */
extern int pivot( double *A, modelica_integer n_rows, modelica_integer n_cols, modelica_integer *rowInd, modelica_integer *colInd );
extern int pivot(double *A, modelica_integer n_rows, modelica_integer n_cols, modelica_integer *rowInd, modelica_integer *colInd);


#endif /* OMC_STATESET_H */
#endif /* OMC_STATESET_H */

0 comments on commit b103a25

Please sign in to comment.