Skip to content
Snippets Groups Projects
Commit b3a1dda3 authored by bnelson's avatar bnelson
Browse files

Added project folders to cmake. 

Added 64-bit lapack/blas for windows.

Moved enums to separate header files for ElVis integration.
parent cb9baba1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 248 additions and 82 deletions
CMakeLists.txt
+ 9
− 0
View file @ b3a1dda3
......@@ -5,6 +5,9 @@ RelWithDebInfo MinSizeRel.")
PROJECT(Nektar++)
# Helps organize projects in IDEs.
SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
SET(NEKTAR_VERSION_MAJOR 3)
SET(NEKTAR_VERSION_MINOR 2)
SET(NEKTAR_VERSION_PATCH 0)
......@@ -111,8 +114,14 @@ ENDIF(APPLE)
# Turn on NEKTAR_USE_WIN32_LAPACK if we are in Windows and the libraries exist.
IF( WIN32 )
IF( CMAKE_CL_64 )
FIND_LIBRARY( WIN32_BLAS NAMES libblas64 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
FIND_LIBRARY( WIN32_LAPACK NAMES liblapack64 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
ELSE()
FIND_LIBRARY( WIN32_BLAS NAMES blas_win32 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
FIND_LIBRARY( WIN32_LAPACK NAMES lapack_win32 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
ENDIF()
IF( WIN32_BLAS AND WIN32_LAPACK )
SET(Win32LapackDefault ON)
ELSE(WIN32_BLAS AND WIN32_LAPACK)
......
cmake/FindWin32Lapack.cmake
+ 11
− 1
View file @ b3a1dda3
IF( WIN32 AND CMAKE_CL_64 )
FIND_LIBRARY( WIN32_BLAS NAMES libblas64 PATHS
${WIN32_LAPACK_ADDITIONAL_DIRS}
${CMAKE_SOURCE_DIR}/ThirdParty
${CMAKE_SOURCE_DIR}/../ThirdParty)
FIND_LIBRARY( WIN32_LAPACK NAMES liblapack64 PATHS
${WIN32_LAPACK_ADDITIONAL_DIRS}
${CMAKE_SOURCE_DIR}/ThirdParty
${CMAKE_SOURCE_DIR}/../ThirdParty)
ELSE()
FIND_LIBRARY( WIN32_BLAS NAMES blas_win32 PATHS
${WIN32_LAPACK_ADDITIONAL_DIRS}
${CMAKE_SOURCE_DIR}/ThirdParty
......@@ -8,7 +18,7 @@ FIND_LIBRARY( WIN32_LAPACK NAMES lapack_win32 PATHS
${WIN32_LAPACK_ADDITIONAL_DIRS}
${CMAKE_SOURCE_DIR}/ThirdParty
${CMAKE_SOURCE_DIR}/../ThirdParty)
ENDIF()
CHANGE_EXTENSION(WIN32_LAPACK_DLL ${WIN32_LAPACK} "dll")
CHANGE_EXTENSION(WIN32_BLAS_DLL ${WIN32_BLAS} "dll")
......
cmake/NektarCommon.cmake
+ 5
− 3
View file @ b3a1dda3
......@@ -69,11 +69,12 @@ MACRO(SET_COMMON_PROPERTIES name)
# warning)" warning (4800)
# 4250 - Inheritance via dominance. Nektar appears to be handling the
# diamond correctly.
# 4373 - Overriding a virtual method with parameters that differ by const
# or volatile conforms to the standard.
# /Za is necessary to prevent temporaries being bound to reference
# parameters.
SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS
"/wd4521 /wd4522 /wd4351 /wd4018 /wd4800 /wd4250")
"/wd4521 /wd4522 /wd4351 /wd4018 /wd4800 /wd4250 /wd4373")
# Enable source level parallel builds.
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
......@@ -198,6 +199,7 @@ MACRO(ADD_NEKTAR_EXECUTABLE name component sources)
PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${component})
INSTALL(TARGETS ${name}
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT ${component} OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} COMPONENT ${component} OPTIONAL
......@@ -211,7 +213,7 @@ MACRO(ADD_NEKTAR_LIBRARY name component type)
# NIST Sparse BLAS only static, so link into Nektar libraries directly.
TARGET_LINK_LIBRARIES( ${name} ${NIST_SPARSE_BLAS} ${METIS_LIB})
ADD_DEPENDENCIES(${name} spblastk0.9b modmetis-4.0 boost tinyxml zlib)
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${component})
IF (NEKTAR_USE_MPI)
TARGET_LINK_LIBRARIES( ${name} ${GSMPI_LIBRARY} )
ENDIF (NEKTAR_USE_MPI)
......
library/LibUtilities/CMakeLists.txt
+ 2
− 0
View file @ b3a1dda3
......@@ -50,6 +50,7 @@ SET(LinearAlgebraHeaders
SET(FoundationHeaders
./Foundations/Graph.h
./Foundations/Basis.h
./Foundations/BasisType.h
./Foundations/Foundations.hpp
./Foundations/FourierPoints.h
./Foundations/FourierSingleModePoints.h
......@@ -62,6 +63,7 @@ SET(FoundationHeaders
./Foundations/NodalTriElec.h
./Foundations/NodalTriFekete.h
./Foundations/Points.h
./Foundations/POintsType.h
./Foundations/PolyEPoints.h
./Foundations/NodalUtil.h
./Foundations/NodalTriEvenlySpaced.h
......
library/LibUtilities/Foundations/BasisType.h 0 → 100644
+ 72
− 0
View file @ b3a1dda3
///////////////////////////////////////////////////////////////////////////////
//
// File BasisType.h
//
// For more information, please see: http://www.nektar.info
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
//
///////////////////////////////////////////////////////////////////////////////
#ifndef NEKTAR_LIB_UTILITIES_BASIS_TYPE_H
#define NEKTAR_LIB_UTILITIES_BASIS_TYPE_H
namespace Nektar
{
namespace LibUtilities
{
enum BasisType
{
eNoBasisType,
eOrtho_A, //!< Principle Orthogonal Functions \f$\widetilde{\psi}^a_p(z_i)\f$
eOrtho_B, //!< Principle Orthogonal Functions \f$\widetilde{\psi}^b_{pq}(z_i)\f$
eOrtho_C, //!< Principle Orthogonal Functions \f$\widetilde{\psi}^c_{pqr}(z_i)\f$
eModified_A, //!< Principle Modified Functions \f$ \phi^a_p(z_i) \f$
eModified_B, //!< Principle Modified Functions \f$ \phi^b_{pq}(z_i) \f$
eModified_C, //!< Principle Modified Functions \f$ \phi^c_{pqr}(z_i) \f$
eFourier, //!< Fourier Expansion \f$ \exp(i p\pi z_i)\f$
eGLL_Lagrange, //!< Lagrange for SEM basis \f$ h_p(z_i) \f$
eLegendre, //!< Legendre Polynomials \f$ L_p(z_i) = P^{0,0}_p(z_i)\f$. Same as Ortho_A
eChebyshev, //!< Chebyshev Polynomials \f$ T_p(z_i) = P^{-1/2,-1/2}_p(z_i)\f$
eMonomial, //!< Monomial polynomials \f$ L_p(z_i) = z_i^{p}\f$
eFourierSingleMode, //!< Fourier ModifiedExpansion with just the first mode \f$ \exp(i \pi z_i)\f$
eFourierHalfModeRe, //!< Fourier Modified expansions with just the real part of the first mode \f$ Re[\exp(i \pi z_i)]\f$
eFourierHalfModeIm, //!< Fourier Modified expansions with just the imaginary part of the first mode \f$ Im[\exp(i \pi z_i)]\f$
eGauss_Lagrange, //!< Lagrange Polynomials using the Gauss points \f$ h_p(z_i) \f$
eDG_DG_Left, //!< Derivative of the left correction function for DG FR \f$ dGL_{p}(z_i) \f$
eDG_DG_Right, //!< Derivative of the Right correction function for DG FR \f$ dGR_{p}(z_i) \f$
eDG_SD_Left, //!< Derivative of the left correction function for SD FR \f$ dGL_{p}(z_i) \f$
eDG_SD_Right, //!< Derivative of the Right correction function for SD FR \f$ dGR_{p}(z_i) \f$
eDG_HU_Left, //!< Derivative of the left correction function for HU FR \f$ dGL_{p}(z_i) \f$
eDG_HU_Right, //!< Derivative of the Right correction function for HU FR \f$ dGR_{p}(z_i) \f$
SIZE_BasisType //!< Length of enum list
};
}
}
#endif
library/LibUtilities/Foundations/Foundations.hpp
+ 5
− 60
View file @ b3a1dda3
......@@ -36,39 +36,14 @@
#ifndef FOUNDATIONS_H
#define FOUNDATIONS_H
#include <LibUtilities/Foundations/BasisType.h>
#include <LibUtilities/Foundations/PointsType.h>
#include <string>
namespace Nektar
{
namespace LibUtilities
{
enum BasisType
{
eNoBasisType,
eOrtho_A, //!< Principle Orthogonal Functions \f$\widetilde{\psi}^a_p(z_i)\f$
eOrtho_B, //!< Principle Orthogonal Functions \f$\widetilde{\psi}^b_{pq}(z_i)\f$
eOrtho_C, //!< Principle Orthogonal Functions \f$\widetilde{\psi}^c_{pqr}(z_i)\f$
eModified_A, //!< Principle Modified Functions \f$ \phi^a_p(z_i) \f$
eModified_B, //!< Principle Modified Functions \f$ \phi^b_{pq}(z_i) \f$
eModified_C, //!< Principle Modified Functions \f$ \phi^c_{pqr}(z_i) \f$
eFourier, //!< Fourier Expansion \f$ \exp(i p\pi z_i)\f$
eGLL_Lagrange, //!< Lagrange for SEM basis \f$ h_p(z_i) \f$
eLegendre, //!< Legendre Polynomials \f$ L_p(z_i) = P^{0,0}_p(z_i)\f$. Same as Ortho_A
eChebyshev, //!< Chebyshev Polynomials \f$ T_p(z_i) = P^{-1/2,-1/2}_p(z_i)\f$
eMonomial, //!< Monomial polynomials \f$ L_p(z_i) = z_i^{p}\f$
eFourierSingleMode, //!< Fourier ModifiedExpansion with just the first mode \f$ \exp(i \pi z_i)\f$
eFourierHalfModeRe, //!< Fourier Modified expansions with just the real part of the first mode \f$ Re[\exp(i \pi z_i)]\f$
eFourierHalfModeIm, //!< Fourier Modified expansions with just the imaginary part of the first mode \f$ Im[\exp(i \pi z_i)]\f$
eGauss_Lagrange, //!< Lagrange Polynomials using the Gauss points \f$ h_p(z_i) \f$
eDG_DG_Left, //!< Derivative of the left correction function for DG FR \f$ dGL_{p}(z_i) \f$
eDG_DG_Right, //!< Derivative of the Right correction function for DG FR \f$ dGR_{p}(z_i) \f$
eDG_SD_Left, //!< Derivative of the left correction function for SD FR \f$ dGL_{p}(z_i) \f$
eDG_SD_Right, //!< Derivative of the Right correction function for SD FR \f$ dGR_{p}(z_i) \f$
eDG_HU_Left, //!< Derivative of the left correction function for HU FR \f$ dGL_{p}(z_i) \f$
eDG_HU_Right, //!< Derivative of the Right correction function for HU FR \f$ dGR_{p}(z_i) \f$
SIZE_BasisType //!< Length of enum list
};
const char* const BasisTypeMap[] =
{
"NoBasisType",
......@@ -84,8 +59,8 @@ namespace Nektar
"Chebyshev",
"Monomial",
"FourierSingleMode",
"FourierHalfModeRe",
"FourierHalfModeIm",
"FourierHalfModeRe",
"FourierHalfModeIm",
"Gauss_Lagrange",
"DG_DG_Left",
"DG_DG_Right",
......@@ -95,37 +70,7 @@ namespace Nektar
"DG_HU_Right"
};
enum PointsType
{
eNoPointsType,
eGaussGaussLegendre, //!< 1D Gauss-Gauss-Legendre quadrature points
eGaussRadauMLegendre, //!< 1D Gauss-Radau-Legendre quadrature points, pinned at x=-1
eGaussRadauPLegendre, //!< 1D Gauss-Radau-Legendre quadrature points, pinned at x=1
eGaussLobattoLegendre, //!< 1D Gauss-Lobatto-Legendre quadrature points
eGaussGaussChebyshev, //!< 1D Gauss-Gauss-Chebyshev quadrature points
eGaussRadauMChebyshev, //!< 1D Gauss-Radau-Chebyshev quadrature points, pinned at x=-1
eGaussRadauPChebyshev, //!< 1D Gauss-Radau-Chebyshev quadrature points, pinned at x=1
eGaussLobattoChebyshev, //!< 1D Gauss-Lobatto-Legendre quadrature points
eGaussRadauMAlpha0Beta1, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 0, \beta = 1 \f$
eGaussRadauMAlpha0Beta2, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 0, \beta = 2 \f$
eGaussRadauMAlpha1Beta0, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 1, \beta = 0 \f$
eGaussRadauMAlpha2Beta0, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 2, \beta = 0 \f$
eGaussKronrodLegendre, //!< 1D Gauss-Kronrod-Legendre quadrature points
eGaussRadauKronrodMLegendre, //!< 1D Gauss-Radau-Kronrod-Legendre quadrature points, pinned at x=-1
eGaussRadauKronrodMAlpha1Beta0, //!< 1D Gauss-Radau-Kronrod-Legendre pinned at x=-1, \f$ \alpha = 1, \beta = 0 \f$
eGaussLobattoKronrodLegendre, //!< 1D Lobatto Kronrod quadrature points
ePolyEvenlySpaced, //!< 1D Evenly-spaced points using Lagrange polynomial
eFourierEvenlySpaced, //!< 1D Evenly-spaced points using Fourier Fit
eFourierSingleModeSpaced, //!< 1D Non Evenly-spaced points for Single Mode analysis
eBoundaryLayerPoints, //!< 1D power law distribution for boundary layer points
eNodalTriElec, //!< 2D Nodal Electrostatic Points on a Triangle
eNodalTriFekete, //!< 2D Nodal Fekete Points on a Triangle
eNodalTriEvenlySpaced, //!< 2D Evenly-spaced points on a Triangle
eNodalTetEvenlySpaced, //!< 3D Evenly-spaced points on a Tetrahedron
eNodalTetElec, //!< 3D Nodal Electrostatic Points on a Tetrahedron
eNodalPrismEvenlySpaced, //!< 3D Evenly-spaced points on a Prism
SIZE_PointsType //!< Length of enum list
};
const std::string kPointsTypeStr[] =
{
......
library/LibUtilities/Foundations/PointsType.h 0 → 100644
+ 78
− 0
View file @ b3a1dda3
///////////////////////////////////////////////////////////////////////////////
//
// File Foundations.hpp
//
// For more information, please see: http://www.nektar.info
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Definition of enum lists and constants
//
///////////////////////////////////////////////////////////////////////////////
#ifndef NEKTAR_LIB_UTILITIES_POINTS_TYPE_H
#define NEKTAR_LIB_UTILITIES_POINTS_TYPE_H
namespace Nektar
{
namespace LibUtilities
{
enum PointsType
{
eNoPointsType,
eGaussGaussLegendre, //!< 1D Gauss-Gauss-Legendre quadrature points
eGaussRadauMLegendre, //!< 1D Gauss-Radau-Legendre quadrature points, pinned at x=-1
eGaussRadauPLegendre, //!< 1D Gauss-Radau-Legendre quadrature points, pinned at x=1
eGaussLobattoLegendre, //!< 1D Gauss-Lobatto-Legendre quadrature points
eGaussGaussChebyshev, //!< 1D Gauss-Gauss-Chebyshev quadrature points
eGaussRadauMChebyshev, //!< 1D Gauss-Radau-Chebyshev quadrature points, pinned at x=-1
eGaussRadauPChebyshev, //!< 1D Gauss-Radau-Chebyshev quadrature points, pinned at x=1
eGaussLobattoChebyshev, //!< 1D Gauss-Lobatto-Legendre quadrature points
eGaussRadauMAlpha0Beta1, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 0, \beta = 1 \f$
eGaussRadauMAlpha0Beta2, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 0, \beta = 2 \f$
eGaussRadauMAlpha1Beta0, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 1, \beta = 0 \f$
eGaussRadauMAlpha2Beta0, //!< Gauss Radau pinned at x=-1, \f$ \alpha = 2, \beta = 0 \f$
eGaussKronrodLegendre, //!< 1D Gauss-Kronrod-Legendre quadrature points
eGaussRadauKronrodMLegendre, //!< 1D Gauss-Radau-Kronrod-Legendre quadrature points, pinned at x=-1
eGaussRadauKronrodMAlpha1Beta0, //!< 1D Gauss-Radau-Kronrod-Legendre pinned at x=-1, \f$ \alpha = 1, \beta = 0 \f$
eGaussLobattoKronrodLegendre, //!< 1D Lobatto Kronrod quadrature points
ePolyEvenlySpaced, //!< 1D Evenly-spaced points using Lagrange polynomial
eFourierEvenlySpaced, //!< 1D Evenly-spaced points using Fourier Fit
eFourierSingleModeSpaced, //!< 1D Non Evenly-spaced points for Single Mode analysis
eBoundaryLayerPoints, //!< 1D power law distribution for boundary layer points
eNodalTriElec, //!< 2D Nodal Electrostatic Points on a Triangle
eNodalTriFekete, //!< 2D Nodal Fekete Points on a Triangle
eNodalTriEvenlySpaced, //!< 2D Evenly-spaced points on a Triangle
eNodalTetEvenlySpaced, //!< 3D Evenly-spaced points on a Tetrahedron
eNodalTetElec, //!< 3D Nodal Electrostatic Points on a Tetrahedron
eNodalPrismEvenlySpaced, //!< 3D Evenly-spaced points on a Prism
SIZE_PointsType //!< Length of enum list
};
}
}
#endif
library/SpatialDomains/CMakeLists.txt
+ 1
− 0
View file @ b3a1dda3
......@@ -33,6 +33,7 @@ SET(SPATIAL_DOMAINS_HEADERS
Conditions.h
Curve.hpp
#EdgeComponent.h
GeometryShapeType.h
GeomFactors.h
GeomFactors1D.h
GeomFactors2D.h
......
library/SpatialDomains/Geometry.h
+ 1
− 16
View file @ b3a1dda3
......@@ -39,6 +39,7 @@
//#include <SpatialDomains/SpatialDomains.hpp>
#include <SpatialDomains/GeomFactors.h>
#include <SpatialDomains/GeometryShapeType.h>
#include <boost/unordered_set.hpp>
#include <boost/functional/hash.hpp>
......@@ -51,22 +52,6 @@ namespace Nektar
class Geometry1D;
// Types of geometry types.
enum GeomShapeType
{
eNoGeomShapeType,
eSegment,
ePoint,
eTriangle,
eQuadrilateral,
eTetrahedron,
ePyramid,
ePrism,
eHexahedron,
SIZE_GeomShapeType
};
const char* const GeomShapeTypeMap[] =
{
"NoGeomShapeType",
......
library/SpatialDomains/GeometryShapeType.h 0 → 100644
+ 61
− 0
View file @ b3a1dda3
////////////////////////////////////////////////////////////////////////////////
//
// File: Geometry.h
//
// For more information, please see: http://www.nektar.info/
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
////////////////////////////////////////////////////////////////////////////////
#ifndef NEKTAR_SPATIALDOMAINS_GEOMETRY_SHAPE_TYPE_H
#define NEKTAR_SPATIALDOMAINS_GEOMETRY_SHAPE_TYPE_H
namespace Nektar
{
namespace SpatialDomains
{
// Types of geometry types.
enum GeomShapeType
{
eNoGeomShapeType,
eSegment,
ePoint,
eTriangle,
eQuadrilateral,
eTetrahedron,
ePyramid,
ePrism,
eHexahedron,
SIZE_GeomShapeType
};
}
}
#endif
regressionTests/CMakeLists.txt
+ 1
− 1
View file @ b3a1dda3
......@@ -15,7 +15,7 @@ MACRO(ADD_REGRESSION_EXECUTABLE name source)
SET_TARGET_PROPERTIES(${name}
PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER test)
INSTALL(TARGETS ${name}
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT test OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} COMPONENT test OPTIONAL
......
solvers/CMakeLists.txt
+ 1
− 0
View file @ b3a1dda3
......@@ -34,6 +34,7 @@ MACRO(ADD_SOLVER_EXECUTABLE name component source)
SET_TARGET_PROPERTIES(${name}
PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${component})
INSTALL(TARGETS ${name}
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT ${component} OPTIONAL)
......
utilities/CMakeLists.txt
+ 1
− 1
View file @ b3a1dda3
......@@ -34,7 +34,7 @@ MACRO(ADD_UTILITIES_EXECUTABLE name component source)
SET_TARGET_PROPERTIES(${name}
PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${component})
INSTALL(TARGETS ${name}
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT ${component})
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment