Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
Rename --solver-threads option to confirm with Cpp naming
Browse files Browse the repository at this point in the history
Belonging to [master]:
  - #2813
  • Loading branch information
rfranke authored and OpenModelica-Hudson committed Dec 3, 2018
1 parent c842427 commit 6770e63
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Compiler/Template/CodegenCpp.tpl
Expand Up @@ -2283,7 +2283,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
opts["-R"] = "<%simulationLibDir(simulationCodeTarget(),simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace)%>";
opts["-M"] = "<%moLib%>";
opts["-F"] = "<%simulationResults(getRunningTestsuite(),simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace)%>";
opts["--solverThreads"] = "<%if(intGt(getConfigInt(NUM_PROC), 0)) then getConfigInt(NUM_PROC) else 1%>";
opts["--solver-threads"] = "<%if(intGt(getConfigInt(NUM_PROC), 0)) then getConfigInt(NUM_PROC) else 1%>";
<%if (stringEq(settings.outputFormat, "empty")) then 'opts["-O"] = "none";' else ""%>
<%
match(getConfigString(PROFILING_LEVEL))
Expand Down
Expand Up @@ -333,7 +333,7 @@ SimSettings OMCFactory::readSimulationParameter(int argc, const char* argv[])
descHidden.add_options()
("ignored", po::value<vector<string> >(), "ignored options")
("unrecognized", po::value<vector<string> >(), "unsupported options")
("solverThreads", po::value<int>()->default_value(1), "number of threads that can be used by the solver")
("solver-threads", po::value<int>()->default_value(1), "number of threads that can be used by the solver")
;

po::options_description descAll("All options");
Expand Down Expand Up @@ -377,7 +377,7 @@ SimSettings OMCFactory::readSimulationParameter(int argc, const char* argv[])
double stoptime = vm["stop-time"].as<double>();
double stepsize =vm["step-size"].as<double>();
bool nlsContinueOnError = vm["nls-continue"].as<bool>();
int solverThreads = vm["solverThreads"].as<int>();
int solverThreads = vm["solver-threads"].as<int>();

if (!(stepsize > 0.0))
stepsize = (stoptime - starttime) / vm["number-of-intervals"].as<int>();
Expand Down

0 comments on commit 6770e63

Please sign in to comment.