Changeset 15186

Timestamp:

2013-02-15T16:38:32+01:00 (11 years ago)

Author:

wbraun

Message:

#2065

• removed LOG_ENDJAC

Location:

trunk/SimulationRuntime/c

Files:

• linearization/linearize.cpp (modified) (10 diffs)
• math-support/ddassl.c (modified) (4 diffs)
• simulation/solver/dassl.c (modified) (6 diffs)
• util/omc_error.c (modified) (2 diffs)
• util/omc_error.h (modified) (1 diff)

trunk/SimulationRuntime/c/linearization/linearize.cpp

@@ -71 +71 @@
   {
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
-    if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+    if(ACTIVE_STREAM(LOG_JAC))
     {
       printf("Caluculate one col:\n");
@@ -77 +77 @@
       {
         INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
-        INFO2(LOG_ENDJAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
       }
     }
@@ -87 +86 @@
       jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
       INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
-      INFO6(LOG_ENDJAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
     }
 
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
   }
-  if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+  if(ACTIVE_STREAM(LOG_JAC))
   {
     INFO(LOG_JAC,"Print jac:");
@@ -114 +112 @@
   {
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
-    if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+    if(ACTIVE_STREAM(LOG_JAC))
     {
       printf("Caluculate one col:\n");
@@ -120 +118 @@
       {
         INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
-        INFO2(LOG_ENDJAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
       }
     }
@@ -130 +127 @@
       jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
       INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
-      INFO6(LOG_ENDJAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
     }
 
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
   }
-  if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+  if(ACTIVE_STREAM(LOG_JAC))
   {
     INFO(LOG_JAC, "Print jac:");
@@ -156 +152 @@
   {
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
-    if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+    if(ACTIVE_STREAM(LOG_JAC))
     {
       printf("Caluculate one col:\n");
       for(j=0;  j < data->simulationInfo.analyticJacobians[index].sizeCols;j++)
-        INFO2((LOG_JAC | LOG_ENDJAC),"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
+        INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
     }
 
@@ -169 +165 @@
       jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
       INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
-      INFO6(LOG_ENDJAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
     }
 
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
   }
-  if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+  if(ACTIVE_STREAM(LOG_JAC))
   {
     INFO(LOG_JAC, "Print jac:");
@@ -195 +190 @@
   {
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
-    if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+    if(ACTIVE_STREAM(LOG_JAC))
     {
       printf("Caluculate one col:\n");
       for(j=0;  j < data->simulationInfo.analyticJacobians[index].sizeCols;j++)
-        INFO2((LOG_JAC | LOG_ENDJAC),"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
+        INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
     }
 
@@ -207 +202 @@
     {
       jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
-      INFO6((LOG_JAC | LOG_ENDJAC),"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
+      INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
     }
 
     data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
   }
-  if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+  if(ACTIVE_STREAM(LOG_JAC))
   {
     INFO(LOG_JAC, "Print jac:");

trunk/SimulationRuntime/c/math-support/ddassl.c

@@ -3749 +3749 @@
 
     /* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
-    if(ipar[1] || ipar[2] ){
+    if(ipar[1]){
        nrow = npdm1;
         i__1 = *neq;
@@ -3772 +3772 @@
         }
     }
-    if(ipar[2])
-        EXIT(0);
     /* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
 
@@ -3816 +3814 @@
     }
     /* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
-    if(ipar[1]  || ipar[2] ){
+    if(ipar[1] ){
             nrow = npdm1;
             i__1 = *neq;
@@ -3839 +3837 @@
             }
     }
-    if(ipar[2])
-        EXIT(0);
    /* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
 

trunk/SimulationRuntime/c/simulation/solver/dassl.c

@@ -157 +157 @@
   dasslData->jroot = (fortran_integer*)  calloc(simData->modelData.nZeroCrossings, sizeof(fortran_integer));
   dasslData->rpar = (double**) malloc(2*sizeof(double*));
-  dasslData->ipar = (fortran_integer*) calloc(numStatistics, sizeof(fortran_integer));
+  dasslData->ipar = (fortran_integer*) malloc(sizeof(fortran_integer));
+  dasslData->ipar[0] = ACTIVE_STREAM(LOG_JAC);
   ASSERT(dasslData->ipar,"out of memory");
   dasslData->atol = (double*) malloc(simData->modelData.nStates*sizeof(double));
   dasslData->rtol = (double*) malloc(simData->modelData.nStates*sizeof(double));
-  dasslData->ipar[0] = ACTIVE_STREAM(LOG_JAC);
-  dasslData->ipar[1] = ACTIVE_STREAM(LOG_ENDJAC);
   dasslData->info = (fortran_integer*) calloc(infoLength, sizeof(fortran_integer));
   ASSERT(dasslData->info,"out of memory");
@@ -735 +734 @@
       matrixA[i*data->modelData.nStates+j] = (dasslData->newdelta[j] - delta[j]) * deltaInv;
       /*
-      if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+      if(ACTIVE_STREAM(LOG_JAC))
       {
         printf("%d: %e\n",i*data->modelData.nStates+j,matrixA[i*data->modelData.nStates+j]);
@@ -746 +745 @@
   /*
    * Debug output
-  if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+  if(ACTIVE_STREAM(LOG_JAC))
   {
     INFO(LOG_SOLVER, "Print jac:");
@@ -832 +831 @@
         else
           j = data->simulationInfo.analyticJacobians[index].sparsePattern.leadindex[ii-1];
-        /*INFO2(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC)," take for %d -> %d\n",j,ii); */
+        /*INFO2(ACTIVE_STREAM(LOG_JAC)," take for %d -> %d\n",j,ii); */
         while(j < data->simulationInfo.analyticJacobians[index].sparsePattern.leadindex[ii])
         {
@@ -838 +837 @@
           k  = l + ii*data->simulationInfo.analyticJacobians[index].sizeRows;
           matrixA[k] = (dasslData->newdelta[l] - delta[l]) * delta_hh[ii];
-          /*INFO5(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC),"write %d. in jac[%d]-[%d,%d]=%e",ii,k,j,l,matrixA[k]);*/
+          /*INFO5(ACTIVE_STREAM(LOG_JAC),"write %d. in jac[%d]-[%d,%d]=%e",ii,k,j,l,matrixA[k]);*/
           j++;
         };
@@ -848 +847 @@
   /*
    * Debug output
-  if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
+  if(ACTIVE_STREAM(LOG_JAC))
   {
     INFO(LOG_SOLVER, "Print jac:");

trunk/SimulationRuntime/c/util/omc_error.c

@@ -50 +50 @@
   "LOG_DSS",
   "LOG_DSS_JAC",
-  "LOG_ENDJAC",
   "LOG_EVENTS",
   "LOG_EVENTS_V",
@@ -78 +77 @@
   "outputs information about dynamic state selection",  /* LOG_DSS */
   "outputs jacobain of the dynamic state selection",    /* LOG_DSS_JAC */
-  "outputs the jacobian and exits the simulation",      /* LOG_ENDJAC */
   "additional information during event iteration",      /* LOG_EVENTS */
   "verbose logging of event system",                    /* LOG_EVENTS_V */
   "additional information during initialization",       /* LOG_INIT */
-  "outputs the jacobian matrix used by the integrator", /* LOG_JAC */
+  "outputs the jacobian matrix used by dassl",          /* LOG_JAC */
   "logging for linear systems",                         /* LOG_LS */
   "verbose logging of linear systems",                  /* LOG_LS_V */

trunk/SimulationRuntime/c/util/omc_error.h

@@ -77 +77 @@
   LOG_DSS,
   LOG_DSS_JAC,
-  LOG_ENDJAC,
   LOG_EVENTS,
   LOG_EVENTS_V,