- fixed: coloring for gradient| Thanks Willi

 - mv Willi's solution from (newadol-c)branch to the trunk
- acktivated: coloring for gradient



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18455 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Vitalij Ruge

Compiler/BackEnd/SimCodeUtil.mo

@@ -5331,7 +5331,7 @@ algorithm
         Debug.fcall(Flags.JAC_DUMP2, print, "analytical Jacobians -> create all SimCode vars for Matrix " +& name +& " time: " +& realString(clock()) +& "\n");
 
         (_, (_, seedVars)) = traveseSimVars(simvars, findSimVars, (diffCompRefs, {}));
-        (_, (_, indexVars)) = traveseSimVars(simvars, findSimVars, (diffedCompRefs, {}));
+        (_, (_, indexVars)) = traveseSimVars(simvars, findSimVarsCompare, (diffedCompRefs, {})); 
         maxColor = listLength(colsColors);        
         s =  intString(listLength(diffedVars));
 
@@ -5368,6 +5368,42 @@ algorithm
   end matchcontinue;
 end findSimVars; 
 
+protected function findSimVarsCompare 
+   input tuple<SimCode.SimVar, tuple<list<DAE.ComponentRef>, list<SimCode.SimVar>>> inTuple; 
+ 	 output tuple<SimCode.SimVar, tuple<list<DAE.ComponentRef>, list<SimCode.SimVar>>> outTuple; 
+ 	algorithm 
+ 		  outTuple := matchcontinue(inTuple) 
+ 		  local 
+ 		    DAE.ComponentRef cref; 
+ 		    list<DAE.ComponentRef> crefs; 
+ 		    list<SimCode.SimVar> simvars; 
+ 		    SimCode.SimVar var; 
+ 		  case((var as (SimCode.SIMVAR(name=cref)), (crefs, simvars))) 
+ 		    equation 
+ 		      true = listMember(cref, crefs); 
+ 		      true = not List.isMemberOnTrue(var, simvars, compareSimVarName); 
+ 		    then ((var, (crefs,  listAppend(simvars, {var})))); 
+ 		  case(_) then inTuple; 
+ 		  end matchcontinue; 
+end findSimVarsCompare; 
+
+protected function compareSimVarName 
+  input SimCode.SimVar var; 
+  input SimCode.SimVar var1; 
+  output Boolean b; 
+ 	algorithm 
+ 		  b := matchcontinue(var, var1) 
+ 		    local 
+ 		      DAE.ComponentRef name, name1; 
+ 		    case (SimCode.SIMVAR(name = name), SimCode.SIMVAR(name = name1))     
+ 		      equation 
+ 		        true = ComponentReference.crefEqual(name, name1); 
+ 		      then true; 
+ 		     
+ 		    else false; 
+ 		  end matchcontinue; 
+end compareSimVarName;
+ 	
 protected function creatallDiffedVars
   // function: help function for creatallDiffedVars
   // author: wbraun

SimulationRuntime/c/optimization/constraints/evalfG.c

@@ -233,10 +233,8 @@ int diff_symColoredODE(double *v, double t, IPOPT_DATA_ *iData, double **J)
     {
       if(cC[ii] == i)
       {
-        if(ii == 0)
-          j = 0;
-        else
-          j = lindex[ii-1];
+        if(ii == 0)j = 0;
+        else j = lindex[ii-1];
 
         for(; j<lindex[ii]; ++j)
         {

SimulationRuntime/c/optimization/goal/evalF.c

@@ -208,19 +208,10 @@ int diff_symColoredObject(IPOPT_DATA_ *iData, double *dF, int this_it)
   int i,j,l,ii,nx;
   int *cC,*lindex;
 
-#if 1
-  for(i = 0; i<iData->nv; ++i)
-  {
-    data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
-    data->callback->functionJacC_column(data);
-    data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
-      dF[i] = data->simulationInfo.analyticJacobians[index].resultVars[this_it];
-  }
-
-#else
-
   /*ToDo*/
   nx = data->simulationInfo.analyticJacobians[index].sizeCols;
+
+  
   cC =  (int*)data->simulationInfo.analyticJacobians[index].sparsePattern.colorCols;
   lindex = (int*)data->simulationInfo.analyticJacobians[index].sparsePattern.leadindex;
 
@@ -236,14 +227,18 @@ int diff_symColoredObject(IPOPT_DATA_ *iData, double *dF, int this_it)
 
     data->callback->functionJacC_column(data);
 
-    for(ii = 0; ii < nx; ii++)
+    for(ii = 0; ii < nx; ++ii)
     {
       if(cC[ii] == i)
       {
         if(ii == 0) j = 0;
         else j = lindex[ii-1];
-        if(j<lindex[ii])
-          dF[ii] = data->simulationInfo.analyticJacobians[index].resultVars[this_it];
+        
+        for(; j<lindex[ii]; ++j)
+        {
+          l = data->simulationInfo.analyticJacobians[index].sparsePattern.index[j];
+          iData->gradFomc[l][ii] = data->simulationInfo.analyticJacobians[index].resultVars[l];
+        }
       }
     }
 
@@ -255,7 +250,8 @@ int diff_symColoredObject(IPOPT_DATA_ *iData, double *dF, int this_it)
       }
     }
   }
-#endif
+  for(i =0; i<=nx; ++i)
+    dF[i] = iData->gradFomc[this_it][i];
   return 0;
 }
 #endif

SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c

@@ -125,8 +125,8 @@ int allocateIpoptData(IPOPT_DATA_ *iData)
   for(i = 0; i < iData->nx; i++)
     iData->J0[i] = (double*) calloc(iData->nv, sizeof(double));
 
-  iData->gradFomc = (double**) malloc((iData->nx+2) * sizeof(double*));
-  for(i = 0; i < iData->nx; i++)
+  iData->gradFomc = (double**) malloc((2) * sizeof(double*));
+  for(i = 0; i < 2; i++)
     iData->gradFomc[i] = (double*) calloc(iData->nv, sizeof(double));
 
   iData->numJ = (double**) malloc(iData->nx * sizeof(double*));

SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c

@@ -129,8 +129,10 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)
 
      AddIpoptStrOption(nlp,"nlp_scaling_method","gradient-based");
      AddIpoptNumOption(nlp,"mu_init",1e-6);
-     if(ACTIVE_STREAM(LOG_JAC))
+     if(ACTIVE_STREAM(LOG_JAC)){
+       AddIpoptIntOption(nlp, "print_level", 4);
        AddIpoptStrOption(nlp, "derivative_test", "second-order");
+     }
      /*AddIpoptStrOption(nlp, "derivative_test_print_all", "yes");*/
     /* AddIpoptNumOption(nlp,"derivative_test_perturbation",1e-6); */
     AddIpoptIntOption(nlp, "max_iter", 5000);