Skip to content

Commit

Permalink
- useNominal = true, after update
Browse files Browse the repository at this point in the history
- fixed 19146 for start value
- fixed output for optimization 


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19183 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Vitalij Ruge committed Feb 19, 2014
1 parent f992efa commit 78e8907
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Compiler/Template/CodegenC.tpl
Expand Up @@ -1745,6 +1745,7 @@ template functionUpdateBoundVariableAttributes(list<SimEqSystem> startValueEquat
<%nominalValueEquations |> SES_SIMPLE_ASSIGN(__) =>
<<
$P$ATTRIBUTE<%cref(cref)%>.nominal = <%cref(cref)%>;
$P$ATTRIBUTE<%cref(cref)%>.useNominal = ((modelica_boolean) 1);
infoStreamPrint(LOG_INIT, 0, "%s(nominal=<%crefToPrintfArg(cref)%>)", <%cref(cref)%>__varInfo.name, (<%crefType(cref)%>) $P$ATTRIBUTE<%cref(cref)%>.nominal);
>>
;separator="\n"%>
Expand Down Expand Up @@ -10536,7 +10537,7 @@ template optimizationComponents1(ClassAttributes classAttribute, SimCode simCode
case MODELINFO(vars=SIMVARS(__)) then
<<
<%vars.inputVars |> SIMVAR(__) hasindex i0 =>
'min[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.min;<%\n%>max[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.max;<%\n%>nominal[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.nominal;<%\n%>useNominal[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.useNominal;<%\n%>name[<%i0%>] = <%cref(name)%>__varInfo.name;<%\n%>start[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.useNominal;'
'min[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.min;<%\n%>max[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.max;<%\n%>nominal[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.nominal;<%\n%>useNominal[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.useNominal;<%\n%>name[<%i0%>] = <%cref(name)%>__varInfo.name;<%\n%>start[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.start;'
;separator="\n"%>
>>
<<
Expand Down
Expand Up @@ -634,7 +634,7 @@ static int optimizer_bounds_setings(DATA *data, IPOPT_DATA_ *iData)

if(ACTIVE_STREAM(LOG_IPOPT)){
for(i=0; i<iData->nx; ++i)
printf("\nState[%i]:\t name = \"%s\" \t\t| start=%g \t nominal=%g \t min = %g \t max = %g",i, iData->data->modelData.realVarsData[i].info.name, iData->v[i], iData->vnom[i], data->modelData.realVarsData[i].attribute.min, data->modelData.realVarsData[i].attribute.max);
printf("\nState[%i]:\t name = \"%s\" \t\t| start=%g \t nominal=%g \t min = %g \t max = %g",i, iData->data->modelData.realVarsData[i].info.name, data->modelData.realVarsData[i].attribute.start, iData->vnom[i], data->modelData.realVarsData[i].attribute.min, data->modelData.realVarsData[i].attribute.max);
for(; i<iData->nv; ++i)
printf("\nInput[%i]:\t name = \"%s\" \t\t| start=%g \t nominal=%g \t min = %g \t max = %g",i, tmpname[i-iData->nx] ,start[i-iData->nx], iData->vnom[i], iData->umin[i-iData->nx], iData->umax[i-iData->nx]);
if(iData->nc > 0)
Expand Down

0 comments on commit 78e8907

Please sign in to comment.