Changeset 2346


Ignore:
Timestamp:
Oct 15, 2018 6:37:38 PM (7 months ago)
Author:
stefan
Message:

replace remaining COIN_HAS_MUMPS by CLP_HAS_MUMPS in cpp files

Location:
branches/autotools-update/Clp/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Clp/src/ClpSimplex.cpp

    r2339 r2346  
    64006400     ClpCholeskyTaucs * cholesky = new ClpCholeskyTaucs();
    64016401     barrier.setCholesky(cholesky);
    6402 #elifdef COIN_HAS_MUMPS
     6402#elifdef CLP_HAS_MUMPS
    64036403     if (!doKKT) {
    64046404          ClpCholeskyMumps * cholesky = new ClpCholeskyMumps();
  • branches/autotools-update/Clp/src/ClpSolve.cpp

    r2339 r2346  
    32443244          break;
    32453245#endif
    3246 #ifdef COIN_HAS_MUMPS
     3246#ifdef CLP_HAS_MUMPS
    32473247          case 6: {
    32483248               if (!doKKT) {
  • branches/autotools-update/Clp/src/ClpSolver.cpp

    r2312 r2346  
    9090extern int debugInt[24];
    9191#endif
    92 #if defined(COIN_HAS_WSMP) || defined(COIN_HAS_AMD) || defined(COIN_HAS_CHOLMOD) || defined(TAUCS_BARRIER) || defined(COIN_HAS_MUMPS)
     92#if defined(COIN_HAS_WSMP) || defined(COIN_HAS_AMD) || defined(COIN_HAS_CHOLMOD) || defined(TAUCS_BARRIER) || defined(CLP_HAS_MUMPS)
    9393#define FOREIGN_BARRIER
    9494#endif
  • branches/autotools-update/Clp/src/unitTest.cpp

    r2339 r2346  
    8181static int barrierAvailable = 2;
    8282static std::string nameBarrier = "barrier-WSSMP";
    83 #elif defined(COIN_HAS_MUMPS)
     83#elif defined(CLP_HAS_MUMPS)
    8484static int barrierAvailable = 3;
    8585static std::string nameBarrier = "barrier-MUMPS";
     
    11951195                         nameAlgorithm = "barrier-WSSMP";
    11961196#endif
    1197 #ifdef COIN_HAS_MUMPS
     1197#ifdef CLP_HAS_MUMPS
    11981198                         solveOptions.setSpecialOption(4, 6);
    11991199                         nameAlgorithm = "barrier-MUMPS";
Note: See TracChangeset for help on using the changeset viewer.