Changeset 20780

Timestamp:

2014-05-23T09:52:40+02:00 (10 years ago)

Author:

lochel

Message:

• remove unnecessary if(ACTIVE_STREAM(..)) statements

Location:

trunk/SimulationRuntime/c

Files:

• optimization/DataManagement/MoveData.c (modified) (1 diff)
• simulation/simulation_input_xml.cpp (modified) (7 diffs)
• simulation/solver/events.c (modified) (1 diff)
• simulation/solver/external_input.c (modified) (1 diff)
• simulation/solver/initialization/initialization.c (modified) (2 diffs)
• simulation/solver/initialization/method_ipopt.c (modified) (1 diff)
• simulation/solver/kinsolSolver.c (modified) (1 diff)
• simulation/solver/mixedSearchSolver.c (modified) (1 diff)
• simulation/solver/nonlinearSolverNewton.c (modified) (1 diff)
• simulation/solver/perform_simulation.c (modified) (2 diffs)
• simulation/solver/stateset.c (modified) (1 diff)

trunk/SimulationRuntime/c/optimization/DataManagement/MoveData.c

@@ -50 +50 @@
  * author: Vitalij Ruge
  */
-int pickUpModelData(DATA* data, SOLVER_INFO* solverInfo){
+int pickUpModelData(DATA* data, SOLVER_INFO* solverInfo)
+{
   const int nReal = data->modelData.nVariablesReal;
   int i, j;

trunk/SimulationRuntime/c/simulation/simulation_input_xml.cpp

@@ -398 +398 @@
   read_value(mi.md["OPENMODELICAHOME"], &simulationInfo->OPENMODELICAHOME);
   infoStreamPrint(LOG_SIMULATION, 0, "OPENMODELICAHOME: %s", simulationInfo->OPENMODELICAHOME);
-  if (ACTIVE_STREAM(LOG_SIMULATION)) messageClose(LOG_SIMULATION);
+  messageClose(LOG_SIMULATION);
 
   modelica_integer nxchk, nychk, npchk;
@@ -428 +428 @@
     || nystrchk != modelData->nVariablesString)
   {
-    if (ACTIVE_WARNING_STREAM(LOG_SIMULATION)) {
+    if (ACTIVE_WARNING_STREAM(LOG_SIMULATION))
+    {
       warningStreamPrint(LOG_SIMULATION, 1, "Error, input data file does not match model.");
       warningStreamPrint(LOG_SIMULATION, 0, "nx in setup file: %ld from model code: %d", nxchk, (int)modelData->nStates);
@@ -466 +467 @@
     debugStreamPrint(LOG_DEBUG, 0, "real %s: mapAlias[%s] = %ld", debugName, info.name, j); \
   } \
-  if (ACTIVE_STREAM(LOG_DEBUG)) messageClose(LOG_DEBUG);
+  messageClose(LOG_DEBUG);
 
   READ_VARIABLES(modelData->realVarsData,mi.rSta,REAL_ATTRIBUTE,"real states",0,modelData->nStates,mapAlias);
@@ -529 +530 @@
                 modelData->realAlias[i].aliasType ? ((modelData->realAlias[i].aliasType==2) ? "time" : "real parameters") : "real variables");
   }
-  if (ACTIVE_STREAM(LOG_DEBUG)) messageClose(LOG_DEBUG);
+  messageClose(LOG_DEBUG);
 
   /*
@@ -577 +578 @@
                 modelData->integerAlias[i].aliasType?"integer parameters":"integer variables");
   }
-  if (ACTIVE_STREAM(LOG_DEBUG)) messageClose(LOG_DEBUG);
+  messageClose(LOG_DEBUG);
 
   /*
@@ -625 +626 @@
                 modelData->booleanAlias[i].aliasType ? "boolean parameters" : "boolean variables");
   }
-  if (ACTIVE_STREAM(LOG_DEBUG)) messageClose(LOG_DEBUG);
+  messageClose(LOG_DEBUG);
 
   /*
@@ -673 +674 @@
                 modelData->stringAlias[i].aliasType ? "string parameters" : "string variables");
   }
-  if (ACTIVE_STREAM(LOG_DEBUG)) messageClose(LOG_DEBUG);
+  messageClose(LOG_DEBUG);
 
   XML_ParserFree(parser);

trunk/SimulationRuntime/c/simulation/solver/events.c

@@ -384 +384 @@
   listClear(eventList);
 
-  if(ACTIVE_STREAM(LOG_EVENTS)) {
-    if(listLen(tmpEventList) > 0) {
+  if(ACTIVE_STREAM(LOG_EVENTS))
+  {
+    if(listLen(tmpEventList) > 0)
+    {
       debugStreamPrint(LOG_EVENTS, 0, "found events: ");
-    } else {
+    }
+    else
+    {
       debugStreamPrint(LOG_EVENTS, 0, "found event: ");
     }
   }
-  while(listLen(tmpEventList) > 0) {
+  while(listLen(tmpEventList) > 0)
+  {
     event_id = *((long*)listFirstData(tmpEventList));
     listPopFront(tmpEventList);

trunk/SimulationRuntime/c/simulation/solver/external_input.c

@@ -103 +103 @@
     }
 
-    if(ACTIVE_STREAM(LOG_SIMULATION)){
+    if(ACTIVE_STREAM(LOG_SIMULATION))
+    {
       printf("\nExternal Input");
       printf("\n========================================================");

trunk/SimulationRuntime/c/simulation/solver/initialization/initialization.c

@@ -74 +74 @@
   if(1e-5 < funcValue)
   {
-    if (ACTIVE_STREAM(LOG_INIT)) {
+    if (ACTIVE_STREAM(LOG_INIT))
+    {
       infoStreamPrint(LOG_INIT, 1, "error in initialization. System of initial equations are not consistent\n(least square function value is %g)", funcValue);
       for(i=0; i<initData->nInitResiduals; i++) {
@@ -595 +596 @@
   dumpInitialization(data,initData);
   retVal = reportResidualValue(initData);
-  if (ACTIVE_STREAM(LOG_INIT)) messageClose(LOG_INIT);
+  messageClose(LOG_INIT);
   freeInitData(initData);
 

trunk/SimulationRuntime/c/simulation/solver/initialization/method_ipopt.c

@@ -216 +216 @@
          */
         infoStreamPrint(LOG_INIT, 0, "ipopt using symbolic sparse jacobian G");
-        if(ACTIVE_STREAM(LOG_INIT)) {
+        if(ACTIVE_STREAM(LOG_INIT))
+        {
           infoStreamPrint(LOG_INIT, 0, "sparsity pattern");
           for(i=0; i<n; ++i) {

trunk/SimulationRuntime/c/simulation/solver/kinsolSolver.c

@@ -260 +260 @@
     infoStreamPrint(LOG_NLS, 0, "KINDlsGetNumJacEvals     = %5ld", nje);
     infoStreamPrint(LOG_NLS, 0, "KINDlsGetNumFuncEvals    = %5ld", nfeD);
-    if (ACTIVE_STREAM(LOG_NLS)) messageClose(LOG_NLS);
+    messageClose(LOG_NLS);
 
     /* free memory */

trunk/SimulationRuntime/c/simulation/solver/mixedSearchSolver.c

@@ -303 +303 @@
   }while(!found_solution);
 
-  if(ACTIVE_STREAM(LOG_NLS)) messageClose(LOG_NLS);
+  messageClose(LOG_NLS);
   debugStreamPrint(LOG_NLS, 0, "####  Finished mixed equation system in steps %d.\n", stepCount);
   return success;

trunk/SimulationRuntime/c/simulation/solver/nonlinearSolverNewton.c

@@ -381 +381 @@
   }
 
-  if (ACTIVE_STREAM(LOG_NLS)) messageClose(LOG_NLS);
+  messageClose(LOG_NLS);
 
   return success;

trunk/SimulationRuntime/c/simulation/solver/perform_simulation.c

@@ -195 +195 @@
 
       saveZeroCrossings(data);
-      if (ACTIVE_STREAM(LOG_SOLVER)) messageClose(LOG_SOLVER);
+      messageClose(LOG_SOLVER);
 
 
@@ -210 +210 @@
           sim_result.emit(&sim_result,data);
         handleEvents(data, solverInfo->eventLst, &(solverInfo->currentTime), solverInfo);
-        if (ACTIVE_STREAM(LOG_EVENTS)) messageClose(LOG_EVENTS);
+        messageClose(LOG_EVENTS);
         threadData->currentErrorStage = ERROR_SIMULATION;
 

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

@@ -281 +281 @@
         infoStreamPrint(LOG_DSS, 1, "select new states at time %f", data->localData[0]->timeValue);
         setAMatrix(newEnable, nCandidates, nStates, A, states, statecandidates, data);
-        if (ACTIVE_STREAM(LOG_DSS)) messageClose(LOG_DSS);
+        messageClose(LOG_DSS);
       }
       ret = -1;