- removed tabs

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13017 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 21, 2012 · 64d35ec · 64d35ec
1 parent a3d71e7
commit 64d35ec
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -466,15 +466,15 @@ int callSolver(DATA* simData, string method, string outputFormat,
     }
     retVal = solver_main(simData, start, stop, stepSize, outputSteps, tolerance, init_initMethod.c_str(), init_optiMethod.c_str(), init_file.c_str(), init_time, 2, outVars);
   } else if (method == std::string("dassl") ||
-          method == std::string("dasslwort")  ||
-          method == std::string("dasslSymJac") ||
-          method == std::string("dasslNumJac") ||
-          method == std::string("dasslColorSymJac") ||
-          method == std::string("dasslColorNumJac")) {
-	if (DEBUG_FLAG(LOG_SOLVER)) {
-	  cout << "Recognized solver: " << method << "." << endl; fflush(NULL);
-	}
-	retVal = solver_main(simData, start, stop, stepSize, outputSteps, tolerance, init_initMethod.c_str(), init_optiMethod.c_str(), init_file.c_str(), init_time, 3, outVars);
+             method == std::string("dasslwort")  ||
+             method == std::string("dasslSymJac") ||
+             method == std::string("dasslNumJac") ||
+             method == std::string("dasslColorSymJac") ||
+             method == std::string("dasslColorNumJac")) {
+    if (DEBUG_FLAG(LOG_SOLVER)) {
+      cout << "Recognized solver: " << method << "." << endl; fflush(NULL);
+    }
+    retVal = solver_main(simData, start, stop, stepSize, outputSteps, tolerance, init_initMethod.c_str(), init_optiMethod.c_str(), init_file.c_str(), init_time, 3, outVars);
   } else if (method == std::string("inline-euler")) {
     if (!_omc_force_solver || std::string(_omc_force_solver) != std::string("inline-euler")) {
       cout << "Recognized solver: " << method

diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -38,16 +38,23 @@
 
 #include <string.h>
 
-const char *dasslMethodStr[DASSL_MAX] = {"unknown", "dassl", "dasslwort", "dasslSymJac",
-                                          "dasslNumJac", "dasslColorSymJac",
-                                          "dasslColorNumJac"};
-
-const char *dasslMethodStrDescStr[DASSL_MAX] = {"unknown", "normal dassl",
-											                        "dassl without internal root finding",
-                                              "dassl with symbolic jacobian",
-                                              "dassl with numerical jacobian",
-                                              "dassl with colored symbolic jacobian",
-                                              "dassl with colored numerical jacobian"};
+const char *dasslMethodStr[DASSL_MAX] = {"unknown", 
+                                         "dassl", 
+                                         "dasslwort",
+                                         "dasslSymJac",
+                                         "dasslNumJac",
+                                         "dasslColorSymJac",
+                                         "dasslColorNumJac"
+                                        };
+
+const char *dasslMethodStrDescStr[DASSL_MAX] = {"unknown", 
+                                                "normal dassl",
+                                                "dassl without internal root finding",
+                                                "dassl with symbolic jacobian",
+                                                "dassl with numerical jacobian",
+                                                "dassl with colored symbolic jacobian",
+                                                "dassl with colored numerical jacobian"
+                                               };