Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Nektar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
87
Issues
87
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
42
Merge Requests
42
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nektar
Nektar
Commits
cecc2501
Commit
cecc2501
authored
Jan 28, 2018
by
David Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a few issues with CMake dependencies
parent
335c7c46
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
9 deletions
+12
-9
cmake/ThirdPartyMetis.cmake
cmake/ThirdPartyMetis.cmake
+2
-2
library/LibUtilities/CMakeLists.txt
library/LibUtilities/CMakeLists.txt
+1
-0
library/MultiRegions/SubStructuredGraph.cpp
library/MultiRegions/SubStructuredGraph.cpp
+4
-2
library/SpatialDomains/CMakeLists.txt
library/SpatialDomains/CMakeLists.txt
+5
-5
No files found.
cmake/ThirdPartyMetis.cmake
View file @
cecc2501
...
...
@@ -64,9 +64,9 @@ IF (NEKTAR_USE_METIS)
SET
(
METIS_CONFIG_INCLUDE_DIR
${
TPINC
}
)
INCLUDE_DIRECTORIES
(
${
TPDIST
}
/include
)
ELSE
(
THIRDPARTY_BUILD_SCOTCH
)
ELSE
()
ADD_CUSTOM_TARGET
(
metis-5.1.0 ALL
)
MESSAGE
(
STATUS
"Found Metis:
${
METIS_LIBRARY
}
"
)
SET
(
METIS_CONFIG_INCLUDE_DIR
${
METIS_INCLUDE_DIR
}
)
ENDIF
()
ENDIF
()
\ No newline at end of file
ENDIF
()
library/LibUtilities/CMakeLists.txt
View file @
cecc2501
...
...
@@ -32,6 +32,7 @@ SET(BasicUtilsHeaders
./BasicUtils/ThreadBoost.h
./BasicUtils/Vmath.hpp
./BasicUtils/VmathArray.hpp
./BasicUtils/Metis.hpp
./BasicUtils/VtkUtil.hpp
)
...
...
library/MultiRegions/SubStructuredGraph.cpp
View file @
cecc2501
...
...
@@ -987,7 +987,9 @@ namespace Nektar
}
else
{
ASSERTL0
(
false
,
"Error in constructing Scotch graph for"
// This should never be possible, but let's be pedantic
// and check anyway.
ASSERTL1
(
false
,
"Error in constructing Scotch graph for"
" multi-level static condensation"
);
}
}
...
...
@@ -1028,7 +1030,7 @@ namespace Nektar
// and reorder the permutation from Scotch.
//
substructgraph
=
MemoryManager
<
BottomUpSubStructuredGraph
>::
AllocateSharedPtr
(
graphs
[
graphs
.
size
()
-
1
]
,
nPartition
,
true
);
AllocateSharedPtr
(
graphs
.
back
()
,
nPartition
,
true
);
// Important: we cannot simply use the ordering given by Scotch
// as it does not order the different blocks as we would like
...
...
library/SpatialDomains/CMakeLists.txt
View file @
cecc2501
...
...
@@ -71,17 +71,17 @@ ADD_NEKTAR_LIBRARY(SpatialDomains
DESCRIPTION
"This library provides the mappings between reference regions and physical regions in the domain."
)
IF
(
NEKTAR_USE_METIS
)
# Metis
TARGET_LINK_LIBRARIES
(
SpatialDomains LINK_PRIVATE
${
METIS_LIB
}
)
ADD_DEPENDENCIES
(
SpatialDomains metis-5.1.0
)
ENDIF
()
# Metis
TARGET_LINK_LIBRARIES
(
SpatialDomains LINK_PRIVATE
${
METIS_LIB
}
)
IF
(
NEKTAR_USE_SCOTCH
)
IF
(
NEKTAR_USE_SCOTCH
)
# Scotch
TARGET_LINK_LIBRARIES
(
SpatialDomains LINK_PUBLIC
${
SCOTCH_LIBRARY
}
${
SCOTCHERR_LIBRARY
}
)
ADD_DEPENDENCIES
(
SpatialDomains scotch-6.0.4
)
ENDIF
()
ENDIF
()
INSTALL
(
DIRECTORY ./ DESTINATION
${
NEKTAR_INCLUDE_DIR
}
/SpatialDomains
COMPONENT dev FILES_MATCHING PATTERN
"*.h"
PATTERN
"*.hpp"
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment