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@20415 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed May 6, 2014
1 parent 418f45d commit 7e1bd00
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Expand Up @@ -183,7 +183,7 @@ static inline void local_jac_struct(DATA * data, OptDataDim * dim, OptDataStruct
/**********************/
for(ii = 1; ii < maxColors; ++ii){
s->seedVec[index][ii] = (modelica_real*)calloc(sizeCols, sizeof(modelica_real));
for(i = 0; i < sizeCols; i++){
for(i = 0; i < sizeCols; i++){
if(cC[i] == ii){
s->seedVec[index][ii][i] = vnom[i];
for(j = lindex[i]; j < lindex[i + 1]; ++j){
Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/c/optimization/DataManagement/MoveData.c
Expand Up @@ -288,7 +288,7 @@ static inline void calculatedScalingHelper(OptDataBounds * bounds, OptDataTime *
bounds->scalb[i] = (long double**)malloc(np*sizeof(long double*));
l = (i + 1 < nsi ) ? 0 : 1;
for(j = 0; j < np; ++j){
bounds->scalb[i][j] = (long double*)malloc(nx*sizeof(long double));
bounds->scalb[i][j] = (long double*)malloc(nx*sizeof(long double));
for(k = 0; k < nx; ++k)
bounds->scalb[i][j][k] = time->dt[l]*rk->b[j];
}
Expand Down Expand Up @@ -479,7 +479,7 @@ inline void res2file(OptData *optData, SOLVER_INFO* solverInfo, double *vopt){
/******************/
fprintf(pFile, "%lf ",(double)t[ii][jj]);
for(i = 0; i < nu; ++i){
data->simulationInfo.inputVars[i] = vopt[ii*nvnp+nx+i];
data->simulationInfo.inputVars[i] = vopt[ii*nvnp+nx+i];
fprintf(pFile, "%lf ", (double)data->simulationInfo.inputVars[i]);
}
fprintf(pFile, "%s", "\n");
Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/c/optimization/OptimizerData.h
Expand Up @@ -61,7 +61,7 @@ typedef struct OptDataDim{
int index_con;
int index_lagrange;
int index_mayer;

int nJderx;
int nH0;
int nH1;
Expand Down Expand Up @@ -123,7 +123,7 @@ typedef struct OptDataStructure{
modelica_real *pmayer;
modelica_real *plagrange;
modelica_real *** seedVec;

}OptDataStructure;


Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/c/optimization/eval_all/EvalG.c
Expand Up @@ -99,7 +99,7 @@ Bool evalfG(Index n, double * vopt, Bool new_x, int m, Number *g, void * useData
vv[0] = optData->sv0;
for(j = 0; j < np; ++j){
vv[j + 1] = vopt + j*nv;
}
}

for(i = 0, shift = 0; i <nsi; ++i){

Expand Down Expand Up @@ -135,7 +135,7 @@ Bool evalfG(Index n, double * vopt, Bool new_x, int m, Number *g, void * useData

vv[0] = vv[np];
for(j = 0; j < np; ++j)
vv[j + 1] = vv[j] + nv;
vv[j + 1] = vv[j] + nv;

}
if(ACTIVE_STREAM(LOG_IPOPT_ERROR)){
Expand Down

0 comments on commit 7e1bd00

Please sign in to comment.