- remove unless code

- optica flag don't break simulation code git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19083 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 13, 2014 · 9c04f96 · 9c04f96
1 parent d3308a6
commit 9c04f96
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 25 deletions.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -8205,19 +8205,6 @@ template daeExpRelationSim(Exp exp, Context context, Text &preExp /*BUFP*/,
 match exp
 case rel as RELATION(__) then
   match context
-  case OPTIMIZATION_CONTEXT(__) then
-      let e1 = daeExp(rel.exp1, context, &preExp /*BUFC*/, &varDecls /*BUFC*/)
-      let e2 = daeExp(rel.exp2, context, &preExp /*BUFC*/, &varDecls /*BUFC*/)
-      match rel.operator
-        case LESS(__) then
-          'res[i++] = (<%e1%> - <%e2%>) ;<%\n%>'
-        case LESSEQ(__) then
-          'res[i++] = (<%e1%> - <%e2%>) ;<%\n%>'
-        case GREATER(__) then
-          'res[i++] = (<%e2%> - <%e1%>) ;<%\n%>'
-        case GREATEREQ(__) then
-          'res[i++] = (<%e2%> - <%e1%>) ;<%\n%>'
-     end match
   case SIMULATION_CONTEXT(__) then
     match rel.optionExpisASUB
     case NONE() then
@@ -10473,14 +10460,15 @@ end endModelicaLine;
 template optimizationComponents( list<DAE.ClassAttributes> classAttributes ,SimCode simCode, String modelNamePrefixStr)
   "Generates C for Objective Functions."
 ::=
-    if acceptOptimicaGrammar() then 
-       (classAttributes |> classAttribute => optimizationComponents1(classAttribute,simCode, modelNamePrefixStr); separator="\n") 
-    else
-      <<
-      int <%symbolName(modelNamePrefixStr,"mayer")%>(DATA* data, modelica_real* res){return -1;}
-      int <%symbolName(modelNamePrefixStr,"lagrange")%>(DATA* data, modelica_real* res){return -1;}
-      int <%symbolName(modelNamePrefixStr,"pathConstraints")%>(DATA* data, modelica_real* res, long int* N){return -1;}
-      >>   
+    match classAttributes
+    case{} then
+        <<
+        int <%symbolName(modelNamePrefixStr,"mayer")%>(DATA* data, modelica_real* res){return -1;}
+        int <%symbolName(modelNamePrefixStr,"lagrange")%>(DATA* data, modelica_real* res){return -1;}
+        int <%symbolName(modelNamePrefixStr,"pathConstraints")%>(DATA* data, modelica_real* res, long int* N){return -1;}
+        >>  
+      else
+        (classAttributes |> classAttribute => optimizationComponents1(classAttribute,simCode, modelNamePrefixStr); separator="\n") 
 end optimizationComponents;
 
 template optimizationComponents1(ClassAttributes classAttribute, SimCode simCode, String modelNamePrefixStr)

diff --git a/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c b/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c
@@ -561,7 +561,7 @@ static int optimizer_bounds_setings(DATA *data, IPOPT_DATA_ *iData)
   iData->scalf[i] = iData->scalVar[i];
 
   iData->xmin[i] = data->modelData.realVarsData[i].attribute.min*iData->scalVar[i];
-    iData->xmax[i] = data->modelData.realVarsData[i].attribute.max*iData->scalVar[i];
+  iData->xmax[i] = data->modelData.realVarsData[i].attribute.max*iData->scalVar[i];
   }
 
   iData->index_u = data->modelData.nVariablesReal - iData->nu;

diff --git a/SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c b/SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c
@@ -96,11 +96,11 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)
 
   if(ACTIVE_STREAM(LOG_IPOPT)){
     for(i=0; i<iData->nx; ++i)
-      printf("\nx[%i] = %s \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], iData->vmin[i], iData->vmax[i]);
+      printf("\nState[%i]:\t name = %s \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);
     for(; i<iData->nv; ++i)
-      printf("\nu[%i] = %s \t| start=%g \t nominal=%g \t min = %g \t max = %g",i, iData->data->modelData.realVarsData[iData->index_u + i-iData->nx].info.name,iData->v[i],iData->vnom[i], iData->vmin[i], iData->vmax[i]);
+      printf("\nInput[%i]:\t name = %s \t| start=%g \t nominal=%g \t min = %g \t max = %g",i, iData->data->modelData.realVarsData[iData->index_u + i-iData->nx].info.name,iData->v[i],iData->vnom[i], data->modelData.realVarsData[iData->index_u + i-iData->nx].attribute.min, data->modelData.realVarsData[iData->index_u + i-iData->nx].attribute.max);
     if(iData->nc > 0)
-      printf("\nnumber of constraints %i",iData->nc);
+      printf("\nnumber of constraints: %i",iData->nc);
   }
 
   ipoptDebuge(iData,iData->v);