Perfectioning few includes in LibUtilitites

library/LibUtilities/BasicUtils/MeshPartition.cpp

@@ -47,14 +47,14 @@
 
 #include <tinyxml/tinyxml.h>
 
-#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 <boost/graph/adjacency_iterator.hpp>
+#include <boost/graph/detail/edge.hpp>
 
 
 namespace Nektar

library/LibUtilities/BasicUtils/ParseUtils.hpp

@@ -37,6 +37,7 @@
 #ifndef NEKTAR_LIBUTILITIES_PARSEUTILS_HPP
 #define NEKTAR_LIBUTILITIES_PARSEUTILS_HPP
 
+#include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
 #include <vector>
 
 #include <boost/version.hpp>

library/LibUtilities/BasicUtils/SessionReader.cpp

@@ -51,6 +51,8 @@ using namespace std;
 #include <LibUtilities/BasicUtils/MeshPartition.h>
 #include <LibUtilities/BasicUtils/ParseUtils.hpp>
 
+#include <boost/program_options.hpp>
+
 namespace po = boost::program_options;
 
 namespace Nektar

library/LibUtilities/BasicUtils/SessionReader.h

@@ -46,7 +46,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/program_options.hpp>
+#include <boost/program_options/variables_map.hpp>
 
 class TiXmlElement;
 class TiXmlDocument;

library/LibUtilities/CMakeLists.txt

