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@23904 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Dec 23, 2014
1 parent ecb10bc commit e5f52ba
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions SimulationRuntime/c/simulation/solver/linearSolverLis.c
Expand Up @@ -106,8 +106,8 @@ freeLisData(void **voiddata)

void printLisMatrixCSR(LIS_MATRIX A, int n)
{
char buffer[16384];
int i, j;
char buffer[16384];
int i, j;
/* A matrix */
infoStreamPrint(LOG_LS_V, 1, "A matrix [%dx%d] nnz = %d ", n, n, A->nnz);
for(i=0; i<n; i++)
Expand Down Expand Up @@ -175,9 +175,9 @@ solveLis(DATA *data, int sysNumber)
infoStreamPrint(LOG_LS, 0, "Solve System: %f", rt_ext_tp_tock(&(solverData->timeClock)));

if (err){
warningStreamPrint(LOG_LS_V, 0, "lis_solve : %s(code=%lld)\n\n ", lis_returncode[err], err);
printLisMatrixCSR(solverData->A, solverData->n_row);
success = 0;
warningStreamPrint(LOG_LS_V, 0, "lis_solve : %s(code=%lld)\n\n ", lis_returncode[err], err);
printLisMatrixCSR(solverData->A, solverData->n_row);
success = 0;
}


Expand Down
26 changes: 13 additions & 13 deletions SimulationRuntime/c/simulation/solver/linearSolverUmfpack.c
Expand Up @@ -106,7 +106,7 @@ solveUmfPack(DATA *data, int sysNumber)
double control[UMFPACK_CONTROL], info[UMFPACK_INFO];

int i, j, status = 0, success = 0, ni=0, n = systemData->size, eqSystemNumber = systemData->equationIndex, indexes[2] = {1,eqSystemNumber};

infoStreamPrintWithEquationIndexes(LOG_LS, 0, indexes, "Start solving Linear System %d (size %d) at time %g with UMFPACK Solver",
eqSystemNumber, (int) systemData->size,
data->localData[0]->timeValue);
Expand All @@ -116,28 +116,28 @@ solveUmfPack(DATA *data, int sysNumber)
if (0 == systemData->method)
{
/* set A matrix */
solverData->Ap[0] = 0;
systemData->setA(data, systemData);
solverData->Ap[solverData->n_row] = solverData->nnz;
solverData->Ap[0] = 0;
systemData->setA(data, systemData);
solverData->Ap[solverData->n_row] = solverData->nnz;

/* set b vector */
systemData->setb(data, systemData);
/* set b vector */
systemData->setb(data, systemData);
} else {
assertStreamPrint(data->threadData, 0, "Tearing system not implemented yet!");
}
infoStreamPrint(LOG_LS, 0, "### %f time to set Matrix A and vector b.", rt_ext_tp_tock(&(solverData->timeClock)));

if (ACTIVE_STREAM(LOG_LS_V))
{
infoStreamPrint(LOG_LS_V, 1, "Matrix A");
for (i=0; i<solverData->n_row; i++)
for (j=solverData->Ap[i]; j<solverData->Ap[i+1]; j++)
infoStreamPrint(LOG_LS_V, 0, "A[%d,%d] = %f", i, solverData->Ai[j], solverData->Ax[j]);
infoStreamPrint(LOG_LS_V, 1, "Matrix A");
for (i=0; i<solverData->n_row; i++)
for (j=solverData->Ap[i]; j<solverData->Ap[i+1]; j++)
infoStreamPrint(LOG_LS_V, 0, "A[%d,%d] = %f", i, solverData->Ai[j], solverData->Ax[j]);

messageClose(LOG_LS_V);

for (i=0; i<solverData->n_row; i++)
infoStreamPrint(LOG_LS_V, 0, "b[%d] = %e", i, systemData->b[i]);
for (i=0; i<solverData->n_row; i++)
infoStreamPrint(LOG_LS_V, 0, "b[%d] = %e", i, systemData->b[i]);
}

control[UMFPACK_PIVOT_TOLERANCE] = 1.0;
Expand Down

0 comments on commit e5f52ba

Please sign in to comment.