diff --git a/src/core/Makefile.am b/src/core/Makefile.am index be94e9b1ab662705262ca4e63f1a90bb9abecbc9..dd8ddff756b25a0b5fedc9cb7c778df9f067c9ef 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -28,8 +28,8 @@ headers = \ tnlConfigDescriptionParser.ih \ tnlConfigDescriptionScanner.h \ tnlParameterContainer.h \ - mTimerCPU.h \ - mTimerRT.h \ + tnlTimerCPU.h \ + tnlTimerRT.h \ mVector.h \ compress-file.h \ mfilename.h \ @@ -44,8 +44,8 @@ sources = tnlConfigDescription.cpp \ tnlConfigDescriptionScanner.cpp \ tnlConfigDescriptionParser.cpp \ tnlParameterContainer.cpp \ - mTimerCPU.cpp \ - mTimerRT.cpp \ + tnlTimerCPU.cpp \ + tnlTimerRT.cpp \ compress-file.cpp \ mfilename.cpp \ mpi-supp.cpp \ diff --git a/src/core/mTimerCPU.cpp b/src/core/tnlTimerCPU.cpp similarity index 87% rename from src/core/mTimerCPU.cpp rename to src/core/tnlTimerCPU.cpp index 6b5390147aa647fe718b14c36037ca11162541e3..5d24a4510421e3d7698cd17995d66c7e70e904a4 100644 --- a/src/core/mTimerCPU.cpp +++ b/src/core/tnlTimerCPU.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - mTimerCPU.cpp - description + tnlTimerCPU.cpp - description ------------------- begin : 2007/06/23 copyright : (C) 2007 by Tomas Oberhuber @@ -19,16 +19,16 @@ #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif -#include "mTimerCPU.h" +#include "tnlTimerCPU.h" -mTimerCPU default_mcore_cpu_timer; +tnlTimerCPU default_mcore_cpu_timer; -mTimerCPU :: mTimerCPU() +tnlTimerCPU :: tnlTimerCPU() { Reset(); } //-------------------------------------------------------------------------- -void mTimerCPU :: Reset() +void tnlTimerCPU :: Reset() { #ifdef HAVE_SYS_RESOURCE_H rusage init_usage; @@ -39,7 +39,7 @@ void mTimerCPU :: Reset() #endif } //-------------------------------------------------------------------------- -int mTimerCPU :: GetTime( int root, MPI_Comm comm ) const +int tnlTimerCPU :: GetTime( int root, MPI_Comm comm ) const { #ifdef HAVE_SYS_RESOURCE_H rusage cur_usage; diff --git a/src/core/mTimerCPU.h b/src/core/tnlTimerCPU.h similarity index 86% rename from src/core/mTimerCPU.h rename to src/core/tnlTimerCPU.h index 446b8ede3ba1b9d59b0899f21782d44d92ddb727..7ccecc78f2961bd705d87a4bf20ac522998a592f 100644 --- a/src/core/mTimerCPU.h +++ b/src/core/tnlTimerCPU.h @@ -1,5 +1,5 @@ /*************************************************************************** - mTimerCPU.h - description + tnlTimerCPU.h - description ------------------- begin : 2007/06/23 copyright : (C) 2007 by Tomas Oberhuber @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#ifndef mTimerCPUH -#define mTimerCPUH +#ifndef tnlTimerCPUH +#define tnlTimerCPUH #include "mpi-supp.h" -class mTimerCPU +class tnlTimerCPU { public: - mTimerCPU(); + tnlTimerCPU(); void Reset(); @@ -35,6 +35,6 @@ class mTimerCPU int initial_time; }; -extern mTimerCPU default_mcore_cpu_timer; +extern tnlTimerCPU default_mcore_cpu_timer; #endif diff --git a/src/core/mTimerRT.cpp b/src/core/tnlTimerRT.cpp similarity index 89% rename from src/core/mTimerRT.cpp rename to src/core/tnlTimerRT.cpp index be0ca161e18c780be0924cdb15aeafdb14a45014..18e28a44d6e2d7bc00ec93a2745ad86b8ac76fc1 100644 --- a/src/core/mTimerRT.cpp +++ b/src/core/tnlTimerRT.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - mTimerRT.cpp - description + tnlTimerRT.cpp - description ------------------- begin : 2007/06/26 copyright : (C) 2007 by Tomas Oberhuber @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "mTimerRT.h" +#include "tnlTimerRT.h" #include "config.h" #ifdef HAVE_STDDEF_H #ifdef HAVE_SYS_TIME_H @@ -25,14 +25,14 @@ #endif #endif -mTimerRT default_mcore_rt_timer; +tnlTimerRT default_mcore_rt_timer; //-------------------------------------------------------------------------- -mTimerRT :: mTimerRT() +tnlTimerRT :: tnlTimerRT() { Reset(); } //-------------------------------------------------------------------------- -void mTimerRT :: Reset() +void tnlTimerRT :: Reset() { #ifdef HAVE_TIME struct timeval tp; @@ -43,7 +43,7 @@ void mTimerRT :: Reset() initial_time = 0.0; } //-------------------------------------------------------------------------- -double mTimerRT :: GetTime() const +double tnlTimerRT :: GetTime() const { #ifdef HAVE_TIME struct timeval tp; diff --git a/src/core/mTimerRT.h b/src/core/tnlTimerRT.h similarity index 86% rename from src/core/mTimerRT.h rename to src/core/tnlTimerRT.h index de28d2c5bceb504125ee139db6c8890a386192a8..7e317755c293a160ad1287723f2c66f6eb04b3e0 100644 --- a/src/core/mTimerRT.h +++ b/src/core/tnlTimerRT.h @@ -1,5 +1,5 @@ /*************************************************************************** - mTimerRT.h - description + tnlTimerRT.h - description ------------------- begin : 2007/06/26 copyright : (C) 2007 by Tomas Oberhuber @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#ifndef mTimerRTH -#define mTimerRTH +#ifndef tnlTimerRTH +#define tnlTimerRTH #include "mpi-supp.h" -class mTimerRT +class tnlTimerRT { public: - mTimerRT(); + tnlTimerRT(); void Reset(); @@ -35,5 +35,5 @@ class mTimerRT double initial_time; }; -extern mTimerRT default_mcore_rt_timer; +extern tnlTimerRT default_mcore_rt_timer; #endif diff --git a/src/diff/mExplicitSolver.h b/src/diff/mExplicitSolver.h index b1ddc48bda4a080c28faed4f3cd04d265693728e..29d42f303fb14f9b68e7fdedf1b1bd7936e98a7e 100644 --- a/src/diff/mExplicitSolver.h +++ b/src/diff/mExplicitSolver.h @@ -19,8 +19,8 @@ #define mExplicitSolverH #include <iomanip> -#include <core/mTimerCPU.h> -#include <core/mTimerRT.h> +#include <core/tnlTimerCPU.h> +#include <core/tnlTimerRT.h> template< class GRID, class SCHEME, typename T = double > class mExplicitSolver : public tnlObject { @@ -81,12 +81,12 @@ template< class GRID, class SCHEME, typename T = double > class mExplicitSolver verbosity = v; }; - void SetTimerCPU( const mTimerCPU* timer ) + void SetTimerCPU( const tnlTimerCPU* timer ) { cpu_timer = timer; }; - void SetTimerRT( const mTimerRT* timer ) + void SetTimerRT( const tnlTimerRT* timer ) { rt_timer = timer; }; @@ -134,9 +134,9 @@ template< class GRID, class SCHEME, typename T = double > class mExplicitSolver int verbosity; - const mTimerCPU* cpu_timer; + const tnlTimerCPU* cpu_timer; - const mTimerRT* rt_timer; + const tnlTimerRT* rt_timer; }; #endif diff --git a/src/matrix/mMatrixSolver.h b/src/matrix/mMatrixSolver.h index 04aa42caadc4514fe68fdbe73664f15f00fa679b..0a3eb3121d96a95ec368ed5d2a112ee9c535d430 100644 --- a/src/matrix/mMatrixSolver.h +++ b/src/matrix/mMatrixSolver.h @@ -18,8 +18,8 @@ #ifndef mMatrixSolverH #define mMatrixSolverH -#include <core/mTimerCPU.h> -#include <core/mTimerRT.h> +#include <core/tnlTimerCPU.h> +#include <core/tnlTimerRT.h> #include <core/mpi-supp.h> #include <matrix/mBaseMatrix.h> #include <matrix/mPreconditioner.h> @@ -53,12 +53,12 @@ template< typename T > class mMatrixSolver verbosity = verbose; }; - void SetTimerCPU( const mTimerCPU* timer ) + void SetTimerCPU( const tnlTimerCPU* timer ) { cpu_timer = timer; }; - void SetTimerRT( const mTimerRT* timer ) + void SetTimerRT( const tnlTimerRT* timer ) { rt_timer = timer; }; @@ -101,9 +101,9 @@ template< typename T > class mMatrixSolver int verbosity; - const mTimerCPU* cpu_timer; + const tnlTimerCPU* cpu_timer; - const mTimerRT* rt_timer; + const tnlTimerRT* rt_timer; };