Changeset 2243 for trunk/Clp/src

Timestamp:

Jan 6, 2017 6:48:48 AM (3 years ago)

Author:

forrest

Message:

I hope 2017 gets better for stupid mistakes

Location:

trunk/Clp/src

Files:

• ClpCholeskyMumps.cpp (modified) (2 diffs)
• ClpCholeskyMumps.hpp (modified) (1 diff)

trunk/Clp/src/ClpCholeskyMumps.cpp

@@ -30 +30 @@
 // Default Constructor
 //-------------------------------------------------------------------
-ClpCholeskyMumps::ClpCholeskyMumps (int denseThreshold)
+ClpCholeskyMumps::ClpCholeskyMumps (int denseThreshold,int logLevel)
      : ClpCholeskyBase(denseThreshold)
 {
@@ -60 +60 @@
      mumps_->ICNTL(24) = 1; // Deal with zeros on diagonal
      mumps_->CNTL(3) = 1.0e-20; // drop if diagonal less than this
-     // output off
-     mumps_->ICNTL(1) = -1;
-     mumps_->ICNTL(2) = -1;
-     mumps_->ICNTL(3) = -1;
-     mumps_->ICNTL(4) = 0;
+     if (!logLevel) {
+       // output off
+       mumps_->ICNTL(1) = -1;
+       mumps_->ICNTL(2) = -1;
+       mumps_->ICNTL(3) = -1;
+       mumps_->ICNTL(4) = 0;
+     }
 }
 

trunk/Clp/src/ClpCholeskyMumps.hpp

@@ -44 +44 @@
      /** Constructor which has dense columns activated.
          Default is off. */
-     ClpCholeskyMumps(int denseThreshold = -1);
+     ClpCholeskyMumps(int denseThreshold = -1,int logLevel=0);
      /** Destructor  */
      virtual ~ClpCholeskyMumps();