Skip to content

Commit ab89f81

Browse files
[Janitor mode] Fix tabs
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17562 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 17a4d7d commit ab89f81

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

Compiler/Template/CodegenC.tpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9773,21 +9773,21 @@ template optimizationComponents1(ClassAttributes classAttribute, SimCode simCode
97739773
<<
97749774
if(i == 0)
97759775
*res = $P$TMP_mayerTerm;
9776-
else if(i == 1)
9777-
*res = $P$TMP_mayerTerm$pDERC$PdummyVarC;
9778-
else if(i == 2)
9779-
*res = $P$TMP_mayerTerm$pDERD$PdummyVarD;
9776+
else if(i == 1)
9777+
*res = $P$TMP_mayerTerm$pDERC$PdummyVarC;
9778+
else if(i == 2)
9779+
*res = $P$TMP_mayerTerm$pDERD$PdummyVarD;
97809780
return 0;
97819781
>>
97829782

97839783
let objectiveIntegrand = match objectiveIntegrandE case SOME(exp) then
97849784
<<
97859785
if(i == 0)
97869786
*res = $P$TMP_lagrangeTerm;
9787-
else if(i == 1)
9788-
*res = $P$TMP_lagrangeTerm$pDERC$PdummyVarC;
9789-
else if(i == 2)
9790-
*res = $P$TMP_lagrangeTerm$pDERD$PdummyVarD;
9787+
else if(i == 1)
9788+
*res = $P$TMP_lagrangeTerm$pDERC$PdummyVarC;
9789+
else if(i == 2)
9790+
*res = $P$TMP_lagrangeTerm$pDERD$PdummyVarD;
97919791
return 0;
97929792
>>
97939793
let listConstraintsLength = match simCode case SIMCODE(modelInfo = MODELINFO(__)) then listLength(constraints)

SimulationRuntime/c/optimization/goal/evalF.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -214,31 +214,31 @@ int diff_symColoredObject(double *v, double t, IPOPT_DATA_ *iData, double *dF, i
214214
refreshSimData(x,u,t,iData);
215215

216216
if(iData->matrixC ==0){
217-
for(i= 0, k = 0; i<iData->nx; ++i, ++k)
218-
{
219-
data->simulationInfo.analyticJacobians[index1].seedVars[i] = 1.0;
220-
functionJacC_column(data);
221-
data->simulationInfo.analyticJacobians[index1].seedVars[i] = 0.0;
222-
if(this_it ==0)
223-
mayer(iData->data, &dF[k],1);
224-
else
225-
lagrange(iData->data, &dF[k],1);
226-
227-
/*printf("\tdF[%i] = %g\t",k,dF[k]);*/
228-
}
217+
for(i= 0, k = 0; i<iData->nx; ++i, ++k)
218+
{
219+
data->simulationInfo.analyticJacobians[index1].seedVars[i] = 1.0;
220+
functionJacC_column(data);
221+
data->simulationInfo.analyticJacobians[index1].seedVars[i] = 0.0;
222+
if(this_it ==0)
223+
mayer(iData->data, &dF[k],1);
224+
else
225+
lagrange(iData->data, &dF[k],1);
226+
227+
/*printf("\tdF[%i] = %g\t",k,dF[k]);*/
228+
}
229229
}
230230
if(iData->matrixD ==0){
231-
for(k =iData->nx, i = 0 ; i<iData->nu; ++i, ++k)
232-
{
233-
data->simulationInfo.analyticJacobians[index2].seedVars[i] = 1.0;
234-
functionJacD_column(data);
235-
data->simulationInfo.analyticJacobians[index2].seedVars[i] = 0.0;
236-
if(this_it ==0)
237-
mayer(iData->data, &dF[k],2);
238-
else
239-
lagrange(iData->data, &dF[k],2);
240-
/*printf("dF[%i] = %g\t",k,dF[k]);*/
241-
}
231+
for(k =iData->nx, i = 0 ; i<iData->nu; ++i, ++k)
232+
{
233+
data->simulationInfo.analyticJacobians[index2].seedVars[i] = 1.0;
234+
functionJacD_column(data);
235+
data->simulationInfo.analyticJacobians[index2].seedVars[i] = 0.0;
236+
if(this_it ==0)
237+
mayer(iData->data, &dF[k],2);
238+
else
239+
lagrange(iData->data, &dF[k],2);
240+
/*printf("dF[%i] = %g\t",k,dF[k]);*/
241+
}
242242
}
243243

244244
return 0;

SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)
9393
initial_guess_ipopt(iData,solverInfo);
9494

9595
if(ACTIVE_STREAM(LOG_IPOPT)){
96-
for(i=0; i<iData->nx; i++)
97-
printf("\nx[%i] = %s = %g",i, iData->data->modelData.realVarsData[i].info.name,iData->v[i]);
96+
for(i=0; i<iData->nx; i++)
97+
printf("\nx[%i] = %s = %g",i, iData->data->modelData.realVarsData[i].info.name,iData->v[i]);
9898
for(; i<iData->nv; ++i)
9999
printf("\nu[%i] = %s = %g",i, iData->data->modelData.realVarsData[iData->index_u + i-iData->nx].info.name,iData->v[i]);
100100
}

0 commit comments

Comments
 (0)