@@ -136,7 +136,7 @@ SET(BasicUtilsSources
     ./BasicUtils/Equation.cpp
     ./BasicUtils/MeshPartition.cpp
     ./BasicUtils/SessionReader.cpp
-    ./BasicUtils/VMath.cpp
+    ./BasicUtils/Vmath.cpp
 )
 
 SET(Memory

library/LibUtilities/Interpreter/AnalyticExpressionEvaluator.cpp

@@ -37,6 +37,10 @@
 #include "AnalyticExpressionEvaluator.hpp"
 #include <stdexcept>
 #include <algorithm>
+#include <iostream>
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/random/detail/seed.hpp>
 
 #ifdef _MSC_VER
 #include <boost/preprocessor/cat.hpp>

library/LibUtilities/Interpreter/AnalyticExpressionEvaluator.hpp

@@ -41,10 +41,8 @@
 #include <LibUtilities/BasicUtils/Timer.h>
 
 #include <boost/version.hpp>
-#include <boost/algorithm/string/trim.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include <boost/random.hpp>
+#include <boost/random/mersenne_twister.hpp>  // for mt19937
+#include <boost/random/variate_generator.hpp>  // for variate_generator
 #include <boost/random/normal_distribution.hpp>
 
 
@@ -66,7 +64,6 @@ namespace boost_spirit = boost::spirit::classic;
 namespace boost_spirit = boost::spirit;
 #endif
 
-#include <iostream>
 #include <string>
 #include <vector>
 #include <map>

library/LibUtilities/Memory/NekMemoryManager.hpp

@@ -391,101 +391,3 @@ namespace Nektar
 #endif //NEKTAR_LIB_UTILITIES_NEK_MEMORY_MANAGER_H
 
 
-/**
-    $Log: NekMemoryManager.hpp,v $
-    Revision 1.20  2009/09/24 10:46:45  cbiotto
-    Increasing NEKTAR_MAX_MEMORY_MANAGER_CONSTRUCTOR_ARGS to 11
-
-    Revision 1.19  2008/06/10 06:00:37  bnelson
-    Updated documentation.
-
-    Revision 1.18  2008/05/16 05:43:19  bnelson
-    Updated the memory manager so it is faster choosing the allocator to use, doesn't use the pools for anything larger than 1024 bytes, and doesn't issue a warning for large allocations.
-
-    Revision 1.17  2008/04/06 22:29:13  bnelson
-    Reimplmented shared arrays for speed improvements.
-
-    Revision 1.16  2008/01/02 18:17:22  bnelson
-    Removed commented code.
-
-    Revision 1.15  2007/08/25 04:21:49  bnelson
-    *** empty log message ***
-
-    Revision 1.14  2007/07/27 00:22:37  bnelson
-    Memory manager now accepts non-const parameters to the allocate methods.
-
-    Revision 1.13  2007/07/22 23:03:28  bnelson
-    Backed out Nektar::ptr.
-
-    Revision 1.12  2007/07/20 00:19:42  bnelson
-    Replaced boost::shared_ptr with Nektar::ptr
-
-    Revision 1.11  2007/05/14 23:50:16  bnelson
-    Updated MemoryManager to implement the allocator interface.
-
-    Revision 1.10  2007/04/29 00:30:05  jfrazier
-    Converted tmp space methods to return 1D multi_arrays.
-
-    Revision 1.9  2007/04/06 04:36:21  bnelson
-    Updated for const-correctness.
-
-    Revision 1.8  2007/03/29 18:42:58  bnelson
-    Replaced boost::shared_array with Nektar::SharedArray and fixed several problems where the compile time array size was being used instead of the run time array size.
-
-    Revision 1.7  2007/03/21 16:13:19  sherwin
-    Fixed double to NekDouble casting in Array<OneD, NekDouble>
-
-    Revision 1.6  2007/03/20 16:58:41  sherwin
-    Update to use Array<OneD, NekDouble> storage and NekDouble usage, compiling and executing up to Demos/StdRegions/Project1D
-
-    Revision 1.5  2007/01/29 01:27:49  bnelson
-    Added additional Allocate methods which take more parameters for the constructor.
-
-    Removed the requirement for the user to specify, for each class, whether it can use the memory manager or not.  The memory manager is now a cmake level variable.
-
-    Revision 1.4  2006/10/30 05:09:36  bnelson
-    Fixed an error deleting object in an array that were not being constructed.
-
-    Revision 1.3  2006/08/25 01:30:36  bnelson
-    Added allocation of raw arrays.
-
-    Revision 1.2  2006/06/01 13:44:29  kirby
-    *** empty log message ***
-
-    Revision 1.1  2006/06/01 09:17:24  kirby
-    *** empty log message ***
-
-    Revision 1.6  2006/05/30 14:00:03  sherwin
-    Updates to make MultiRegions and its Demos work
-
-    Revision 1.5  2006/05/18 04:23:57  bnelson
-    Added allocation functions that pass arguments to the constructors of the objects being created.
-
-    Revision 1.4  2006/05/15 04:13:36  bnelson
-    no message
-
-    Revision 1.3  2006/05/14 21:31:49  bnelson
-    Modified the upper bound on static shared array allocation.
-
-    Revision 1.2  2006/05/06 20:36:16  sherwin
-    Modifications to get LocalRegions/Project1D working
-
-    Revision 1.1  2006/05/04 18:57:43  kirby
-    *** empty log message ***
-
-    Revision 1.5  2006/04/25 20:17:39  jfrazier
-    Fixed a .Net issue with the deallocator function passed to shared_array.
-
-    Revision 1.4  2006/04/01 22:00:11  sherwin
-    Changed definition of ASSERT
-
-    Revision 1.3  2006/03/21 09:21:31  sherwin
-    Introduced NekMemoryManager
-
-    Revision 1.2  2006/02/26 21:11:40  bnelson
-    Added a variable sized array allocator.
-
-    Revision 1.1  2006/02/23 07:53:23  bnelson
-    *** empty log message ***
-
-**/

library/LibUtilities/Memory/ThreadSpecificPool.hpp

@@ -180,7 +180,7 @@ namespace Nektar
             /// Important: All memory allocated from this method must be returned to the pool
             /// via the Deallocate method.  Deleting pointers allocated from the memory pool with the 
             /// delete operator will result in undefined behavior.
-            void* Allocate(size_t bytes)
+            void* Allocate(unsigned int bytes)
             {
                 if( bytes <= 4 )
                 {
@@ -204,7 +204,7 @@ namespace Nektar
             ///
             /// \attention It is an error to deallocate memory not allocated
             /// from this pool.  Doing this will result in undefined behavior.
-            void Deallocate(void* p, size_t bytes)
+            void Deallocate(void* p, unsigned int bytes)
             {
                 if( bytes <= 4 )
                 {
@@ -238,37 +238,3 @@ namespace Nektar
 
 #endif //NEKATAR_LIB_UTILITES_THREAD_SPECIFIC_POOL_HPP
 
-/**
-    $Log: ThreadSpecificPool.hpp,v $
-    Revision 1.8  2008/06/27 23:17:43  ehan
-    Included <cstring> in order to compile for GCC 4.3.1.
-
-    Revision 1.7  2008/06/10 06:00:37  bnelson
-    Updated documentation.
-
-    Revision 1.6  2008/05/23 03:39:57  bnelson
-    Fixed the shutdown crash.
-
-    Revision 1.5  2008/05/21 01:38:27  bnelson
-    Added a debug feature to clear memory being allocated.
-
-    Revision 1.4  2008/05/16 05:43:22  bnelson
-    Updated the memory manager so it is faster choosing the allocator to use, doesn't use the pools for anything larger than 1024 bytes, and doesn't issue a warning for large allocations.
-
-    Revision 1.3  2007/05/14 23:49:55  bnelson
-    Updated pool using Singletons to correctly allocate static Arrays.
-
-    Revision 1.2  2007/04/06 04:36:22  bnelson
-    Updated for const-correctness.
-
-    Revision 1.1  2006/06/01 09:17:24  kirby
-    *** empty log message ***
-
-    Revision 1.1  2006/05/04 18:57:44  kirby
-    *** empty log message ***
-
-    Revision 1.1  2006/02/23 07:53:23  bnelson
-    *** empty log message ***
-
-**/
-

library/LibUtilities/Polylib/Polylib.cpp

 
 #include <stdlib.h>
 
-#include <sys/types.h>
-
 #include <stdio.h>
 
 #include <math.h>

library/LibUtilities/TimeIntegration/TimeIntegrationScheme.cpp

@@ -33,6 +33,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
+#include <LibUtilities/BasicUtils/VmathArray.hpp>
+#include <LibUtilities/BasicConst/NektarUnivConsts.hpp>
 #include <iostream>
 #include <math.h>
 

library/LibUtilities/TimeIntegration/TimeIntegrationScheme.h

@@ -39,9 +39,7 @@
 #include <LibUtilities/BasicUtils/ErrorUtil.hpp>
 #include <LibUtilities/BasicUtils/NekManager.hpp>
 #include <LibUtilities/BasicUtils/SharedArray.hpp>
-#include <LibUtilities/BasicUtils/VmathArray.hpp>
 #include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
-#include <LibUtilities/BasicConst/NektarUnivConsts.hpp>
 #include <LibUtilities/LibUtilitiesDeclspec.h>
 
 namespace Nektar
@@ -49,10 +47,8 @@ namespace Nektar
     namespace LibUtilities
     {
         // Forward declaration of all classes in this file
-        class TimeIntegrationSchemeKey;
         class TimeIntegrationScheme;
         class TimeIntegrationSolution;
-        class TimeIntegrationSchemeOperators;
 
         // typedefs
         typedef boost::shared_ptr<TimeIntegrationScheme>                TimeIntegrationSchemeSharedPtr;