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
84
Issues
84
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
44
Merge Requests
44
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
6241046a
Commit
6241046a
authored
Jul 05, 2017
by
Dave Moxey
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into feature/boost-std-cleanup
parents
99ed86a0
a9a085f0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
CHANGELOG.md
CHANGELOG.md
+1
-4
cmake/ThirdPartyCCM.cmake
cmake/ThirdPartyCCM.cmake
+4
-0
library/LibUtilities/LinearAlgebra/ExplicitInstantiation.h
library/LibUtilities/LinearAlgebra/ExplicitInstantiation.h
+1
-1
utilities/NekMesh/CMakeLists.txt
utilities/NekMesh/CMakeLists.txt
+1
-1
No files found.
CHANGELOG.md
View file @
6241046a
...
@@ -7,6 +7,7 @@ v5.0.0
...
@@ -7,6 +7,7 @@ v5.0.0
-
Added in sum factorisation version for pyramid expansions and orthogonal
-
Added in sum factorisation version for pyramid expansions and orthogonal
expansion in pyramids (!750)
expansion in pyramids (!750)
-
Significant overhaul of CMake infrastructure (!770)
-
Significant overhaul of CMake infrastructure (!770)
-
Fix ThridpartyCCM options (!802)
**NekMesh**
:
**NekMesh**
:
-
Add feature to read basic 2D geo files as CAD (!731)
-
Add feature to read basic 2D geo files as CAD (!731)
...
@@ -19,10 +20,6 @@ v5.0.0
...
@@ -19,10 +20,6 @@ v5.0.0
rather than a vector (!797)
rather than a vector (!797)
-
Fix inverted triangles and small memory issue in surface meshing (!798)
-
Fix inverted triangles and small memory issue in surface meshing (!798)
**Library**
-
Added in sum factorisation version for pyramid expansions and orthogonal
expansion in pyramids (!750)
**FieldConvert**
:
**FieldConvert**
:
-
Add input module for Semtex field files (!777)
-
Add input module for Semtex field files (!777)
...
...
cmake/ThirdPartyCCM.cmake
View file @
6241046a
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
OPTION
(
NEKTAR_USE_CCM
OPTION
(
NEKTAR_USE_CCM
"use CCM star i/o"
OFF
)
"use CCM star i/o"
OFF
)
IF
(
NEKTAR_USE_CCM
)
# First search for system ccmioL installs. Hint /usr/local
# First search for system ccmioL installs. Hint /usr/local
FIND_PATH
(
CCMIO_INCLUDE_DIR ccmio.h PATHS /usr/local/include
)
FIND_PATH
(
CCMIO_INCLUDE_DIR ccmio.h PATHS /usr/local/include
)
FIND_LIBRARY
(
CCMIO_LIBRARY NAMES
"ccmio"
PATHS /usr/local/lib
)
FIND_LIBRARY
(
CCMIO_LIBRARY NAMES
"ccmio"
PATHS /usr/local/lib
)
...
@@ -79,3 +81,5 @@ SET(CCMIO_LIBRARIES ccmio adf)
...
@@ -79,3 +81,5 @@ SET(CCMIO_LIBRARIES ccmio adf)
MARK_AS_ADVANCED
(
CCMIO_INCLUDE_DIR
)
MARK_AS_ADVANCED
(
CCMIO_INCLUDE_DIR
)
MARK_AS_ADVANCED
(
CCMIO_LIBRARY
)
MARK_AS_ADVANCED
(
CCMIO_LIBRARY
)
ENDIF
(
NEKTAR_USE_CCM
)
library/LibUtilities/LinearAlgebra/ExplicitInstantiation.h
View file @
6241046a
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
BOOST_PP_COMMA_IF(BOOST_PP_LESS(n, BOOST_PP_SUB(BOOST_PP_ARRAY_SIZE(data), 1)))
BOOST_PP_COMMA_IF(BOOST_PP_LESS(n, BOOST_PP_SUB(BOOST_PP_ARRAY_SIZE(data), 1)))
#define NEKTAR_CREATE_EXPLICIT_INTSTANTIATION(z, n, data) \
#define NEKTAR_CREATE_EXPLICIT_INTSTANTIATION(z, n, data) \
template LIB_UTILITIES_EXPORT
COCKCOCK
\
template LIB_UTILITIES_EXPORT \
BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ARRAY_ELEM(2, data)) BOOST_PP_ARRAY_ELEM(0, data) BOOST_PP_LPAREN() \
BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ARRAY_ELEM(2, data)) BOOST_PP_ARRAY_ELEM(0, data) BOOST_PP_LPAREN() \
BOOST_PP_REPEAT(BOOST_PP_ARRAY_SIZE(BOOST_PP_ARRAY_ELEM(3, data)), NEKTAR_PRINT_ARRAY, BOOST_PP_ARRAY_ELEM(3, data)) \
BOOST_PP_REPEAT(BOOST_PP_ARRAY_SIZE(BOOST_PP_ARRAY_ELEM(3, data)), NEKTAR_PRINT_ARRAY, BOOST_PP_ARRAY_ELEM(3, data)) \
BOOST_PP_COMMA_IF(BOOST_PP_GREATER(BOOST_PP_ARRAY_SIZE(BOOST_PP_ARRAY_ELEM(3, data)), 0)) \
BOOST_PP_COMMA_IF(BOOST_PP_GREATER(BOOST_PP_ARRAY_SIZE(BOOST_PP_ARRAY_ELEM(3, data)), 0)) \
...
...
utilities/NekMesh/CMakeLists.txt
View file @
6241046a
...
@@ -59,7 +59,7 @@ ADD_UTILITIES_EXECUTABLE(NekMesh COMPONENT nekmesh
...
@@ -59,7 +59,7 @@ ADD_UTILITIES_EXECUTABLE(NekMesh COMPONENT nekmesh
DEPENDS NekMeshUtils FieldUtils
)
DEPENDS NekMeshUtils FieldUtils
)
IF
(
NEKTAR_USE_CCM
)
IF
(
NEKTAR_USE_CCM
)
TARGET_LINK_LIBRARIES
(
NekMesh
${
CCMIO_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
NekMesh
LINK_PRIVATE
${
CCMIO_LIBRARIES
}
)
ENDIF
(
NEKTAR_USE_CCM
)
ENDIF
(
NEKTAR_USE_CCM
)
IF
(
NEKTAR_USE_VTK
)
IF
(
NEKTAR_USE_VTK
)
...
...
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