Skip to content

Commit

Permalink
[Janitor mode] Fix tabs
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17191 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Sep 11, 2013
1 parent 6a8337a commit cf072ef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions SimulationRuntime/c/optimization/mainOptimizer/ipoptODE.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)

cflags = omc_flagValue[FLAG_LS_IPOPT];
if(!cflags)
cflags = "mumps";
cflags = "mumps";

/*ToDo*/
for(i=0; i<(*iData).nx; i++)
Expand Down Expand Up @@ -136,9 +136,9 @@ int startIpopt(DATA* data, SOLVER_INFO* solverInfo, int flag)
AddIpoptStrOption(nlp, "hessian_approximation", "limited-memory");

if(cflags)
AddIpoptStrOption(nlp, "linear_solver", cflags);
AddIpoptStrOption(nlp, "linear_solver", cflags);
else
AddIpoptStrOption(nlp, "linear_solver", "mumps");
AddIpoptStrOption(nlp, "linear_solver", "mumps");

/* AddIpoptStrOption(nlp, "derivative_test", "second-order"); */
/* AddIpoptStrOption(nlp, "derivative_test_print_all", "yes"); */
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/util/simulation_options.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const int FLAG_TYPE[FLAG_MAX] = {
/* FLAG_IOM */ FLAG_TYPE_OPTION,
/* FLAG_L */ FLAG_TYPE_OPTION,
/* FLAG_LS */ FLAG_TYPE_OPTION,
/* FLAG_LS_IPOPT */ FLAG_TYPE_OPTION,
/* FLAG_LS_IPOPT */ FLAG_TYPE_OPTION,
/* FLAG_LV */ FLAG_TYPE_OPTION,
/* FLAG_MEASURETIMEPLOTFORMAT */ FLAG_TYPE_OPTION,
/* FLAG_NLS */ FLAG_TYPE_OPTION,
Expand Down

0 comments on commit cf072ef

Please sign in to comment.