Skip to content

Commit

Permalink
- Fixed typos in dassl simulation flags.
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23248 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adeas31 committed Nov 6, 2014
1 parent 26b3ad3 commit c080d16
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions SimulationRuntime/c/simulation/solver/dassl.c
Expand Up @@ -53,7 +53,7 @@
static const char *dasslJacobianMethodStr[DASSL_JAC_MAX] = {"unknown",
"coloredNumerical",
"coloredSymbolical",
"intenalNumerical",
"internalNumerical",
"symbolical",
"numerical"
};
Expand Down Expand Up @@ -364,8 +364,8 @@ int dassl_initial(DATA* data, SOLVER_INFO* solverInfo, DASSL_DATA *dasslData)
infoStreamPrint(LOG_SOLVER, 0, " - jacobian is calculated by %s", dasslJacobianMethodDescStr[dasslData->dasslJacobian]);


/* if FLAG_DASSL_NO_ROOTFINDUNG is set, choose dassl with out internal root finding */
if(omc_flag[FLAG_DASSL_NO_ROOTFINDUNG])
/* if FLAG_DASSL_NO_ROOTFINDING is set, choose dassl with out internal root finding */
if(omc_flag[FLAG_DASSL_NO_ROOTFINDING])
{
dasslData->dasslRootFinding = 0;
dasslData->zeroCrossingFunction = dummy_zeroCrossing;
Expand Down
10 changes: 5 additions & 5 deletions SimulationRuntime/c/util/simulation_options.c
Expand Up @@ -38,7 +38,7 @@ const char *FLAG_NAME[FLAG_MAX+1] = {
/* FLAG_CLOCK */ "clock",
/* FLAG_CPU */ "cpu",
/* FLAG_DASSL_JACOBIAN */ "dasslJacobian",
/* FLAG_DASSL_NO_ROOTFINDUNG */ "dasslnoRootFindung",
/* FLAG_DASSL_NO_ROOTFINDING */ "dasslnoRootFinding",
/* FLAG_DASSL_NO_RESTART */ "dasslnoRestart",
/* FLAG_EMIT_PROTECTED */ "emit_protected",
/* FLAG_F */ "f",
Expand Down Expand Up @@ -91,8 +91,8 @@ 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=[coloredNumericalJacobian|numericalJacobian|intenalNumericalJacobian|coloredSymbolicalJacobian|symbolicalJacobian].",
/* FLAG_DASSL_NO_ROOTFINDUNG */ "flag deactivates the internal root finding procedure of dassl.",
/* FLAG_DASSL_JACOBIAN */ "selects the type of the jacobians that is used for the dassl solver.\n dasslJacobain=[coloredNumericalJacobian|numericalJacobian|internalNumericalJacobian|coloredSymbolicalJacobian|symbolicalJacobian].",
/* 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",
/* FLAG_F */ "value specifies a new setup XML file to the generated simulation code",
Expand Down Expand Up @@ -151,7 +151,7 @@ const char *FLAG_DETAILED_DESC[FLAG_MAX+1] = {
"\n\t -dasslJacobian=coloredSymbolical - colored symbolical jacobian. Only usable if the simulation is compiled with +generateSymbolicJacobian or +generateSymbolicLinearization."
"\n\t -dasslJacobian=numerical - numerical jacobian"
"\n\t -dasslJacobian=symbolical - symbolical jacobian. Only usable if the simulation is compiled with +generateSymbolicJacobian or +generateSymbolicLinearization.",
/* FLAG_DASSL_NO_ROOTFINDUNG */ "flag deactivates the internal root finding procedure of dassl.",
/* 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",
/* FLAG_F */ "value specifies a new setup XML file to the generated simulation code",
Expand Down Expand Up @@ -205,7 +205,7 @@ const int FLAG_TYPE[FLAG_MAX] = {
/* FLAG_CLOCK */ FLAG_TYPE_OPTION,
/* FLAG_CPU */ FLAG_TYPE_FLAG,
/* FLAG_DASSL_JACOBIAN */ FLAG_TYPE_OPTION,
/* FLAG_DASSL_NO_ROOTFINDUNG */ FLAG_TYPE_FLAG,
/* FLAG_DASSL_NO_ROOTFINDING */ FLAG_TYPE_FLAG,
/* FLAG_DASSL_NO_RESTART */ FLAG_TYPE_FLAG,
/* FLAG_EMIT_PROTECTED */ FLAG_TYPE_FLAG,
/* FLAG_F */ FLAG_TYPE_OPTION,
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/util/simulation_options.h
Expand Up @@ -45,7 +45,7 @@ enum _FLAG
FLAG_CLOCK,
FLAG_CPU,
FLAG_DASSL_JACOBIAN,
FLAG_DASSL_NO_ROOTFINDUNG,
FLAG_DASSL_NO_ROOTFINDING,
FLAG_DASSL_NO_RESTART,
FLAG_EMIT_PROTECTED,
FLAG_F,
Expand Down

0 comments on commit c080d16

Please sign in to comment.