Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
openfpm_numerics
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openfpm
openfpm_numerics
Commits
4494a3e8
Commit
4494a3e8
authored
Nov 28, 2018
by
incardon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing compilation with EIGEN and PETSC
parent
ddda7da8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
src/CMakeLists.txt
src/CMakeLists.txt
+2
-1
src/Vector/Vector_petsc.hpp
src/Vector/Vector_petsc.hpp
+1
-0
src/util/petsc_util.hpp
src/util/petsc_util.hpp
+1
-1
No files found.
src/CMakeLists.txt
View file @
4494a3e8
...
...
@@ -25,6 +25,7 @@ target_include_directories (numerics PUBLIC ${METIS_ROOT}/include)
target_include_directories
(
numerics PUBLIC
${
HDF5_ROOT
}
/include
)
target_include_directories
(
numerics PUBLIC
${
LIBHILBERT_INCLUDE_DIRS
}
)
target_include_directories
(
numerics PUBLIC
${
Boost_INCLUDE_DIRS
}
)
target_include_directories
(
numerics PUBLIC
${
EIGEN3_INCLUDE_DIR
}
)
target_link_libraries
(
numerics
${
Boost_LIBRARIES
}
)
target_link_libraries
(
numerics -L
${
PARMETIS_ROOT
}
/lib parmetis
)
...
...
@@ -32,7 +33,7 @@ target_link_libraries(numerics -L${METIS_ROOT}/lib metis)
target_link_libraries
(
numerics -L
${
HDF5_ROOT
}
/lib hdf5 hdf5_hl
)
target_link_libraries
(
numerics -L
${
LIBHILBERT_LIBRARY_DIRS
}
${
LIBHILBERT_LIBRARIES
}
)
if
(
PETSC_FOUND
)
target_link_libraries
(
numerics
-L
${
PETSC_LIB_DIR
}
${
PETSC_LIBRARIES
}
)
target_link_libraries
(
numerics
${
PETSC_LIBRARIES
}
)
endif
()
...
...
src/Vector/Vector_petsc.hpp
View file @
4494a3e8
...
...
@@ -13,6 +13,7 @@
#include <boost/mpl/int.hpp>
#include <petscvec.h>
#include "util/petsc_util.hpp"
#include <unordered_map>
#define PETSC_RVAL 2
...
...
src/util/petsc_util.hpp
View file @
4494a3e8
...
...
@@ -16,7 +16,7 @@
std::string msg("Petsc error: ");\
msg += std::string(__FILE__) + std::string(" ") + std::to_string(__LINE__);\
PetscInt ln = __LINE__;\
PetscError(MPI_COMM_WORLD,ln,__FUNCT__,__FILE__,err,PETSC_ERROR_INITIAL,"Error petsc");\
PetscError(MPI_COMM_WORLD,ln,__FUNCT
ION
__,__FILE__,err,PETSC_ERROR_INITIAL,"Error petsc");\
}\
}
...
...
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