Changeset 15372

Timestamp:

2013-02-27T18:35:22+01:00 (11 years ago)

Author:

lochel

Message:

• get rid of compiler warnings for c-runtime
• minor changes (typo, spaces, ...)

Location:

trunk/SimulationRuntime/c

Files:

• simulation/simulation_runtime.cpp (modified) (9 diffs)
• simulation/solver/linearSolverLapack.c (modified) (6 diffs)
• simulation/solver/linearSolverLapack.h (modified) (1 diff)
• simulation/solver/stateset.c (modified) (1 diff)
• util/omc_error.h (modified) (1 diff)

trunk/SimulationRuntime/c/simulation/simulation_runtime.cpp

@@ -340 +340 @@
   string tmp = ("^(" + varfilter + ")$");
   const char *filter = tmp.c_str(); // C++ strings are horrible to work with...
-  if(modelData->nStates > 0 && 0 == strcmp(modelData->realVarsData[0].info.name,"$dummy")) {
+  if(modelData->nStates > 0 && 0 == strcmp(modelData->realVarsData[0].info.name, "$dummy")) {
     modelData->realVarsData[0].filterOutput = 1;
     modelData->realVarsData[modelData->nStates].filterOutput = 1;
@@ -583 +583 @@
     retVal = linearize(data);
     rt_accumulate(SIM_TIMER_LINEARIZE);
-    INFO(LOG_STDOUT,"Linear model is created!");
+    INFO(LOG_STDOUT, "Linear model is created!");
   }
 
@@ -602 +602 @@
     rt_accumulate(SIM_TIMER_TOTAL);
     const char* plotFormat = omc_flagValue[FLAG_MEASURETIMEPLOTFORMAT];
-    retVal = printModelInfo(data, modelInfo.c_str(), plotFile.c_str(), plotFormat ? plotFormat : "svg",
+    retVal = printModelInfo(data, modelInfo.c_str(), plotFile.c_str(), plotFormat ? plotFormat : "svg", 
         data->simulationInfo.solverMethod, data->simulationInfo.outputFormat, result_file_cstr.c_str()) && retVal;
   }
@@ -644 +644 @@
     return 1;
   }
-  sim_result.init(&sim_result,simData);
-  INFO2(LOG_SOLVER,"Allocated simulation result data storage for method '%s' and file='%s'", simData->simulationInfo.outputFormat, sim_result.filename);
+  sim_result.init(&sim_result, simData);
+  INFO2(LOG_SOLVER, "Allocated simulation result data storage for method '%s' and file='%s'", simData->simulationInfo.outputFormat, sim_result.filename);
   return 0;
 }
@@ -659 +659 @@
  * "dopri5" calls an embedded DOPRI5(4)-solver with stepsize control
  */
