Commit 0c3f3cc1 authored by Pavel Burovskiy's avatar Pavel Burovskiy

Removing unnecessary includes in whole LibUtilities

parent ce184cee
......@@ -6,6 +6,7 @@
#include "LibUtilities/Foundations/Basis.h"
#include "SpatialDomains/MeshComponents.h"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
#include <algorithm>
#include <iostream>
......@@ -18,6 +19,7 @@
using namespace std;
using namespace boost;
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::LocalRegions;
using namespace Nektar::StdRegions;
......
......@@ -3,6 +3,8 @@
#include <LocalRegions/HexExp.h>
#include <SpatialDomains/MeshGraph3D.h>
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
......
......@@ -5,7 +5,8 @@
#include "LibUtilities/Foundations/Foundations.hpp"
#include "LibUtilities/Foundations/Basis.h"
#include "SpatialDomains/MeshComponents.h"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
#include <algorithm>
#include <iostream>
......
......@@ -3,6 +3,7 @@
#include <LocalRegions/PrismExp.h>
#include <SpatialDomains/MeshGraph3D.h>
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
......
......@@ -12,7 +12,9 @@
#include "LibUtilities/Foundations/Basis.h"
#include "SpatialDomains/MeshComponents.h"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::LocalRegions;
using namespace Nektar::StdRegions;
......
......@@ -12,7 +12,9 @@
#include "LibUtilities/Foundations/Basis.h"
#include "SpatialDomains/MeshComponents.h"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::LocalRegions;
using namespace Nektar::StdRegions;
......
......@@ -5,6 +5,7 @@
#include "LibUtilities/Foundations/Foundations.hpp"
#include "LibUtilities/Foundations/Basis.h"
#include "SpatialDomains/MeshComponents.h"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
#include <algorithm>
#include <iostream>
......@@ -16,6 +17,8 @@
#include <iosfwd>
// using namespace boost;
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::LocalRegions;
using namespace Nektar::StdRegions;
......
......@@ -12,7 +12,9 @@ using namespace std;
#include "StdRegions/StdRegions.hpp"
#include "LibUtilities/Foundations/Foundations.hpp"
#include "LibUtilities/Foundations/Basis.h"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::StdRegions;
......
......@@ -12,6 +12,9 @@ using namespace std;
#include "StdRegions/StdRegions.hpp"
#include "LibUtilities/Foundations/Foundations.hpp"
#include "LibUtilities/Foundations/Basis.h"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::StdRegions;
......
......@@ -3,6 +3,7 @@
#include "LibUtilities/Foundations/Foundations.hpp"
#include <StdRegions/StdExpUtil.h>
#include <StdRegions/StdPrismExp.h>
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
#include <algorithm>
......
......@@ -2,6 +2,7 @@
#include "LibUtilities/Foundations/Foundations.hpp"
#include <StdRegions/StdExpUtil.h>
#include <StdRegions/StdPrismExp.h>
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
#include <algorithm>
#include <iostream>
......
......@@ -11,7 +11,9 @@
#include <StdRegions/StdRegions.hpp>
#include <LibUtilities/Foundations/Foundations.hpp>
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::StdRegions;
......
......@@ -9,7 +9,9 @@
#include "StdRegions/StdRegions.hpp"
#include "LibUtilities/Foundations/Foundations.hpp"
#include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::StdRegions;
......
......@@ -54,30 +54,3 @@ namespace Nektar
#endif
/***
$Log: NektarUnivConsts.hpp,v $
Revision 1.8 2008/09/09 13:59:51 sherwin
Added NekZeroTol
Revision 1.7 2007/11/29 17:00:13 sherwin
Update to do with MultiRegions stuff
Revision 1.6 2007/05/14 23:25:15 bnelson
Removed unneeded code.
Revision 1.5 2007/05/14 23:24:40 bnelson
Removed unneeded code.
Revision 1.4 2007/04/26 21:51:54 jfrazier
Converted to new multi_array implementation.
Revision 1.3 2007/03/31 00:39:51 bnelson
*** empty log message ***
Revision 1.2 2007/03/21 20:56:42 sherwin
Update to change BasisSharedVector to boost::shared_array<BasisSharedPtr> and removed tthe Vector definitions in GetCoords and PhysDeriv
Revision 1.1 2007/03/20 11:56:25 sherwin
.
**/
///////////////////////////////////////////////////////////////////////////////
//
// Concepts.hpp
////////////////////////////////////////////////////////////////////////////////
//
// File: Concepts.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:
//
// Defines concepts for the boost concept checking library.
// 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: Defines concepts for the boost concept checking library.
//
////////////////////////////////////////////////////////////////////////////////
......@@ -33,16 +60,3 @@ namespace Nektar
#endif
/**
$Log: Concepts.hpp,v $
Revision 1.1 2006/05/04 18:57:41 kirby
*** empty log message ***
Revision 1.2 2006/02/12 15:06:12 sherwin
Changed .h files to .hpp
Revision 1.1 2006/01/31 13:51:12 bnelson
Updated for new configure.
**/
......@@ -42,8 +42,6 @@
#include <boost/type_traits.hpp>
#include <LibUtilities/BasicUtils/ErrorUtil.hpp>
#include <iostream>
namespace Nektar
{
template<typename DataType>
......@@ -82,19 +80,3 @@ namespace Nektar
#endif //NEKTAR_LIB_UTILITIES_BASIC_UTILS_CONSISTENT_ACCESS_OBJECT_HPP
/**
$Log: ConsistentObjectAccess.hpp,v $
Revision 1.4 2007/07/22 23:03:25 bnelson
Backed out Nektar::ptr.
Revision 1.3 2007/07/20 00:39:36 bnelson
Replaced boost::shared_ptr with Nektar::ptr
Revision 1.2 2007/01/29 01:35:17 bnelson
Removed memory manager requirements.
Revision 1.1 2006/11/06 17:06:20 bnelson
*** empty log message ***
**/
......@@ -35,7 +35,6 @@
#ifndef ERRORUTIL_HPP
#define ERRORUTIL_HPP
#include <iostream>
#include <stdexcept>
#include <boost/lexical_cast.hpp>
#include <LibUtilities/LibUtilitiesDeclspec.h>
......@@ -113,51 +112,3 @@ namespace ErrorUtil
#endif //ERRORUTIL_HPP
/***
$Log: ErrorUtil.hpp,v $
Revision 1.9 2008/01/20 04:02:49 bnelson
Fixed compiler warnings.
Revision 1.8 2007/07/10 22:22:19 jfrazier
Added an additional indicator of the error severity (fatal or warning).
Revision 1.7 2007/06/10 23:36:59 bnelson
A previous change to ErrorUtil::Error added an additional level parameter, breaking code which called it directly outside of ErrorUtil. A new method without this parameter was added.
Revision 1.6 2007/06/06 04:57:21 bnelson
Removed all printing to the console when error reporting is done via exceptions. This makes it easier to see errors in the UnitTests.
Revision 1.5 2007/05/27 18:28:23 bnelson
*** empty log message ***
Revision 1.4 2007/05/22 02:02:35 bnelson
Changed Array::size to Array::num_elements.
Fixed some compiler errors in assertions.
Revision 1.3 2007/05/14 23:22:38 bnelson
Errors throw a new exception type NekError.
Revision 1.2 2006/08/14 02:18:02 bnelson
Added the option to throw exceptions when an error is encountered.
Revision 1.1 2006/06/01 11:07:52 kirby
*** empty log message ***
Revision 1.4 2006/05/16 20:40:44 jfrazier
Renamed ERROR to NEKERROR to prevent conflict in Visual Studio.
Revision 1.3 2006/05/09 16:40:57 jfrazier
Added ERROR macro definition.
Revision 1.2 2006/05/07 18:51:05 bnelson
Format changes for coding standard.
Revision 1.1 2006/05/04 18:57:41 kirby
*** empty log message ***
Revision 1.7 2006/04/14 14:51:17 jfrazier
Fixed a problem which is most likely a preprocessor problem. The file and line
number were inconsistent between release and debug builds.
**/
......@@ -38,6 +38,8 @@
#define TIXML_USE_STL
#endif
#include <LibUtilities/BasicUtils/MeshPartition.h>
#include <iostream>
#include <iomanip>
#include <vector>
......@@ -48,12 +50,12 @@
#include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
#include <LibUtilities/BasicUtils/Metis.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <boost/algorithm/string.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graph_utility.hpp>
#include <LibUtilities/BasicUtils/MeshPartition.h>
namespace Nektar
{
......
......@@ -38,23 +38,27 @@
#include <boost/graph/subgraph.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
class TiXmlElement;
namespace Nektar
{
namespace LibUtilities
{
class SessionReader;
class MeshPartition
{
typedef boost::shared_ptr<SessionReader> SessionReaderSharedPtr;
public:
LIB_UTILITIES_EXPORT MeshPartition(const LibUtilities::SessionReaderSharedPtr& pSession);
LIB_UTILITIES_EXPORT MeshPartition(const SessionReaderSharedPtr& pSession);
LIB_UTILITIES_EXPORT ~MeshPartition();
LIB_UTILITIES_EXPORT void PartitionMesh();
LIB_UTILITIES_EXPORT void WriteLocalPartition(
LibUtilities::SessionReaderSharedPtr& pSession);
SessionReaderSharedPtr& pSession);
private:
struct MeshEntity
......@@ -171,11 +175,11 @@ namespace Nektar
CommSharedPtr m_comm;
void ReadMesh(const LibUtilities::SessionReaderSharedPtr& pSession);
void ReadMesh(const SessionReaderSharedPtr& pSession);
void CreateGraph(BoostSubGraph& pGraph);
void PartitionGraph(BoostSubGraph& pGraph,
BoostSubGraph& pLocalPartition);
void OutputPartition(LibUtilities::SessionReaderSharedPtr& pSession, BoostSubGraph& pGraph, TiXmlElement* pGeometry);
void OutputPartition(SessionReaderSharedPtr& pSession, BoostSubGraph& pGraph, TiXmlElement* pGeometry);
};
typedef boost::shared_ptr<MeshPartition> MeshPartitionSharedPtr;
......
......@@ -36,7 +36,6 @@
#ifndef NEKTAR_LIB_UTILITIES_BASIC_UTILS_NEK_MANAGER_HPP
#define NEKTAR_LIB_UTILITIES_BASIC_UTILS_NEK_MANAGER_HPP
#include <algorithm>
#include <map>
#include <boost/function.hpp>
......
......@@ -37,17 +37,17 @@
#define TIXML_USE_STL
#endif
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <iostream>
#include <string>
using namespace std;
#include <boost/algorithm/string.hpp>
//#include <boost/algorithm/string/regex.hpp>
#include <tinyxml/tinyxml.h>
#include <LibUtilities/BasicUtils/ErrorUtil.hpp>
#include <LibUtilities/BasicUtils/Equation.h>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/MeshPartition.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
......
......@@ -35,15 +35,14 @@
#ifndef NEKTAR_LIB_UTILITIES_SESSIONREADER_H
#define NEKTAR_LIB_UTILITIES_SESSIONREADER_H
#include <iostream>
//#include <iostream>
#include <map>
#include <string>
#include <LibUtilities/Communication/Comm.h>
//#include <LibUtilities/BasicUtils/Equation.h>
#include <LibUtilities/Interpreter/AnalyticExpressionEvaluator.hpp>
#include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
#include <LibUtilities/LibUtilitiesDeclspec.h>
#include <LibUtilities/Interpreter/AnalyticExpressionEvaluator.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/enable_shared_from_this.hpp>
......
......@@ -37,8 +37,6 @@
#ifndef NEKTAR_LIB_LIBUTILITIES_BASSICUTILS_VECTORDISTMATH_HPP
#define NEKTAR_LIB_LIBUTILITIES_BASSICUTILS_VECTORDISTMATH_HPP
#include <string>
#include <LibUtilities/LinearAlgebra/Blas.hpp>
#include <LibUtilities/Communication/Comm.h>
namespace VDmath
......
......@@ -36,8 +36,8 @@
#ifndef NEKTAR_LIB_LIBUTILITIES_BASSICUTILS_VECTORDISTMATHARRAY_HPP
#define NEKTAR_LIB_LIBUTILITIES_BASSICUTILS_VECTORDISTMATHARRAY_HPP
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/VDmath.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Communication/Comm.h>
using namespace Nektar;
......
......@@ -33,7 +33,6 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <string>
#include <LibUtilities/BasicUtils/Vmath.hpp>
#include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
#include "LibUtilities/LibUtilitiesDeclspec.h"
......
......@@ -36,7 +36,6 @@
#ifndef NEKTAR_LIB_LIBUTILITIES_BASSICUTILS_VECTORMATH_HPP
#define NEKTAR_LIB_LIBUTILITIES_BASSICUTILS_VECTORMATH_HPP
#include <string>
#include <LibUtilities/LinearAlgebra/Blas.hpp>
#include <LibUtilities/LibUtilitiesDeclspec.h>
......@@ -303,92 +302,3 @@ namespace Vmath
}
#endif //VECTORMATH_HPP
/***
$Log: Vmath.hpp,v $
Revision 1.21 2009/05/15 14:38:41 pvos
Changed check for regular quads so that it also includes parallellograms
Revision 1.20 2009/03/10 23:44:15 claes
Made y in z = x/y a constant in the parameter list.
Revision 1.19 2009/01/21 16:57:26 pvos
Added additional geometric factors to improve efficiency
Revision 1.18 2008/12/17 16:56:46 pvos
Performance updates
Revision 1.17 2008/09/09 14:00:55 sherwin
Fixed error in Sdiv definition
Revision 1.16 2008/08/09 19:26:08 sherwin
Corrected big in Reverse
Revision 1.15 2008/07/19 21:09:21 sherwin
Added Reverse function
Revision 1.14 2008/05/10 18:27:32 sherwin
Modifications necessary for QuadExp Unified DG Solver
Revision 1.13 2008/04/06 05:47:03 bnelson
Fixed gcc compiler warnings.
Revision 1.12 2008/03/06 04:39:55 ehan
Removed the include file <VmathArray.hpp>.
Revision 1.11 2008/02/28 09:55:57 sherwin
Added Array version of math routines
Revision 1.10 2008/01/27 09:13:04 sherwin
Added Svtvp routine
Revision 1.9 2007/12/06 22:43:57 pvos
2D Helmholtz solver updates
Revision 1.8 2007/07/26 08:32:57 sherwin
Made second vector argument to Vsub a constant
Revision 1.7 2007/07/20 00:39:37 bnelson
Replaced boost::shared_ptr with Nektar::ptr
Revision 1.6 2007/04/08 03:30:25 jfrazier
Made y in z = x*y a constant in the parameter list.
Revision 1.5 2007/04/03 03:51:44 bnelson
Moved Lapack.hpp, Blas.hpp, Transf77.hpp to LinearAlgebra
Revision 1.4 2007/01/18 20:59:26 sherwin
Before new configuration
Revision 1.3 2006/07/02 17:16:16 sherwin
Modifications to make MultiRegions work for a connected domain in 2D (Tris)
Revision 1.2 2006/06/01 13:44:28 kirby
*** empty log message ***
Revision 1.1 2006/06/01 11:07:52 kirby
*** empty log message ***
Revision 1.1 2006/05/04 18:57:44 kirby
*** empty log message ***
Revision 1.5 2006/03/01 08:25:03 sherwin
First compiling version of StdRegions
Revision 1.4 2006/02/26 21:13:45 bnelson
Fixed a variety of compiler errors caused by updates to the coding standard.
Revision 1.3 2006/02/15 08:07:15 sherwin
Put codes into standard although have not yet been compiled
Revision 1.2 2006/02/12 21:51:42 sherwin
Added licence
Revision 1.1 2006/02/12 15:06:12 sherwin
Changed .h files to .hpp
**/
......@@ -39,9 +39,9 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/Vmath.hpp>
using namespace Nektar;
namespace Vmath
{
using namespace Nektar;
/***************** Math routines ***************/
/// \brief Fill a vector with a constant value
......@@ -459,28 +459,3 @@ using namespace Nektar;
}
#endif //VECTORMATHARRAY_HPP
/***
$Log: VmathArray.hpp,v $
Revision 1.7 2009/03/10 23:44:15 claes
Made y in z = x/y a constant in the parameter list.
Revision 1.6 2008/11/01 22:04:34 bnelson
Removed references to MatrixStoragePolicy<T>
Revision 1.5 2008/11/01 19:10:03 bnelson
Fixed compiler warning
Revision 1.4 2008/09/09 14:00:55 sherwin
Fixed error in Sdiv definition
Revision 1.3 2008/05/10 18:27:32 sherwin
Modifications necessary for QuadExp Unified DG Solver
Revision 1.2 2008/04/06 05:47:20 bnelson
Changed ConstArray to Array<const>
Revision 1.1 2008/02/28 09:55:57 sherwin
Added Array version of math routines
**/
......@@ -63,28 +63,6 @@ namespace Nektar
namespace LibUtilities
{
/** Gcc 4.0.1 on the mac did not compile when isspace was passed as the third