Put Timer in LibUtilities namespace

library/Collections/CollectionOptimisation.cpp

@@ -347,7 +347,7 @@ OperatorImpMap CollectionOptimisation::SetWithTimings(
     Array<OneD, NekDouble> outarray2(maxsize);
     Array<OneD, NekDouble> outarray3(maxsize);
 
-    Timer t;
+    LibUtilities::Timer t;
 
     if(verbose)
     {

library/FieldUtils/InputModules/InputXml.cpp

@@ -77,7 +77,7 @@ InputXml::~InputXml()
  */
 void InputXml::Process(po::variables_map &vm)
 {
-    Timer timerpart;
+    LibUtilities::Timer timerpart;
     if (m_f->m_verbose)
     {
         if (m_f->m_comm->TreatAsRankZero())

library/FieldUtils/Module.h

@@ -45,7 +45,6 @@
 #include <vector>
 
 #include <LibUtilities/BasicUtils/NekFactory.hpp>
-#include <LibUtilities/BasicUtils/Timer.h>
 #include <LibUtilities/Communication/CommSerial.h>
 #include <StdRegions/StdNodalTriExp.h>
 

library/FieldUtils/ProcessModules/ProcessCreateExp.cpp

@@ -67,7 +67,7 @@ void ProcessCreateExp::Process(po::variables_map &vm)
     if(m_f->m_graph)
     {
         int i, j;
-        Timer timerpart;
+        LibUtilities::Timer timerpart;
         if (m_f->m_verbose)
         {
             if (m_f->m_comm->TreatAsRankZero())

library/FieldUtils/ProcessModules/ProcessIsoContour.cpp

@@ -43,6 +43,7 @@
 #include "ProcessIsoContour.h"
 
 #include <LibUtilities/BasicUtils/SharedArray.hpp>
+#include <LibUtilities/BasicUtils/Timer.h>
 #include <LibUtilities/BasicUtils/ParseUtils.hpp>
 #include <LibUtilities/BasicUtils/Progressbar.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
@@ -217,7 +218,7 @@ void ProcessIsoContour::Process(po::variables_map &vm)
 
     if(smoothing)
     {
-        Timer timersm;
+        LibUtilities::Timer timersm;
 
         if(verbose)
         {

library/LibUtilities/BasicUtils/Timer.cpp

@@ -37,6 +37,8 @@
 
 namespace Nektar
 {
+namespace LibUtilities
+{
 
 Timer::Timer() :
     m_start(),
@@ -69,3 +71,4 @@ NekDouble Timer::TimePerTest(unsigned int n)
 }
 
 }
+}

library/LibUtilities/BasicUtils/Timer.h

@@ -44,6 +44,8 @@
 
 namespace Nektar
 {
+namespace LibUtilities
+{
 
 class Timer
 {
@@ -72,6 +74,7 @@ class Timer
         CounterType m_end;
 };
 
+}
 }
 
 #endif //NEKTAR_LIB_UTILITIES_BASIC_UTILS_TIMER_H

library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp

@@ -35,7 +35,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <MultiRegions/GlobalLinSysIterativeStaticCond.h>
-#include <LibUtilities/BasicUtils/Timer.h>
 #include <LibUtilities/BasicUtils/ErrorUtil.hpp>
 #include <LibUtilities/LinearAlgebra/StorageSmvBsr.hpp>
 #include <LibUtilities/LinearAlgebra/SparseDiagBlkMatrix.hpp>

library/MultiRegions/GlobalLinSysStaticCond.cpp

@@ -35,7 +35,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <MultiRegions/GlobalLinSysStaticCond.h>
-#include <LibUtilities/BasicUtils/Timer.h>
 #include <LibUtilities/BasicUtils/ErrorUtil.hpp>
 #include <LibUtilities/LinearAlgebra/StorageSmvBsr.hpp>
 #include <LibUtilities/LinearAlgebra/SparseDiagBlkMatrix.hpp>

library/MultiRegions/GlobalLinSysXxtStaticCond.cpp

@@ -36,7 +36,6 @@
 #include <LibUtilities/Communication/Xxt.hpp>
 #include <LibUtilities/BasicUtils/VDmathArray.hpp>
 #include <MultiRegions/GlobalLinSysXxtStaticCond.h>
-#include <LibUtilities/BasicUtils/Timer.h>
 
 using namespace std;
 

library/SolverUtils/DriverSteadyState.h

@@ -126,7 +126,7 @@ private:
     int m_checksteps;
     int NumVar_SFD;
 
-    Timer     timer;
+    LibUtilities::Timer     timer;
     NekDouble cpuTime;
     NekDouble totalTime;
     NekDouble elapsed;

library/SolverUtils/UnsteadySystem.cpp

@@ -249,7 +249,7 @@ namespace Nektar
                      "Only one of IO_CheckTime and IO_CheckSteps "
                      "should be set!");
 
-            Timer     timer;
+            LibUtilities::Timer     timer;
             bool      doCheckTime   = false;
             int       step          = m_initialStep;
             NekDouble intTime       = 0.0;

library/Timings/TimingCGHelmSolve2D.cpp

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
     NekDouble  lambda;
     vector<string> vFilenames;
     //defining timing variables
-    Timer timer;
+    LibUtilities::Timer timer;
     NekDouble exeTime, fullTime, ppTime = 0.0;
 
     if(argc < 6)//< allows to parse "verbose" option

library/Timings/TimingCGHelmSolve3D.cpp

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
     NekDouble  lambda;
     vector<string> vFilenames;
     //defining timing variables
-    Timer timer;
+    LibUtilities::Timer timer;
     NekDouble exeTime, fullTime, ppTime = 0.0;
 
     if(argc < 6)//< is added to be able to submit "verbose" option

library/Timings/TimingHDGHelmSolve2D.cpp

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
     NekDouble  lambda;
     vector<string> vFilenames;
     //defining timing variables
-    Timer timer;
+    LibUtilities::Timer timer;
     NekDouble exeTime, fullTime, ppTime;
 
     if(argc < 6)//< allows to parse "verbose" option

library/Timings/TimingHDGHelmSolve3D.cpp

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
     NekDouble  lambda;
     vector<string> vFilenames;
     //defining timing variables
-    Timer timer;
+    LibUtilities::Timer timer;
     NekDouble exeTime, fullTime, ppTime;
 
     if(argc < 6)//< is used to be able to submit "verbose" option

solvers/IncNavierStokesSolver/EquationSystems/CoupledLinearNS.cpp

@@ -455,7 +455,7 @@ namespace Nektar
         ::AllocateSharedPtr(nsize_p_m1,nsize_p_m1,blkmatStorage);
         
         
-        Timer timer;
+        LibUtilities::Timer timer;
         timer.Start();
         for(n = 0; n < nel; ++n)
         {
@@ -1445,7 +1445,7 @@ namespace Nektar
             }
             case eSteadyNavierStokes:
             {	
-                Timer Generaltimer;
+                LibUtilities::Timer Generaltimer;
                 Generaltimer.Start();
                 
                 int Check(0);
@@ -1562,7 +1562,7 @@ namespace Nektar
     
     void CoupledLinearNS::SolveSteadyNavierStokes(void)
     {
-        Timer Newtontimer;
+        LibUtilities::Timer Newtontimer;
         Newtontimer.Start();
         
         Array<OneD, Array<OneD, NekDouble> > RHS_Coeffs(m_velocity.num_elements());

solvers/PulseWaveSolver/EquationSystems/PulseWaveSystem.cpp

@@ -489,7 +489,7 @@ namespace Nektar
         // Time loop
         for(n = 0; n < m_steps; ++n)
         {				
-            Timer timer;
+            LibUtilities::Timer timer;
             timer.Start();
             fields = m_intScheme->TimeIntegrate(n,m_timestep,m_intSoln,m_ode);
             //cout<<"integration: "<<fields[0][fields[0].num_elements()-1]<<endl;                

utilities/FieldConvert/FieldConvert.cpp

@@ -36,6 +36,7 @@
 #include <string>
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
+#include <LibUtilities/BasicUtils/Timer.h>
 #include <FieldUtils/Module.h>
 
 using namespace std;
@@ -50,7 +51,7 @@ void RunModule(ModuleSharedPtr module, po::variables_map &vm, bool verbose);
 
 int main(int argc, char* argv[])
 {
-    Timer     timer;
+    LibUtilities::Timer    timer;
     timer.Start();
 
     po::options_description desc("Available options");
@@ -649,7 +650,7 @@ void PrintExecutionSequence(vector<ModuleSharedPtr> &modules)
 
 void RunModule(ModuleSharedPtr module, po::variables_map &vm, bool verbose)
 {
-    Timer moduleTimer;
+    LibUtilities::Timer moduleTimer;
     if(verbose)
     {
         moduleTimer.Start();

utilities/NekMesh/ProcessModules/ProcessVarOpti/ProcessVarOpti.cpp

@@ -299,7 +299,7 @@ void ProcessVarOpti::Process()
     Thread::ThreadManagerSharedPtr tm =
         tms.CreateInstance(Thread::ThreadMaster::SessionJob, nThreads);
 
-    Timer t;
+    LibUtilities::Timer t;
     t.Start();
 
     ofstream resFile;