diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79ce74054..4532284e3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -290,6 +290,10 @@ message(STATUS "Checking PETSc ...") include(FindPkgConfig) +if (NOT PKG_CONFIG_FOUND) + message(FATAL_ERROR "The pkg-config facility is required to build GridPACK") +endif() + if (NOT PETSC_DIR) message(FATAL_ERROR "PETSC_DIR is not set, do so with -D PETSC_DIR=...") endif() diff --git a/src/applications/data_sets/input/ca/input.euro.xml b/src/applications/data_sets/input/ca/input.euro.xml index 8aa4787a2..8368ae7c0 100644 --- a/src/applications/data_sets/input/ca/input.euro.xml +++ b/src/applications/data_sets/input/ca/input.euro.xml @@ -16,7 +16,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -28,6 +28,7 @@ more than 1 processor per group. --> + pre_ -pc_type lu -pc_factor_mat_solver_type klu diff --git a/src/applications/data_sets/input/ca/input.polish.xml b/src/applications/data_sets/input/ca/input.polish.xml index 7f1474fad..0b1b14b0f 100644 --- a/src/applications/data_sets/input/ca/input.polish.xml +++ b/src/applications/data_sets/input/ca/input.polish.xml @@ -37,10 +37,11 @@ the klu solver can only be used for a group size of 1. --> + pre_ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/ca/input_118.xml b/src/applications/data_sets/input/ca/input_118.xml index 1581ead2c..1cd15d0d7 100644 --- a/src/applications/data_sets/input/ca/input_118.xml +++ b/src/applications/data_sets/input/ca/input_118.xml @@ -12,10 +12,11 @@ 50 1.0e-3 + pre_ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/ca/input_14.xml b/src/applications/data_sets/input/ca/input_14.xml index 3a56f0835..4d92b4d92 100644 --- a/src/applications/data_sets/input/ca/input_14.xml +++ b/src/applications/data_sets/input/ca/input_14.xml @@ -12,10 +12,11 @@ 50 1.0e-3 + pre_ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/ds/input_145.xml b/src/applications/data_sets/input/ds/input_145.xml index 042514116..1dfc92b14 100644 --- a/src/applications/data_sets/input/ds/input_145.xml +++ b/src/applications/data_sets/input/ds/input_145.xml @@ -9,7 +9,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -85,7 +85,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/ds/input_3000.xml b/src/applications/data_sets/input/ds/input_3000.xml index 1d8038360..b96c21f2e 100644 --- a/src/applications/data_sets/input/ds/input_3000.xml +++ b/src/applications/data_sets/input/ds/input_3000.xml @@ -11,7 +11,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/ds/input_300_cmpld.xml b/src/applications/data_sets/input/ds/input_300_cmpld.xml index dd69ae4bb..ef2d4e9c8 100644 --- a/src/applications/data_sets/input/ds/input_300_cmpld.xml +++ b/src/applications/data_sets/input/ds/input_300_cmpld.xml @@ -11,7 +11,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/ds/input_twoarea.xml b/src/applications/data_sets/input/ds/input_twoarea.xml index 320874a6e..298366a5c 100644 --- a/src/applications/data_sets/input/ds/input_twoarea.xml +++ b/src/applications/data_sets/input/ds/input_twoarea.xml @@ -9,7 +9,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -85,7 +85,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/ds/input_twoarea_renewable_mech.xml b/src/applications/data_sets/input/ds/input_twoarea_renewable_mech.xml index 52b1ab687..1f92a0258 100644 --- a/src/applications/data_sets/input/ds/input_twoarea_renewable_mech.xml +++ b/src/applications/data_sets/input/ds/input_twoarea_renewable_mech.xml @@ -9,7 +9,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -90,7 +90,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/hadrec/input_3g9b_gensal_esst1a_wsieg1_1acmotor_withob.xml b/src/applications/data_sets/input/hadrec/input_3g9b_gensal_esst1a_wsieg1_1acmotor_withob.xml index 9250874c5..bb5dc76ea 100644 --- a/src/applications/data_sets/input/hadrec/input_3g9b_gensal_esst1a_wsieg1_1acmotor_withob.xml +++ b/src/applications/data_sets/input/hadrec/input_3g9b_gensal_esst1a_wsieg1_1acmotor_withob.xml @@ -11,7 +11,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/hadrec/input_tamu500_step005.xml b/src/applications/data_sets/input/hadrec/input_tamu500_step005.xml index d977fa57b..5d85f9224 100644 --- a/src/applications/data_sets/input/hadrec/input_tamu500_step005.xml +++ b/src/applications/data_sets/input/hadrec/input_tamu500_step005.xml @@ -11,7 +11,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/kalman/input_14.xml b/src/applications/data_sets/input/kalman/input_14.xml index 5d75dd723..7c8c022aa 100644 --- a/src/applications/data_sets/input/kalman/input_14.xml +++ b/src/applications/data_sets/input/kalman/input_14.xml @@ -9,7 +9,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -78,7 +78,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/kalman/input_145.xml b/src/applications/data_sets/input/kalman/input_145.xml index 83bfbc555..8d49408be 100644 --- a/src/applications/data_sets/input/kalman/input_145.xml +++ b/src/applications/data_sets/input/kalman/input_145.xml @@ -9,7 +9,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -78,7 +78,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/powerflow/input_118.xml b/src/applications/data_sets/input/powerflow/input_118.xml index 25bd2eb69..fd1b492fe 100644 --- a/src/applications/data_sets/input/powerflow/input_118.xml +++ b/src/applications/data_sets/input/powerflow/input_118.xml @@ -26,7 +26,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/powerflow/input_14.xml b/src/applications/data_sets/input/powerflow/input_14.xml index 32b76d6f7..12642fe64 100644 --- a/src/applications/data_sets/input/powerflow/input_14.xml +++ b/src/applications/data_sets/input/powerflow/input_14.xml @@ -35,7 +35,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -44,7 +44,7 @@ -ksp_view -pc_type lu - -pc_factor_mat_solver_package superlu + -pc_factor_mat_solver_type superlu -ksp_max_it 1 diff --git a/src/applications/data_sets/input/powerflow/input_european.xml b/src/applications/data_sets/input/powerflow/input_european.xml index 4fab6b10e..5c88031ac 100644 --- a/src/applications/data_sets/input/powerflow/input_european.xml +++ b/src/applications/data_sets/input/powerflow/input_european.xml @@ -35,7 +35,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -44,7 +44,7 @@ -ksp_view -pc_type lu - -pc_factor_mat_solver_package superlu + -pc_factor_mat_solver_type superlu -ksp_max_it 1 diff --git a/src/applications/data_sets/input/powerflow/input_polish.xml b/src/applications/data_sets/input/powerflow/input_polish.xml index c25d2f66d..0becc59b8 100644 --- a/src/applications/data_sets/input/powerflow/input_polish.xml +++ b/src/applications/data_sets/input/powerflow/input_polish.xml @@ -35,7 +35,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -44,7 +44,7 @@ -ksp_view -pc_type lu - -pc_factor_mat_solver_package superlu + -pc_factor_mat_solver_type superlu -ksp_max_it 1 diff --git a/src/applications/data_sets/input/rtpr/input_14.xml b/src/applications/data_sets/input/rtpr/input_14.xml index cb5fa1c66..ba49421ba 100644 --- a/src/applications/data_sets/input/rtpr/input_14.xml +++ b/src/applications/data_sets/input/rtpr/input_14.xml @@ -39,7 +39,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/rtpr/input_14_classic.xml b/src/applications/data_sets/input/rtpr/input_14_classic.xml index 9452d44e3..dc1a7d5cd 100644 --- a/src/applications/data_sets/input/rtpr/input_14_classic.xml +++ b/src/applications/data_sets/input/rtpr/input_14_classic.xml @@ -40,7 +40,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/rtpr/input_tamu500.xml b/src/applications/data_sets/input/rtpr/input_tamu500.xml index dca0ec5c2..32642945e 100644 --- a/src/applications/data_sets/input/rtpr/input_tamu500.xml +++ b/src/applications/data_sets/input/rtpr/input_tamu500.xml @@ -29,7 +29,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/se/input_118.xml b/src/applications/data_sets/input/se/input_118.xml index e70e6086c..38741952a 100644 --- a/src/applications/data_sets/input/se/input_118.xml +++ b/src/applications/data_sets/input/se/input_118.xml @@ -20,7 +20,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/input/se/input_14.xml b/src/applications/data_sets/input/se/input_14.xml index cff8d06b8..69ad1142a 100644 --- a/src/applications/data_sets/input/se/input_14.xml +++ b/src/applications/data_sets/input/se/input_14.xml @@ -20,7 +20,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/data_sets/petscoptions/.petscrc b/src/applications/data_sets/petscoptions/.petscrc index d4d40129a..d7f5fb76c 100644 --- a/src/applications/data_sets/petscoptions/.petscrc +++ b/src/applications/data_sets/petscoptions/.petscrc @@ -48,7 +48,7 @@ # Use SuperLU_Dist package for doing the linear solve (Note: PETSc must be configured with --download-superlu_dist --download-metis --download-parmetis) #-dsim_pc_type lu -#-dsim_pc_factor_mat_solver_package superlu_dist +#-dsim_pc_factor_mat_solver_type superlu_dist # Use finite-difference Jacobian #-dsim_snes_fd @@ -63,7 +63,7 @@ -sub_pc_type lu -sub_pc_factor_mat_ordering_type qmd #-pc_type lu -#-pc_factor_mat_solver_package superlu_dist +#-pc_factor_mat_solver_type superlu_dist diff --git a/src/applications/examples/powerflow/118.xml b/src/applications/examples/powerflow/118.xml index c9825b8bf..267b05cd7 100644 --- a/src/applications/examples/powerflow/118.xml +++ b/src/applications/examples/powerflow/118.xml @@ -28,7 +28,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/examples/powerflow/input.xml b/src/applications/examples/powerflow/input.xml index 32b76d6f7..12642fe64 100644 --- a/src/applications/examples/powerflow/input.xml +++ b/src/applications/examples/powerflow/input.xml @@ -35,7 +35,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -44,7 +44,7 @@ -ksp_view -pc_type lu - -pc_factor_mat_solver_package superlu + -pc_factor_mat_solver_type superlu -ksp_max_it 1 diff --git a/src/applications/examples/resistor_grid/input.xml b/src/applications/examples/resistor_grid/input.xml index 11106f077..241c08a7b 100644 --- a/src/applications/examples/resistor_grid/input.xml +++ b/src/applications/examples/resistor_grid/input.xml @@ -19,7 +19,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/modules/dynamic_simulation_full_y/test/input.xml b/src/applications/modules/dynamic_simulation_full_y/test/input.xml index e2c4f5468..21f7c7efe 100644 --- a/src/applications/modules/dynamic_simulation_full_y/test/input.xml +++ b/src/applications/modules/dynamic_simulation_full_y/test/input.xml @@ -9,7 +9,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -84,7 +84,7 @@ -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/modules/powerflow/test/input.xml b/src/applications/modules/powerflow/test/input.xml index 55e1bfee3..afdaae10e 100644 --- a/src/applications/modules/powerflow/test/input.xml +++ b/src/applications/modules/powerflow/test/input.xml @@ -35,7 +35,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 @@ -44,7 +44,7 @@ -ksp_view -pc_type lu - -pc_factor_mat_solver_package superlu + -pc_factor_mat_solver_type superlu -ksp_max_it 1 diff --git a/src/applications/modules/state_estimation/test/input.xml b/src/applications/modules/state_estimation/test/input.xml index cff8d06b8..69ad1142a 100644 --- a/src/applications/modules/state_estimation/test/input.xml +++ b/src/applications/modules/state_estimation/test/input.xml @@ -20,7 +20,7 @@ -ksp_view -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/applications/rtpr/IMPLEMENTATION.md b/src/applications/rtpr/IMPLEMENTATION.md index 5e8450bd3..ce7abcd35 100644 --- a/src/applications/rtpr/IMPLEMENTATION.md +++ b/src/applications/rtpr/IMPLEMENTATION.md @@ -53,7 +53,7 @@ The input deck is of the form -ksp_type richardson -pc_type lu - -pc_factor_mat_solver_package superlu_dist + -pc_factor_mat_solver_type superlu_dist -ksp_max_it 1 diff --git a/src/cmake-modules/FindCPLEX.cmake b/src/cmake-modules/FindCPLEX.cmake deleted file mode 100644 index 74f9a84ee..000000000 --- a/src/cmake-modules/FindCPLEX.cmake +++ /dev/null @@ -1,82 +0,0 @@ -# This module finds cplex. -# -# User can give CPLEX_ROOT_DIR as a hint stored in the cmake cache. -# -# It sets the following variables: -# CPLEX_FOUND - Set to false, or undefined, if cplex isn't found. -# CPLEX_INCLUDE_DIRS - include directory -# CPLEX_LIBRARIES - library files - -FIND_PATH(CPLEX_INCLUDE_DIR ilcplex/cplex.h - HINTS ${CPLEX_ROOT_DIR}/cplex/include - ${CPLEX_ROOT_DIR}/include - PATHS ENV C_INCLUDE_PATH - ENV C_PLUS_INCLUDE_PATH - ENV INCLUDE_PATH -) - -FIND_PATH(CPLEX_CONCERT_INCLUDE_DIR - ilconcert/iloenv.h - HINTS ${CPLEX_ROOT_DIR}/concert/include - ${CPLEX_ROOT_DIR}/include - PATHS ENV C_INCLUDE_PATH - ENV C_PLUS_INCLUDE_PATH - ENV INCLUDE_PATH -) - -FIND_LIBRARY(CPLEX_LIBRARY - NAMES cplex${CPLEX_WIN_VERSION} cplex - HINTS ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_debian4.0_4.1/static_pic - ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic - ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_linux/static_pic - ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_osx/static_pic - PATHS ENV LIBRARY_PATH - ENV LD_LIBRARY_PATH -) -message(STATUS "CPLEX Library: ${CPLEX_LIBRARY}") - -FIND_LIBRARY(CPLEX_ILOCPLEX_LIBRARY - ilocplex - HINTS ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_debian4.0_4.1/static_pic #unix - ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic #unix - ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_linux/static_pic - ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_osx/static_pic - PATHS ENV LIBRARY_PATH - ENV LD_LIBRARY_PATH -) -message(STATUS "ILOCPLEX Library: ${CPLEX_ILOCPLEX_LIBRARY}") - -FIND_LIBRARY(CPLEX_CONCERT_LIBRARY - concert - HINTS ${CPLEX_ROOT_DIR}/concert/lib/x86-64_debian4.0_4.1/static_pic #unix - ${CPLEX_ROOT_DIR}/concert/lib/x86-64_sles10_4.1/static_pic #unix - ${CPLEX_ROOT_DIR}/concert/lib/x86-64_linux/static_pic - ${CPLEX_ROOT_DIR}/concert/lib/x86-64_osx/static_pic - PATHS ENV LIBRARY_PATH - ENV LD_LIBRARY_PATH -) -message(STATUS "CONCERT Library: ${CPLEX_CONCERT_LIBRARY}") - -FIND_PATH(CPLEX_BIN_DIR - cplex - HINTS ${CPLEX_ROOT_DIR}/cplex/bin/x86-64_sles10_4.1 #unix - ${CPLEX_ROOT_DIR}/cplex/bin/x86-64_debian4.0_4.1 #unix - ${CPLEX_ROOT_DIR}/cplex/bin/x86-64_linux #unix - ${CPLEX_ROOT_DIR}/cplex/bin/x86-64_osx - ENV LIBRARY_PATH - ENV LD_LIBRARY_PATH -) -message(STATUS "CPLEX Bin Dir: ${CPLEX_BIN_DIR}") -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG - CPLEX_LIBRARY CPLEX_INCLUDE_DIR CPLEX_ILOCPLEX_LIBRARY CPLEX_CONCERT_LIBRARY CPLEX_CONCERT_INCLUDE_DIR) - -IF(CPLEX_FOUND) - SET(CPLEX_INCLUDE_DIRS ${CPLEX_INCLUDE_DIR} ${CPLEX_CONCERT_INCLUDE_DIR}) - SET(CPLEX_LIBRARIES ${CPLEX_CONCERT_LIBRARY} ${CPLEX_ILOCPLEX_LIBRARY} ${CPLEX_LIBRARY} ) - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread") - ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") -ENDIF(CPLEX_FOUND) - -MARK_AS_ADVANCED(CPLEX_LIBRARY CPLEX_INCLUDE_DIR CPLEX_ILOCPLEX_LIBRARY CPLEX_CONCERT_INCLUDE_DIR CPLEX_CONCERT_LIBRARY) diff --git a/src/cmake-modules/FindGLPK.cmake b/src/cmake-modules/FindGLPK.cmake deleted file mode 100644 index e6bd54edf..000000000 --- a/src/cmake-modules/FindGLPK.cmake +++ /dev/null @@ -1,72 +0,0 @@ -# ------------------------------------------------------------- -# file: FindGLPK.cmake -# ------------------------------------------------------------- -# ------------------------------------------------------------- -# Original Obtained from -# http://lemon.cs.elte.hu/trac/lemon/browser/lemon/cmake/FindGLPK.cmake -# ------------------------------------------------------------- -# ------------------------------------------------------------- -# Last Change: 2015-09-16 07:56:37 d3g096 -# ------------------------------------------------------------- - -SET(GLPK_ROOT_DIR "" CACHE PATH "GLPK root directory") - -SET(GLPK_REGKEY "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Glpk;InstallPath]") -GET_FILENAME_COMPONENT(GLPK_ROOT_PATH ${GLPK_REGKEY} ABSOLUTE) - -FIND_PATH(GLPK_INCLUDE_DIR - glpk.h - PATHS ${GLPK_REGKEY}/include - HINTS ${GLPK_ROOT_DIR}/include -) -FIND_LIBRARY(GLPK_LIBRARY - glpk - PATHS ${GLPK_REGKEY}/lib - HINTS ${GLPK_ROOT_DIR}/lib -) - -IF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY) - FILE(READ ${GLPK_INCLUDE_DIR}/glpk.h GLPK_GLPK_H) - - STRING(REGEX MATCH "define[ ]+GLP_MAJOR_VERSION[ ]+[0-9]+" GLPK_MAJOR_VERSION_LINE "${GLPK_GLPK_H}") - STRING(REGEX REPLACE "define[ ]+GLP_MAJOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MAJOR "${GLPK_MAJOR_VERSION_LINE}") - - STRING(REGEX MATCH "define[ ]+GLP_MINOR_VERSION[ ]+[0-9]+" GLPK_MINOR_VERSION_LINE "${GLPK_GLPK_H}") - STRING(REGEX REPLACE "define[ ]+GLP_MINOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MINOR "${GLPK_MINOR_VERSION_LINE}") - - SET(GLPK_VERSION_STRING "${GLPK_VERSION_MAJOR}.${GLPK_VERSION_MINOR}") - - IF(GLPK_FIND_VERSION) - IF(GLPK_FIND_VERSION_COUNT GREATER 2) - MESSAGE(SEND_ERROR "unexpected version string") - ENDIF(GLPK_FIND_VERSION_COUNT GREATER 2) - - MATH(EXPR GLPK_REQUESTED_VERSION "${GLPK_FIND_VERSION_MAJOR}*100 + ${GLPK_FIND_VERSION_MINOR}") - MATH(EXPR GLPK_FOUND_VERSION "${GLPK_VERSION_MAJOR}*100 + ${GLPK_VERSION_MINOR}") - - IF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION) - SET(GLPK_PROPER_VERSION_FOUND FALSE) - ELSE(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION) - SET(GLPK_PROPER_VERSION_FOUND TRUE) - ENDIF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION) - ELSE(GLPK_FIND_VERSION) - SET(GLPK_PROPER_VERSION_FOUND TRUE) - ENDIF(GLPK_FIND_VERSION) -ENDIF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_PROPER_VERSION_FOUND) - -IF(GLPK_FOUND) - SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR}) - SET(GLPK_LIBRARIES ${GLPK_LIBRARY}) - SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin) -ENDIF(GLPK_FOUND) - -MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR) - -IF(GLPK_FOUND) - SET(LEMON_HAVE_LP TRUE) - SET(LEMON_HAVE_MIP TRUE) - SET(LEMON_HAVE_GLPK TRUE) -ENDIF(GLPK_FOUND) diff --git a/src/cmake-modules/FindGUROBI.cmake b/src/cmake-modules/FindGUROBI.cmake deleted file mode 100644 index 4648be76a..000000000 --- a/src/cmake-modules/FindGUROBI.cmake +++ /dev/null @@ -1,50 +0,0 @@ -#### Modified from http://www.openflipper.org/svnrepo/CoMISo/trunk/CoMISo/cmake/FindGUROBI.cmake - - -# - Try to find GUROBI -# Once done this will define -# GUROBI_FOUND - System has Gurobi -# GUROBI_INCLUDE_DIRS - The Gurobi include directories -# GUROBI_LIBRARIES - The libraries needed to use Gurobi - -if (GUROBI_INCLUDE_DIR) - # in cache already - set(GUROBI_FOUND TRUE) - set(GUROBI_INCLUDE_DIRS ${GUROBI_INCLUDE_DIR} ) - set(GUROBI_LIBRARIES ${GUROBI_LIBRARY} ${GUROBI_CXX_LIBRARY} ) -else (GUROBI_INCLUDE_DIR) - -find_path(GUROBI_INCLUDE_DIR - NAMES gurobi_c++.h - PATHS ${GUROBI_HOME}/include - ) -message(STATUS "GUROBI Include Dir: ${GUROBI_INCLUDE_DIR}") - -find_library( GUROBI_LIBRARY - NAMES gurobi - gurobi56 - gurobi60 - PATHS ${GUROBI_HOME}/lib - ) -message(STATUS "GUROBI Library: ${GUROBI_LIBRARY}") - -find_library( GUROBI_CXX_LIBRARY - NAMES gurobi_c++ - PATHS ${GUROBI_HOME}/lib - ) -# use c++ headers as default -# handle the QUIETLY and REQUIRED arguments and set LIBGUROBI_FOUND to TRUE -# if all listed variables are TRUE -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GUROBI DEFAULT_MSG - GUROBI_LIBRARY GUROBI_CXX_LIBRARY GUROBI_INCLUDE_DIR) - - -IF(GUROBI_FOUND) - set(GUROBI_INCLUDE_DIRS ${GUROBI_INCLUDE_DIR}) - set(GUROBI_LIBRARIES ${GUROBI_LIBRARY} ${GUROBI_CXX_LIBRARY}) -ENDIF(GUROBI_FOUND) - -mark_as_advanced(GUROBI_INCLUDE_DIR GUROBI_LIBRARY GUROBI_CXX_LIBRARY) - -endif(GUROBI_INCLUDE_DIR) diff --git a/src/example_configuration.sh b/src/example_configuration.sh index 3cbed059c..e06c80d17 100755 --- a/src/example_configuration.sh +++ b/src/example_configuration.sh @@ -247,7 +247,7 @@ elif [ $host == "tlaloc" ]; then cmake -Wdev --debug-trycompile \ --graphviz=GridPACK.dot \ -D PETSC_DIR:STRING="/home/d3g096/Projects/GridPakLDRD/petsc-3.19.4" \ - -D PETSC_ARCH:STRING="ubuntu-complex-shared-mumps" \ + -D PETSC_ARCH:STRING="ubuntu-complex-shared" \ -D USE_OLD_PETSC:BOOL=OFF \ -D BOOST_ROOT:PATH="/usr" \ -D Boost_NO_BOOST_CMAKE:BOOL=TRUE \