-int callSolver(DATA* simData, string result_file_cstr, string init_initMethod,
+int callSolver(DATA* simData, string result_file_cstr, string init_initMethod, 
     string init_optiMethod, string init_file, double init_time, int lambda_steps, string outputVariablesAtEnd, int cpuTime)
 {
@@ -730 +730 @@
   } else if(simData->simulationInfo.solverMethod == std::string("qss")) {
     INFO1(LOG_SOLVER, " | Recognized solver: %s.", simData->simulationInfo.solverMethod);
-    retVal = qss_main(argc, argv, simData->simulationInfo.startTime,
-                      simData->simulationInfo.stopTime, simData->simulationInfo.stepSize,
+    retVal = qss_main(argc, argv, simData->simulationInfo.startTime, 
+                      simData->simulationInfo.stopTime, simData->simulationInfo.stepSize, 
                       simData->simulationInfo.numSteps, simData->simulationInfo.tolerance, 3);
 #endif
@@ -740 +740 @@
   }
 
-  sim_result.free(&sim_result,simData);
+  sim_result.free(&sim_result, simData);
 
   return retVal;
@@ -818 +818 @@
   function_initMemoryState();
   read_input_xml(argc, argv, &(data->modelData), &(data->simulationInfo));
-  initializeOutputFilter(&(data->modelData),data->simulationInfo.variableFilter);
+  initializeOutputFilter(&(data->modelData), data->simulationInfo.variableFilter);
 
   /* allocate memory for mixed system solvers */
@@ -877 +877 @@
   printf("<phase>UNKNOWN</phase>\n");
   printf("<currentStepSize>%g</currentStepSize>\n", data->simulationInfo.stepSize);
-  printf("<oldTime>%.12g</oldTime>\n",data->localData[1]->timeValue);
-  printf("<oldTime2>%.12g</oldTime2>\n",data->localData[2]->timeValue);
-  printf("<diffOldTime>%g</diffOldTime>\n",data->localData[1]->timeValue-data->localData[2]->timeValue);
-  printf("<currentTime>%g</currentTime>\n",data->localData[0]->timeValue);
-  printf("<diffCurrentTime>%g</diffCurrentTime>\n",data->localData[0]->timeValue-data->localData[1]->timeValue);
+  printf("<oldTime>%.12g</oldTime>\n", data->localData[1]->timeValue);
+  printf("<oldTime2>%.12g</oldTime2>\n", data->localData[2]->timeValue);
+  printf("<diffOldTime>%g</diffOldTime>\n", data->localData[1]->timeValue-data->localData[2]->timeValue);
+  printf("<currentTime>%g</currentTime>\n", data->localData[0]->timeValue);
+  printf("<diffCurrentTime>%g</diffCurrentTime>\n", data->localData[0]->timeValue-data->localData[1]->timeValue);
   */
   printf("</status>\n");

trunk/SimulationRuntime/c/simulation/solver/linearSolverLapack.c

@@ -60 +60 @@
 
   data->ipiv = (integer*) malloc(size*sizeof(modelica_integer));
-  ASSERT(data->ipiv, "Could not allocate datae for linear solver lapack.");
+  ASSERT(data->ipiv, "Could not allocate data for linear solver lapack.");
   data->nrhs = 1;
   data->info = 0;
@@ -74 +74 @@
 {
   DATA_LAPACK* data = (DATA_LAPACK*) *voiddata;
-
+  
   free(data->ipiv);
 
   return 0;
 }
-
 
 /*! \fn solve linear system with lapack method
@@ -96 +95 @@
    * We want to look it up among all equations. */
   int eqSystemNumber = systemData->equationIndex;
-
   int success = 1;
 
@@ -107 +105 @@
   systemData->setb(data, systemData);
 
-  dgesv_( (integer*) &systemData->size,
-          (integer*) &solverData->nrhs,
-          systemData->A,
-          (integer*) &systemData->size,
-          solverData->ipiv,
-          systemData->b,
-          (integer*) &systemData->size,
-          &solverData->info);
+  dgesv_((integer*) &systemData->size, 
+         (integer*) &solverData->nrhs, 
+         systemData->A, 
+         (integer*) &systemData->size, 
+         solverData->ipiv, 
+         systemData->b, 
+         (integer*) &systemData->size, 
+         &solverData->info);
 
-  if(solverData->info < 0) {
+  if(solverData->info < 0)
+  {
     WARNING3(LOG_STDOUT, "Error solving linear system of equations (no. %d) at time %f. Argument %d illegal.", (int)systemData->equationIndex, data->localData[0]->timeValue, solverData->info);
     success = 0;
-  }else if(solverData->info > 0) {
-    WARNING4(LOG_STDOUT,
-        "Failed to solve linear system of equations (no. %d) at time %f, system is singular for U[%d,%d].",
+  }
+  else if(solverData->info > 0)
+  {
+    WARNING4(LOG_STDOUT, 
+        "Failed to solve linear system of equations (no. %d) at time %f, system is singular for U[%d, %d].", 
         (int)systemData->equationIndex, data->localData[0]->timeValue, solverData->info+1, solverData->info+1);
 
@@ -131 +132 @@
       char buffer[4096];
       INDENT(LOG_LS);
-      DEBUG(LOG_LS,"Matrix U:");
-      for (l = 0; l < systemData->size; l++)
+      DEBUG(LOG_LS, "Matrix U:");
+      for(l = 0; l < systemData->size; l++)
       {
         buffer[0] = 0;
-        for (k = 0; k < systemData->size; k++)
+        for(k = 0; k < systemData->size; k++)
           sprintf(buffer, "%s%10g ", buffer, systemData->A[l + k*systemData->size]);
-        DEBUG(LOG_LS, buffer);
+        DEBUG1(LOG_LS, "%s", buffer);
       }
-      DEBUG(LOG_LS,"Solution x:");
+      DEBUG(LOG_LS, "Solution x:");
       buffer[0] = 0;
-      for (k = 0; k < systemData->size; k++)
+      for(k = 0; k < systemData->size; k++)
         sprintf(buffer, "%s%10g ", buffer, systemData->b[k]);
-      DEBUG(LOG_LS, buffer);
-      DEBUG(LOG_LS,"Solution x:");
+      DEBUG1(LOG_LS, "%s", buffer);
+      DEBUG(LOG_LS, "Solution x:");
       buffer[0] = 0;
-      for (k = 0; k < systemData->size; k++)
+      for(k = 0; k < systemData->size; k++)
         sprintf(buffer, "%s%10g ", buffer, systemData->b[k]);
-      DEBUG(LOG_LS, buffer);
+      DEBUG1(LOG_LS, "%s", buffer);
       RELEASE(LOG_LS);
     }
@@ -158 +159 @@
   memcpy(systemData->x, systemData->b, systemData->size*(sizeof(modelica_real)));
 
-
-
   return success;
 }

trunk/SimulationRuntime/c/simulation/solver/linearSolverLapack.h

@@ -39 +39 @@
 
 #ifdef __cplusplus
-extern "C" {
+  extern "C" {
 #endif
 
 #include "blaswrap.h"
 #include "f2c.h"
+
 #ifdef VOID
-#undef VOID
+  #undef VOID
 #endif
 
-extern
-int dgesv_(integer *n, integer *nrhs, doublereal *a, integer
-     *lda, integer *ipiv, doublereal *b, integer *ldb, integer *info);
+extern int dgesv_(integer *n, integer *nrhs, doublereal *a, integer *lda, 
+                  integer *ipiv, doublereal *b, integer *ldb, integer *info);
 
 #ifdef __cplusplus
-}
+  }
 #endif
-
 
 int allocateLapackData(int size, void **data);

trunk/SimulationRuntime/c/simulation/solver/stateset.c

@@ -193 +193 @@
       for(j=0; j < data->simulationInfo.analyticJacobians[jacIndex].sizeCols; j++)
         sprintf(buffer, "%s%.5e ", buffer, jac[i*data->simulationInfo.analyticJacobians[jacIndex].sizeCols+j]);
-      DEBUG(LOG_DSS, buffer);
+      DEBUG1(LOG_DSS, "%s", buffer);
     }
     RELEASE(LOG_DSS);

trunk/SimulationRuntime/c/util/omc_error.h

@@ -65 +65 @@
 extern jmp_buf globalJmpbuf;
 
-/* #define USE_DEBUG_OUTPUT */
+#define USE_DEBUG_OUTPUT
 
 enum LOG_STREAM