Commit d49e26bc authored by Chris Cantwell's avatar Chris Cantwell

Merge branch 'fix/missing-header-install' of localhost:nektar

parents a0ccf973 71611b93
......@@ -4,111 +4,6 @@ SET(BasicConstHeaders
./BasicConst/NektarUnivTypeDefs.hpp
)
SET(LinearAlgebraHeaders
./LinearAlgebra/Arpack.hpp
./LinearAlgebra/Blas.hpp
./LinearAlgebra/BlasOverrideUtil.hpp
./LinearAlgebra/SparseBlas.hpp
./LinearAlgebra/BlasArray.hpp
./LinearAlgebra/BlockMatrix.hpp
./LinearAlgebra/CanGetRawPtr.hpp
./LinearAlgebra/DgemmOverride.hpp
./LinearAlgebra/DgemvOverride.hpp
./LinearAlgebra/ExplicitInstantiation.h
./LinearAlgebra/Lapack.hpp
./LinearAlgebra/MatrixBase.hpp
./LinearAlgebra/MatrixFuncs.h
./LinearAlgebra/MatrixOperationsDeclarations.hpp
./LinearAlgebra/MatrixOperations.cpp
./LinearAlgebra/MatrixOperations.hpp
./LinearAlgebra/MatrixSize.hpp
./LinearAlgebra/MatrixStorageType.h
./LinearAlgebra/MatrixType.h
./LinearAlgebra/MatrixVectorMultiplication.hpp
./LinearAlgebra/NekLinAlgAlgorithms.hpp
./LinearAlgebra/NekLinSys.hpp
./LinearAlgebra/NekMatrix.hpp
./LinearAlgebra/NekMatrixFwd.hpp
./LinearAlgebra/NekMatrixMetadata.hpp
./LinearAlgebra/NekPoint.hpp
./LinearAlgebra/NekTypeDefs.hpp
./LinearAlgebra/NekVector.hpp
./LinearAlgebra/NekVectorCommon.hpp
./LinearAlgebra/NekVectorConstantSized.hpp
./LinearAlgebra/NekVectorFwd.hpp
./LinearAlgebra/NekVectorMetadata.hpp
./LinearAlgebra/NekVectorTypeTraits.hpp
./LinearAlgebra/NekVectorVariableSized.hpp
./LinearAlgebra/PointerWrapper.h
./LinearAlgebra/ScaledMatrix.hpp
./LinearAlgebra/Space.h
./LinearAlgebra/StandardMatrix.hpp
./LinearAlgebra/TransF77.hpp
./LinearAlgebra/SparseStandardMatrix.hpp
)
SET(FoundationHeaders
./Foundations/Graph.h
./Foundations/Basis.h
./Foundations/BasisType.h
./Foundations/Foundations.hpp
./Foundations/FourierPoints.h
./Foundations/FourierSingleModePoints.h
./Foundations/BLPoints.h
./Foundations/GaussPoints.h
./Foundations/Interp.h
./Foundations/InterpCoeff.h
./Foundations/ManagerAccess.h
./Foundations/NodalTetElec.h
./Foundations/NodalTriElec.h
./Foundations/NodalTriFekete.h
./Foundations/Points.h
./Foundations/PointsType.h
./Foundations/PolyEPoints.h
./Foundations/NodalUtil.h
./Foundations/NodalTriEvenlySpaced.h
./Foundations/NodalTetEvenlySpaced.h
./Foundations/NodalPrismEvenlySpaced.h
./Foundations/PhysGalerkinProject.h
)
SET(InterpreterHeaders
./Interpreter/AnalyticExpressionEvaluator.hpp
# ./Interpreter/ExpressionEvaluator.h
)
SET(PolyLibHeaders
./Polylib/Polylib.h
)
SET(CommunicationHeaders
./Communication/Comm.h
./Communication/CommSerial.h
./Communication/GsLib.hpp
./Communication/Transposition.h
./Communication/Xxt.hpp
)
SET(ExpressionTemplates
../ExpressionTemplates/AssociativeTraits.hpp
../ExpressionTemplates/AssociativeTransform.hpp
../ExpressionTemplates/BackwardInverseTransform.hpp
../ExpressionTemplates/CommutativeTraits.hpp
../ExpressionTemplates/CommutativeTransform.hpp
../ExpressionTemplates/CreateFromTree.hpp
../ExpressionTemplates/ExpressionEvaluator.hpp
../ExpressionTemplates/ExpressionTemplates.hpp
../ExpressionTemplates/ForwardInverseTransform.hpp
../ExpressionTemplates/InverseOperatorTypeTraits.hpp
../ExpressionTemplates/InvertNode.hpp
../ExpressionTemplates/Node.hpp
../ExpressionTemplates/Operators.hpp
../ExpressionTemplates/PerformCommutativeTransformIfNeeded.hpp
../ExpressionTemplates/PushDownUnaryNodes.hpp
../ExpressionTemplates/RemoveAllUnecessaryTemporaries.hpp
../ExpressionTemplates/SortAssociativeCommutativeClusters.hpp
)
SET(BasicUtilsHeaders
./BasicUtils/ArrayPolicies.hpp
./BasicUtils/BoostUtil.hpp
......@@ -145,75 +40,178 @@ SET(BasicUtilsSources
./BasicUtils/XmlUtil.cpp
)
SET(Memory
./Memory/ThreadSpecificPool.cpp
./Memory/ThreadSpecificPool.hpp
./Memory/NekMemoryManager.hpp
SET(CommunicationHeaders
./Communication/Comm.h
./Communication/CommSerial.h
./Communication/GsLib.hpp
./Communication/Transposition.h
./Communication/Xxt.hpp
)
SET(CommunicationSources
./Communication/Comm.cpp
./Communication/CommSerial.cpp
./Communication/Transposition.cpp
)
IF(NEKTAR_USE_MPI)
SET(CommunicationHeaders ${CommunicationHeaders}
./Communication/CommMpi.h)
SET(CommunicationSources ${CommunicationSources}
./Communication/CommMpi.cpp)
ENDIF(NEKTAR_USE_MPI)
SET(FFTHeaders
./FFT/NektarFFT.h
)
SET(FFTSources
./FFT/NektarFFT.cpp
)
IF(NEKTAR_USE_FFTW)
SET(FFTHeaders ${FFTHeaders} ./FFT/NekFFTW.h)
SET(FFTSources ${FFTSources} ./FFT/NekFFTW.cpp)
ENDIF(NEKTAR_USE_FFTW)
SET(FoundationHeaders
./Foundations/Basis.h
./Foundations/BasisType.h
./Foundations/BLPoints.h
./Foundations/FoundationsFwd.hpp
./Foundations/Foundations.hpp
./Foundations/FourierPoints.h
./Foundations/FourierSingleModePoints.h
./Foundations/GaussPoints.h
./Foundations/Graph.h
./Foundations/InterpCoeff.h
./Foundations/Interp.h
./Foundations/ManagerAccess.h
./Foundations/NodalPrismEvenlySpaced.h
./Foundations/NodalTetElecData.h
./Foundations/NodalTetElec.h
./Foundations/NodalTetEvenlySpaced.h
./Foundations/NodalTriElecData.h
./Foundations/NodalTriElec.h
./Foundations/NodalTriEvenlySpaced.h
./Foundations/NodalTriFeketeData.h
./Foundations/NodalTriFekete.h
./Foundations/NodalUtil.h
./Foundations/PhysGalerkinProject.h
./Foundations/Points.h
./Foundations/PointsType.h
./Foundations/PolyEPoints.h
)
SET(FoundationSources
./Foundations/Basis.cpp
./Foundations/Graph.cpp
./Foundations/BLPoints.cpp
./Foundations/FourierPoints.cpp
./Foundations/FourierSingleModePoints.cpp
./Foundations/BLPoints.cpp
./Foundations/GaussPoints.cpp
./Foundations/Interp.cpp
./Foundations/Graph.cpp
./Foundations/InterpCoeff.cpp
./Foundations/Interp.cpp
./Foundations/ManagerAccess.cpp
./Foundations/NodalPrismEvenlySpaced.cpp
./Foundations/NodalTetElec.cpp
./Foundations/NodalTetEvenlySpaced.cpp
./Foundations/NodalTriElec.cpp
./Foundations/NodalTriEvenlySpaced.cpp
./Foundations/NodalTriFekete.cpp
./Foundations/NodalUtil.cpp
./Foundations/PhysGalerkinProject.cpp
./Foundations/Points.cpp
./Foundations/PolyEPoints.cpp
./Foundations/NodalUtil.cpp
./Foundations/NodalTriEvenlySpaced.cpp
./Foundations/NodalTetEvenlySpaced.cpp
./Foundations/NodalPrismEvenlySpaced.cpp
./Foundations/PhysGalerkinProject.cpp
)
SET(InterpreterHeaders
./Interpreter/AnalyticExpressionEvaluator.hpp
)
SET(InterpreterSources
./Interpreter/AnalyticExpressionEvaluator.cpp
# ./Interpreter/ExpressionEvaluator.cpp
)
)
SET(PolylibSources
./Polylib/Polylib.cpp
SET(KernelHeaders
./Kernel/kernel.h
)
SET(CommunicationSources
./Communication/Comm.cpp
./Communication/CommSerial.cpp
./Communication/Transposition.cpp
)
SET(KernelSources
./Kernel/kernel.cpp
)
IF(NEKTAR_USE_MPI)
SET(CommunicationHeaders ${CommunicationHeaders}
./Communication/CommMpi.h)
SET(CommunicationSources ${CommunicationSources}
./Communication/CommMpi.cpp)
ENDIF(NEKTAR_USE_MPI)
SET(LinearAlgebraHeaders
./LinearAlgebra/Arpack.hpp
./LinearAlgebra/BlasArray.hpp
./LinearAlgebra/Blas.hpp
./LinearAlgebra/BlasOverrideUtil.hpp
./LinearAlgebra/BlockMatrix.hpp
./LinearAlgebra/CanGetRawPtr.hpp
./LinearAlgebra/DgemmOverride.hpp
./LinearAlgebra/DgemvOverride.hpp
./LinearAlgebra/ExplicitInstantiation.h
./LinearAlgebra/IsDgemmTraits.hpp
./LinearAlgebra/Lapack.hpp
./LinearAlgebra/MatrixBase.hpp
./LinearAlgebra/MatrixFuncs.h
./LinearAlgebra/MatrixOperationsDeclarations.hpp
./LinearAlgebra/MatrixOperations.hpp
./LinearAlgebra/MatrixSize.hpp
./LinearAlgebra/MatrixStorageType.h
./LinearAlgebra/MatrixType.h
./LinearAlgebra/MatrixVectorMultiplication.hpp
./LinearAlgebra/NekLinAlgAlgorithms.hpp
./LinearAlgebra/NekLinSys.hpp
./LinearAlgebra/NekMatrixFwd.hpp
./LinearAlgebra/NekMatrix.hpp
./LinearAlgebra/NekMatrixMetadata.hpp
./LinearAlgebra/NekPoint.hpp
./LinearAlgebra/NekTypeDefs.hpp
./LinearAlgebra/NekVectorCommon.hpp
./LinearAlgebra/NekVectorConstantSized.hpp
./LinearAlgebra/NekVectorFwd.hpp
./LinearAlgebra/NekVector.hpp
./LinearAlgebra/NekVectorMetadata.hpp
./LinearAlgebra/NekVectorTypeTraits.hpp
./LinearAlgebra/NekVectorVariableSized.hpp
./LinearAlgebra/PointerWrapper.h
./LinearAlgebra/ScaledMatrix.hpp
./LinearAlgebra/Space.h
./LinearAlgebra/SparseBlas.hpp
./LinearAlgebra/SparseStandardMatrix.hpp
./LinearAlgebra/StandardMatrix.hpp
./LinearAlgebra/TransF77.hpp
)
SET(LinearAlgebraSources
./LinearAlgebra/blas.cpp
./LinearAlgebra/BlockMatrix.cpp
./LinearAlgebra/MatrixBase.cpp
./LinearAlgebra/MatrixFuncs.cpp
./LinearAlgebra/MatrixVectorMultiplication.cpp
./LinearAlgebra/NekVector.cpp
./LinearAlgebra/ScaledMatrix.cpp
./LinearAlgebra/StandardMatrix.cpp
# ./LinearAlgebra/lapack.cpp
./LinearAlgebra/BlockMatrix.cpp
./LinearAlgebra/MatrixBase.cpp
./LinearAlgebra/MatrixFuncs.cpp
./LinearAlgebra/MatrixOperations.cpp
./LinearAlgebra/MatrixVectorMultiplication.cpp
./LinearAlgebra/NekVector.cpp
./LinearAlgebra/ScaledMatrix.cpp
./LinearAlgebra/StandardMatrix.cpp
)
SET(KernelHeaders
./Kernel/kernel.h
SET(MemoryHeaders
./Memory/ThreadSpecificPool.hpp
./Memory/NekMemoryManager.hpp
)
SET(KernelSources
./Kernel/kernel.cpp
SET(MemorySources
./Memory/ThreadSpecificPool.cpp
)
SET(PolyLibHeaders
./Polylib/Polylib.h
)
SET(PolylibSources
./Polylib/Polylib.cpp
)
SET(TimeIntegrationHeaders
......@@ -224,20 +222,26 @@ SET(TimeIntegrationSources
./TimeIntegration/TimeIntegrationScheme.cpp
)
SET(FFTHeaders
./FFT/NektarFFT.h
)
SET(FFTSources
./FFT/NektarFFT.cpp
SET(ExpressionTemplates
../ExpressionTemplates/AssociativeTraits.hpp
../ExpressionTemplates/AssociativeTransform.hpp
../ExpressionTemplates/BackwardInverseTransform.hpp
../ExpressionTemplates/CommutativeTraits.hpp
../ExpressionTemplates/CommutativeTransform.hpp
../ExpressionTemplates/CreateFromTree.hpp
../ExpressionTemplates/ExpressionEvaluator.hpp
../ExpressionTemplates/ExpressionTemplates.hpp
../ExpressionTemplates/ForwardInverseTransform.hpp
../ExpressionTemplates/InverseOperatorTypeTraits.hpp
../ExpressionTemplates/InvertNode.hpp
../ExpressionTemplates/Node.hpp
../ExpressionTemplates/Operators.hpp
../ExpressionTemplates/PerformCommutativeTransformIfNeeded.hpp
../ExpressionTemplates/PushDownUnaryNodes.hpp
../ExpressionTemplates/RemoveAllUnecessaryTemporaries.hpp
../ExpressionTemplates/SortAssociativeCommutativeClusters.hpp
)
IF(NEKTAR_USE_FFTW)
SET(FFTHeaders ${FFTHeaders} ./FFT/NekFFTW.h)
SET(FFTSources ${FFTSources} ./FFT/NekFFTW.cpp)
ENDIF(NEKTAR_USE_FFTW)
SET(BaseHeaders
LibUtilitiesDeclspec.h
)
......@@ -250,7 +254,8 @@ SOURCE_GROUP("Foundation Headers" FILES ${FoundationHeaders})
SOURCE_GROUP("Foundation Sources" FILES ${FoundationSources})
SOURCE_GROUP("Linear Algebra Headers" FILES ${LinearAlgebraHeaders})
SOURCE_GROUP("Linear Algebra Sources" FILES ${LinearAlgebraSources})
SOURCE_GROUP("Memory" FILES ${Memory})
SOURCE_GROUP("Memory Headers" FILES ${MemoryHeaders})
SOURCE_GROUP("Memory Sources" FILES ${MemorySources})
SOURCE_GROUP("Polylib Headers" FILES ${PolyLibHeaders})
......@@ -274,7 +279,7 @@ SOURCE_GROUP("FFT Sources" FILES ${FFTSources})
SOURCE_GROUP("Base" FILES ${BaseHeaders})
SET(LibUtilityHeaders
${Memory}
${MemoryHeaders}
${BasicUtilsHeaders}
${ExpressionTemplates}
${PolyLibHeaders}
......@@ -284,9 +289,9 @@ SET(LibUtilityHeaders
${BasicConstHeaders}
${InterpreterHeaders}
${KernelHeaders}
${TimeIntegrationHeaders}
${FFTHeaders}
${BaseHeaders}
${TimeIntegrationHeaders}
${FFTHeaders}
${BaseHeaders}
)
SET(LibUtilitySources
......@@ -299,6 +304,7 @@ SET(LibUtilitySources
${KernelSources}
${TimeIntegrationSources}
${FFTSources}
${MemorySources}
)
......@@ -324,7 +330,7 @@ INSTALL(FILES ${PolyLibHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/P
INSTALL(FILES ${CommunicationHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/Communication COMPONENT dev)
INSTALL(FILES ${ExpressionTemplates} DESTINATION ${NEKTAR_INCLUDE_DIR}/ExpressionTemplates COMPONENT dev)
INSTALL(FILES ${BasicUtilsHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/BasicUtils COMPONENT dev)
INSTALL(FILES ${Memory} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/Memory COMPONENT dev)
INSTALL(FILES ${MemoryHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/Memory COMPONENT dev)
INSTALL(FILES ${KernelHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/Kernel COMPONENT dev)
INSTALL(FILES ${TimeIntegrationHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/TimeIntegration COMPONENT dev)
INSTALL(FILES ${BaseHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities COMPONENT dev)
......
This diff is collapsed.
///////////////////////////////////////////////////////////////////////////////
//
// File Interpreter.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: Wrapper around interp.y functions for function interpretation
//
///////////////////////////////////////////////////////////////////////////////
#ifndef INTERPRETER_H
#define INTERPRETER_H
#include <cstdio>
extern "C"
{
// -- Routines from initial.y:
void yy_initialize (void);
double yy_interpret (const char*);
void yy_vec_init (const char*, const char*);
void yy_vec_interp (const int, ...);
void yy_help (void);
void yy_show (void);
}
namespace Nektar
{
class Interpret
{
public:
Interpret()
{
yy_initialise();
}
~Interpret()
{
}
void SetVector (const char* v, const char* f)
{
yy_vec_init (v, f);
}
void EvaluateVector (const int n ... )
{
yy_vec_interp (n ... );
}
double EvaluateDoubleValue (const char* s)
{
return yy_interpret (s);
}
int EvaluateIntValue (const char* s)
{
return static_cast<int>(yy_interpret (s));
}
private:
};
#endif
/*****************************************************************************
* DEFAULTS.H: default parameter initializations for initial.y.
* All variables are now in a single table, everything is double precision.
*
* $Id: defaults.h,v 6.9 2005/06/14 04:15:09 hmb Exp $
*****************************************************************************/
static struct {
char* name;
double cval;
} consts[] = {
/* -- Mathematical constants. */
"E" , 2.71828182845904523536 ,
"DEG" , 57.29577951308232087721 ,
"PI" , 3.14159265358979323844 ,
"TWOPI" , 6.28318530717958647688 ,
"EULER" , 0.57721566490153286061 ,
"GOLDEN" , 1.61803398874989484820 ,
0 , 0.0
};
This diff is collapsed.
//#ifndef H_NEKLINSYS
//#define H_NEKLINSYS
//
//#include <LibUtilities/NekLinAlg.hpp>
//#include <LibUtilities/Lapack.h>
//#include <LibUtilities/NekMatrix.hpp>
//#include <LibUtilities/NekVector.hpp>
//
//#include <boost/shared_ptr.hpp>
//
//namespace LibUtilities
//{
// namespace NekLinAlg
// {
//
// class NekLinSys
// {
// private:
// boost::shared_ptr<NekMatrix<double> > _matrix;
//
// bool _factored; ///< Flag to identify if matrix is factored
// int *_ipiv; ///< Pivoting array
// int _lda; ///< leading diagonal of matrix
// int _bwidth; ///< Bandwdith for positive banded matrix \n
// ///< Upper sug diagonals plus one for general
// ///< banded matrix
// int _ldiag; ///< Low sub diagonals for general banded matrix
// double* _packed_matrix; ///< Inverse/Factorisation of Matrix pointer
//
//
//
// // --------------------------------------------------------------------
// // Private Methods
// // --------------------------------------------------------------------
//
// inline void Initiate()
// {
// _factored = false;
// _ipiv = (int*)NULL;
// _packed_matrix = (double *)NULL;
// _bwidth = 0; _ldiag = 0;
// }
//
// // declare the memory of _packed_matrix depending upon its definition
// void SetMemPackedMatrix()
// {
//
// if(_packed_matrix)
// {
// return;
// }
//
// ASSERTL0((_lda > 0), "NekLinSys::SetMemPackedMatrix","_lda not defined ");
//
// switch(_matrix->matform()){
// case Symmetric: case Symmetric_Positive:
// _packed_matrix = new double [_lda*(_lda+1)/2];
// Vmath::zero(_lda*(_lda+1)/2,_packed_matrix,1);
// break;
// case Symmetric_Positive_Banded:
// ASSERTL0((_bwidth > 0 ), "NekLinSys::SetMemPackedMatrix",
// "_bwidth not set");
// _packed_matrix = new double [_lda*_bwidth];
// Vmath::zero(_lda*_bwidth,_packed_matrix,1);
// break;
// case General_Banded:
// ASSERTL0((_bwidth > 0 )&&(_ldiag > 0),
// "NekLinSys::SetMemPackedMatrix","_bwidth or _ldiag is not set");
// _packed_matrix = new double [_lda*2*(_ldiag+_bwidth)];
// Vmath::zero(_lda*2*(_ldiag+_bwidth),_packed_matrix,1);
// break;
// case General_Full:
// _packed_matrix = new double [_lda*_lda];
// Vmath::zero(_lda*_lda,_packed_matrix,1);
// break;
// }
// }
//
// /** \brief factorise matrix depending upon definition stored in _mat_form.
//
// Options for mat_from are:
//
// - _mat_form = Symmetric-Positive implies Cholesky factorization using
// Lapack::dpptrf.
//
// - _mat_form = Symmetric implies Factorisation using Bunch-Kaufman