Fix typo

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24670 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 20, 2015 · 18a23d0 · 18a23d0
1 parent fa33eb3
commit 18a23d0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -329,16 +329,16 @@ int dassl_initial(DATA* data, SOLVER_INFO* solverInfo, DASSL_DATA *dasslData)
     {
       if (ACTIVE_WARNING_STREAM(LOG_SOLVER))
       {
-        warningStreamPrint(LOG_SOLVER, 1, "unrecognized jacobain calculation method %s, current options are:", (const char*)omc_flagValue[FLAG_DASSL_JACOBIAN]);
+        warningStreamPrint(LOG_SOLVER, 1, "unrecognized jacobian calculation method %s, current options are:", (const char*)omc_flagValue[FLAG_DASSL_JACOBIAN]);
         for(i=1; i < DASSL_JAC_MAX; ++i)
         {
           warningStreamPrint(LOG_SOLVER, 0, "  %-15s [%s]", dasslJacobianMethodStr[i], dasslJacobianMethodDescStr[i]);
         }
         messageClose(LOG_SOLVER);
       }
-      throwStreamPrint(data->threadData,"unrecognized jacobain calculation method %s", (const char*)omc_flagValue[FLAG_DASSL_JACOBIAN]);
+      throwStreamPrint(data->threadData,"unrecognized jacobian calculation method %s", (const char*)omc_flagValue[FLAG_DASSL_JACOBIAN]);
     }
-  /* default case colored numerical jacobain */
+  /* default case colored numerical jacobian */
   }
   else{
     dasslData->dasslJacobian = DASSL_COLOREDNUMJAC;
@@ -387,7 +387,7 @@ int dassl_initial(DATA* data, SOLVER_INFO* solverInfo, DASSL_DATA *dasslData)
       dasslData->jacobianFunction =  dummy_Jacobian;
       break;
     default:
-      throwStreamPrint(data->threadData,"unrecognized jacobain calculation method %s", (const char*)omc_flagValue[FLAG_DASSL_JACOBIAN]);
+      throwStreamPrint(data->threadData,"unrecognized jacobian calculation method %s", (const char*)omc_flagValue[FLAG_DASSL_JACOBIAN]);
       break;
   }
   infoStreamPrint(LOG_SOLVER, 0, " - jacobian is calculated by %s", dasslJacobianMethodDescStr[dasslData->dasslJacobian]);

diff --git a/SimulationRuntime/c/simulation/solver/model_help.c b/SimulationRuntime/c/simulation/solver/model_help.c
@@ -914,7 +914,7 @@ void initializeDataStruc(DATA *data)
   data->simulationInfo.stateSetData = (STATE_SET_DATA*) GC_malloc_uncollectable(data->modelData.nStateSets*sizeof(STATE_SET_DATA));
   data->callback->initializeStateSets(data->modelData.nStateSets, data->simulationInfo.stateSetData, data);
 
-  /* buffer for analytical jacobains */
+  /* buffer for analytical jacobians */
   data->simulationInfo.analyticJacobians = (ANALYTIC_JACOBIAN*) GC_malloc_uncollectable(data->modelData.nJacobians*sizeof(ANALYTIC_JACOBIAN));
 
   data->modelData.modelDataXml.functionNames = NULL;

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c
@@ -395,7 +395,7 @@ static int wrapper_fvec_hybrj(const integer* n, const double* x, double* f, doub
     if(ACTIVE_STREAM(LOG_NLS_RES))
       infoStreamPrint(LOG_NLS_RES, 0, "-- begin calculating jacobian --");
 
-    /* call apropreated jacobain function */
+    /* call apropreated jacobian function */
     if(systemData->jacobianIndex != -1){
       integer iflagtmp = 1;
       wrapper_fvec_hybrj(n, x, f, fjac, ldjac, &iflagtmp, dataSys);

diff --git a/SimulationRuntime/c/util/simulation_options.c b/SimulationRuntime/c/util/simulation_options.c
@@ -89,7 +89,7 @@ const char *FLAG_DESC[FLAG_MAX+1] = {
   /* FLAG_ALARM */                 "aborts after the given number of seconds (0 disables)",
   /* FLAG_CLOCK */                 "selects the type of clock to use -clock=RT, -clock=CYC or -clock=CPU",
   /* FLAG_CPU */                   "dumps the cpu-time into the results-file",
-  /* FLAG_DASSL_JACOBIAN */        "selects the type of the jacobians that is used for the dassl solver.\n  dasslJacobain=[coloredNumerical (default) |numerical|internalNumerical|coloredSymbolical|symbolical].",
+  /* FLAG_DASSL_JACOBIAN */        "selects the type of the jacobians that is used for the dassl solver.\n  dasslJacobian=[coloredNumerical (default) |numerical|internalNumerical|coloredSymbolical|symbolical].",
   /* FLAG_DASSL_NO_ROOTFINDING */  "flag deactivates the internal root finding procedure of dassl.",
   /* FLAG_DASSL_NO_RESTART */      "flag deactivates the restart of dassl after an event is performed.",
   /* FLAG_EMIT_PROTECTED */        "emits protected variables to the result-file",