Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
edc46692
Commit
edc46692
authored
11 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
use SCIP for mixed integer programming
parent
3e38e65d
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+13
-0
13 additions, 0 deletions
CMakeLists.txt
Common/GmshConfig.h.in
+1
-0
1 addition, 0 deletions
Common/GmshConfig.h.in
Numeric/MetricBasis.cpp
+12
-1
12 additions, 1 deletion
Numeric/MetricBasis.cpp
with
26 additions
and
1 deletion
CMakeLists.txt
+
13
−
0
View file @
edc46692
...
@@ -77,6 +77,7 @@ opt(POPPLER "Enable Poppler for displaying PDF documents (experimental)" OFF)
...
@@ -77,6 +77,7 @@ opt(POPPLER "Enable Poppler for displaying PDF documents (experimental)" OFF)
opt
(
QT
"Enable dummy QT graphical interface proof-of-concept (experimental)"
OFF
)
opt
(
QT
"Enable dummy QT graphical interface proof-of-concept (experimental)"
OFF
)
opt
(
RTREE
"Enable RTREE (used for quad/hex mesh generation)"
${
DEFAULT
}
)
opt
(
RTREE
"Enable RTREE (used for quad/hex mesh generation)"
${
DEFAULT
}
)
opt
(
SALOME
"Enable Salome routines for CAD healing"
${
DEFAULT
}
)
opt
(
SALOME
"Enable Salome routines for CAD healing"
${
DEFAULT
}
)
opt
(
SCIP
"Enable SCIP optimization suite"
OFF
)
opt
(
SGEOM
"Enable SGEOM interface to OCC (experimental)"
OFF
)
opt
(
SGEOM
"Enable SGEOM interface to OCC (experimental)"
OFF
)
opt
(
SLEPC
"Enable SLEPc eigensolvers (required for conformal compounds)"
${
DEFAULT
}
)
opt
(
SLEPC
"Enable SLEPc eigensolvers (required for conformal compounds)"
${
DEFAULT
}
)
opt
(
SOLVER
"Enable built-in finite element solvers (required for compounds)"
${
DEFAULT
}
)
opt
(
SOLVER
"Enable built-in finite element solvers (required for compounds)"
${
DEFAULT
}
)
...
@@ -1065,6 +1066,18 @@ if(ENABLE_ACIS)
...
@@ -1065,6 +1066,18 @@ if(ENABLE_ACIS)
endif
(
ACIS_LIB
)
endif
(
ACIS_LIB
)
endif
(
ENABLE_ACIS
)
endif
(
ENABLE_ACIS
)
if
(
ENABLE_SCIP
)
find_library
(
SCIP_LIB scipopt PATH_SUFFIXES lib
)
if
(
SCIP_LIB
)
find_path
(
SCIP_INC
"scip-3.1.0/src/scip/scip.h"
)
if
(
SCIP_INC
)
set_config_option
(
HAVE_SCIP
"SCIP"
)
list
(
APPEND EXTERNAL_LIBRARIES
${
SCIP_LIB
}
)
list
(
APPEND EXTERNAL_INCLUDES
"
${
SCIP_INC
}
/scip-3.1.0/src;
${
SCIP_INC
}
/soplex-2.0.0/src"
)
endif
(
SCIP_INC
)
endif
(
SCIP_LIB
)
endif
(
ENABLE_SCIP
)
if
(
ENABLE_WRAP_PYTHON
)
if
(
ENABLE_WRAP_PYTHON
)
find_package
(
SWIG
)
find_package
(
SWIG
)
find_package
(
PythonLibs
)
find_package
(
PythonLibs
)
...
...
This diff is collapsed.
Click to expand it.
Common/GmshConfig.h.in
+
1
−
0
View file @
edc46692
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
#cmakedefine HAVE_QT
#cmakedefine HAVE_QT
#cmakedefine HAVE_RTREE
#cmakedefine HAVE_RTREE
#cmakedefine HAVE_SALOME
#cmakedefine HAVE_SALOME
#cmakedefine HAVE_SCIP
#cmakedefine HAVE_SGEOM
#cmakedefine HAVE_SGEOM
#cmakedefine HAVE_SLEPC
#cmakedefine HAVE_SLEPC
#cmakedefine HAVE_SOLVER
#cmakedefine HAVE_SOLVER
...
...
This diff is collapsed.
Click to expand it.
Numeric/MetricBasis.cpp
+
12
−
1
View file @
edc46692
...
@@ -3,12 +3,23 @@
...
@@ -3,12 +3,23 @@
// See the LICENSE.txt file for license information. Please report all
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to the public mailing list <gmsh@geuz.org>.
// bugs and problems to the public mailing list <gmsh@geuz.org>.
#include
"GmshConfig.h"
#include
"MetricBasis.h"
#include
"MetricBasis.h"
//#include "GmshDefines.h"
#include
"BasisFactory.h"
#include
"BasisFactory.h"
#include
"pointsGenerators.h"
#include
"pointsGenerators.h"
#include
<cmath>
#include
<cmath>
#if defined(HAVE_SCIP)
#include
<scip/scip.h>
#include
<soplex.h>
void
MaFonctionScip
()
{
SCIP
*
scip
;
SCIPcreate
(
&
scip
);
}
#endif
MetricCoefficient
::
MetricCoefficient
(
MElement
*
el
)
:
_element
(
el
)
MetricCoefficient
::
MetricCoefficient
(
MElement
*
el
)
:
_element
(
el
)
{
{
const
int
tag
=
el
->
getTypeForMSH
();
const
int
tag
=
el
->
getTypeForMSH
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment