Commit 70801e94 authored by Max Lyon's avatar Max Lyon
Browse files

Merge from Autodesk to VCI

parents 2a21d58a 02426c64
Pipeline #3043 failed with stage
in 5 minutes and 48 seconds
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "BoundConstraint.hh" #include "BoundConstraint.hh"
#include "CoMISo/Utils/CoMISoError.hh" #include "CoMISo/Utils/CoMISoError.hh"
#include <Base/Debug/DebConfig.hh>
#include <Base/Debug/DebTime.hh> #include <Base/Debug/DebTime.hh>
#include <gmm/gmm.h> #include <gmm/gmm.h>
...@@ -50,13 +51,20 @@ IPOPTSolverLean::IPOPTSolverLean() ...@@ -50,13 +51,20 @@ IPOPTSolverLean::IPOPTSolverLean()
: impl_(new Impl) : impl_(new Impl)
{ {
// Switch to HSL if available in Comiso // Switch to HSL if available
#if COMISO_HSL_AVAILABLE #if COMISO_HSL_AVAILABLE
impl_->app_->Options()->SetStringValue("linear_solver", "ma57"); impl_->app_->Options()->SetStringValue("linear_solver", "ma57");
#else #else
impl_->app_->Options()->SetStringValue("linear_solver", "mumps"); impl_->app_->Options()->SetStringValue("linear_solver", "mumps");
#endif #endif
#ifdef DEB_ON
if (!Debug::Config::query().console())
#endif
{// Block any output on cout and cerr from Ipopt.
impl_->app_->Options()->SetStringValue("suppress_all_output", "yes");
}
#ifdef WIN32 #ifdef WIN32
// Restrict memory to be able to run larger problems on windows // Restrict memory to be able to run larger problems on windows
// with the default mumps solver // with the default mumps solver
...@@ -322,7 +330,7 @@ void IPOPTSolverLean::solve( ...@@ -322,7 +330,7 @@ void IPOPTSolverLean::solve(
++cur_pass; ++cur_pass;
DEB_warning(2, "*************** could not find feasible point after " DEB_warning(2, "*************** could not find feasible point after "
<< _max_passes-1 << " -> solving with all lazy constraints...\n"); << _max_passes-1 << " -> solving with all lazy constraints...");
for(unsigned int i=0; i<_lazy_constraints.size(); ++i) for(unsigned int i=0; i<_lazy_constraints.size(); ++i)
if(!lazy_added[i]) if(!lazy_added[i])
constraints.push_back(_lazy_constraints[i]); constraints.push_back(_lazy_constraints[i]);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment