From 60ff735516375c748128456e6f5193f6d2865b45 Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Tue, 17 Jul 2018 14:37:27 +0200
Subject: [PATCH] move tests and tutorials into walberla namespace to avoid
conflicts
---
.../PeriodicGranularGas.cpp | 8 ++++-
apps/tutorials/basics/01_BlocksAndFields.cpp | 8 ++++-
apps/tutorials/basics/02_Sweeps.cpp | 8 ++++-
apps/tutorials/basics/03_GameOfLife.cpp | 8 ++++-
apps/tutorials/lbm/01_BasicLBM.cpp | 8 ++++-
.../lbm/02_BasicLBM_ExemplaryExtensions.cpp | 8 ++++-
apps/tutorials/lbm/03_LBLidDrivenCavity.cpp | 9 ++++--
apps/tutorials/pde/01_SolvingPDE.cpp | 8 ++++-
apps/tutorials/pde/02_HeatEquation.cpp | 8 ++++-
.../pde/03_HeatEquation_Extensions.cpp | 8 ++++-
apps/tutorials/pe/01_ConfinedGas.cpp | 8 ++++-
apps/tutorials/pe/02_ConfinedGasExtended.cpp | 8 ++++-
tests/blockforest/DeterministicCreation.cpp | 8 ++++-
tests/blockforest/SaveLoadTest.cpp | 9 +++++-
.../communication/GhostLayerCommTest.cpp | 8 ++++-
tests/core/mpi/ProbeVsExtraMessage.cpp | 8 ++++-
.../timing/SweepTimeloopTimerReduction.cpp | 27 ++++++++---------
tests/core/timing/TimingPoolTest.cpp | 15 +++++-----
tests/core/timing/TimingTreeTest.cpp | 30 +++++++++----------
.../PeriodicIntersect.cpp | 8 ++++-
tests/field/FieldGatherTest.cpp | 8 ++++-
tests/field/FieldMPIDatatypesTest.cpp | 15 ++--------
tests/field/FieldTiming.cpp | 10 ++++++-
tests/field/adaptors/AdaptorTest.cpp | 7 ++++-
.../field/communication/FieldPackInfoTest.cpp | 8 ++++-
tests/field/distributors/DistributionTest.cpp | 4 +--
.../interpolators/FieldInterpolationTest.cpp | 5 ++--
tests/gather/CurveGatherTest.cpp | 8 ++++-
tests/gather/GatherSchemeTest.cpp | 8 ++++-
tests/gather/MPIGatherSchemeTest.cpp | 15 +++++-----
tests/geometry/ScalarFieldFromBodyTest.cpp | 10 +++++--
.../ScalarFieldFromGrayScaleImageTest.cpp | 9 ++++--
tests/gui/GuiPdfView.cpp | 24 +++++++--------
tests/gui/SimpleGuiRun.cpp | 11 ++++---
tests/lbm/BoundaryHandlingCommunication.cpp | 9 ++++--
tests/lbm/Poiseuille.cpp | 11 +++----
tests/lbm/SweepEquivalenceTest.cpp | 9 ++++--
tests/lbm/evaluations/PermeabilityTest.cpp | 8 ++++-
.../initializer/PdfFieldInitializerTest.cpp | 8 ++++-
.../refinement/CommunicationEquivalence.cpp | 15 +++++-----
tests/pde/CGTest.cpp | 8 ++++-
tests/pde/JacobiTest.cpp | 8 ++++-
tests/pde/MGConvergenceTest.cpp | 8 ++++-
tests/pde/MGTest.cpp | 7 ++++-
tests/pde/RBGSTest.cpp | 8 ++++-
tests/pde/SORTest.cpp | 8 ++++-
tests/pe/BodyFlags.cpp | 9 ++++--
tests/pe/BodyIterators.cpp | 8 ++++-
tests/pe/Collision.cpp | 8 ++++-
tests/pe/CollisionTobiasGJK.cpp | 8 ++++-
tests/pe/CreateWorld.cpp | 8 ++++-
tests/pe/DeleteBody.cpp | 8 ++++-
tests/pe/DestroyBody.cpp | 8 ++++-
tests/pe/DynamicRefinement.cpp | 8 ++++-
tests/pe/ForceSync.cpp | 9 ++++--
tests/pe/HCSITS.cpp | 8 ++++-
tests/pe/HashGrids.cpp | 8 ++++-
tests/pe/LoadFromConfig.cpp | 8 ++++-
tests/pe/Marshalling.cpp | 8 ++++-
tests/pe/MinMaxRefinement.cpp | 8 ++++-
tests/pe/ParallelEquivalence.cpp | 9 ++++--
tests/pe/PeDocumentationSnippets.cpp | 8 ++++-
tests/pe/Raytracing.cpp | 7 ++++-
tests/pe/Refinement.cpp | 8 ++++-
tests/pe/RigidBody.cpp | 10 ++++++-
tests/pe/SerializeDeserialize.cpp | 8 ++++-
tests/pe/ShadowCopy.cpp | 8 ++++-
tests/pe/SimpleCCD.cpp | 10 ++++++-
tests/pe/SyncEquivalence.cpp | 8 ++++-
tests/pe/Synchronization.cpp | 9 ++++--
tests/pe/SynchronizationDelete.cpp | 9 ++++--
tests/pe/SynchronizationLargeBody.cpp | 9 ++++--
tests/pe/Union.cpp | 9 ++++--
tests/postprocessing/SQLiteTest.cpp | 10 +++----
74 files changed, 524 insertions(+), 171 deletions(-)
diff --git a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
index ea83552cb..c25adf479 100644
--- a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
+++ b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
@@ -31,7 +31,7 @@
#include <functional>
#include <memory>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
@@ -248,3 +248,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/01_BlocksAndFields.cpp b/apps/tutorials/basics/01_BlocksAndFields.cpp
index 8b54bf737..670d557d6 100644
--- a/apps/tutorials/basics/01_BlocksAndFields.cpp
+++ b/apps/tutorials/basics/01_BlocksAndFields.cpp
@@ -24,7 +24,7 @@
#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
+namespace walberla {
Field<real_t, 1>* createFields(IBlock* const block, StructuredBlockStorage * const storage) {
return new Field<real_t,1>(storage->getNumberOfXCells(*block),
@@ -53,3 +53,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/02_Sweeps.cpp b/apps/tutorials/basics/02_Sweeps.cpp
index 95c0cf1ab..24bdffce6 100644
--- a/apps/tutorials/basics/02_Sweeps.cpp
+++ b/apps/tutorials/basics/02_Sweeps.cpp
@@ -27,7 +27,7 @@
#include <functional>
-using namespace walberla;
+namespace walberla {
// some arbitrary value for our bogus algorithm
const int ARBITRARY_VALUE = 424242;
@@ -138,3 +138,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/03_GameOfLife.cpp b/apps/tutorials/basics/03_GameOfLife.cpp
index b2ad74da0..92cc1146b 100644
--- a/apps/tutorials/basics/03_GameOfLife.cpp
+++ b/apps/tutorials/basics/03_GameOfLife.cpp
@@ -37,7 +37,7 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
+namespace walberla {
class GameOfLifeSweep
@@ -217,3 +217,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/01_BasicLBM.cpp b/apps/tutorials/lbm/01_BasicLBM.cpp
index 0b5b4cb3b..0633ec001 100644
--- a/apps/tutorials/lbm/01_BasicLBM.cpp
+++ b/apps/tutorials/lbm/01_BasicLBM.cpp
@@ -31,7 +31,7 @@
-using namespace walberla;
+namespace walberla {
typedef lbm::D2Q9< lbm::collision_model::SRT > LatticeModel_T;
typedef LatticeModel_T::Stencil Stencil_T;
@@ -120,3 +120,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
index 29cc925d1..8478a086a 100644
--- a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
+++ b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
@@ -30,7 +30,7 @@
-using namespace walberla;
+namespace walberla {
typedef lbm::D2Q9< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant > LatticeModel_T;
@@ -641,3 +641,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp b/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
index bf86b7438..6327603fb 100644
--- a/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
+++ b/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
@@ -57,8 +57,7 @@
// USING //
///////////
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla {
//////////////
// TYPEDEFS //
@@ -416,3 +415,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/pde/01_SolvingPDE.cpp b/apps/tutorials/pde/01_SolvingPDE.cpp
index 9b059484d..261a44b4d 100644
--- a/apps/tutorials/pde/01_SolvingPDE.cpp
+++ b/apps/tutorials/pde/01_SolvingPDE.cpp
@@ -36,7 +36,7 @@
#include <vector>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> ScalarField;
typedef stencil::D2Q5 Stencil_T;
@@ -296,3 +296,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+
+int main( int argc, char ** argv )
+{
+ walberla::main(argc, argv);
+}
diff --git a/apps/tutorials/pde/02_HeatEquation.cpp b/apps/tutorials/pde/02_HeatEquation.cpp
index f4f42560b..0f4e00285 100644
--- a/apps/tutorials/pde/02_HeatEquation.cpp
+++ b/apps/tutorials/pde/02_HeatEquation.cpp
@@ -39,7 +39,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> ScalarField;
@@ -250,3 +250,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+
+int main( int argc, char ** argv )
+{
+ walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
index b34e3bbd3..40e60a051 100644
--- a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
+++ b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
@@ -40,7 +40,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> ScalarField;
@@ -347,3 +347,9 @@ int main( int argc, char ** argv )
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/pe/01_ConfinedGas.cpp b/apps/tutorials/pe/01_ConfinedGas.cpp
index c33b26d4b..27507f9ed 100644
--- a/apps/tutorials/pe/01_ConfinedGas.cpp
+++ b/apps/tutorials/pe/01_ConfinedGas.cpp
@@ -27,7 +27,7 @@
#include <core/logging/Logging.h>
//! [Includes]
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
//! [BodyTypeTuple]
@@ -161,3 +161,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/pe/02_ConfinedGasExtended.cpp b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
index f0e4edc20..2e0ed571f 100644
--- a/apps/tutorials/pe/02_ConfinedGasExtended.cpp
+++ b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
@@ -35,7 +35,7 @@
#include <functional>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
using namespace walberla::pe::raytracing;
@@ -294,3 +294,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/blockforest/DeterministicCreation.cpp b/tests/blockforest/DeterministicCreation.cpp
index b50dc5344..d43582255 100644
--- a/tests/blockforest/DeterministicCreation.cpp
+++ b/tests/blockforest/DeterministicCreation.cpp
@@ -24,7 +24,7 @@
#include "core/logging/Logging.h"
#include "core/mpi/Environment.h"
-using namespace walberla;
+namespace walberla{
void TwoBlockForestsTest()
{
@@ -75,3 +75,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char** argv )
+{
+ return walberla::main(argc,argv);
+}
\ No newline at end of file
diff --git a/tests/blockforest/SaveLoadTest.cpp b/tests/blockforest/SaveLoadTest.cpp
index 11ab5d06b..677d7531c 100644
--- a/tests/blockforest/SaveLoadTest.cpp
+++ b/tests/blockforest/SaveLoadTest.cpp
@@ -26,7 +26,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::blockforest;
void blockForestSaveLoadTest(const BlockForest::FileIOMode ioMode, const bool broadcast)
@@ -120,3 +120,10 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc,argv);
+}
diff --git a/tests/blockforest/communication/GhostLayerCommTest.cpp b/tests/blockforest/communication/GhostLayerCommTest.cpp
index 72e307c72..df97936c4 100644
--- a/tests/blockforest/communication/GhostLayerCommTest.cpp
+++ b/tests/blockforest/communication/GhostLayerCommTest.cpp
@@ -40,7 +40,7 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
namespace wlb = walberla;
typedef GhostLayerField<real_t,19> PdfField;
@@ -269,8 +269,14 @@ int main(int argc, char **argv)
timeLoop.run();
+
+ return EXIT_SUCCESS;
+}
}
+int main(int argc, char **argv) {
+ return walberla::main(argc, argv);
+}
diff --git a/tests/core/mpi/ProbeVsExtraMessage.cpp b/tests/core/mpi/ProbeVsExtraMessage.cpp
index d05f2c875..a6d337743 100644
--- a/tests/core/mpi/ProbeVsExtraMessage.cpp
+++ b/tests/core/mpi/ProbeVsExtraMessage.cpp
@@ -30,7 +30,7 @@
#include <iostream>
#include <sstream>
-using namespace walberla;
+namespace walberla {
int getProcToReceiveFrom()
{
@@ -208,3 +208,9 @@ int main( int argc, char ** argv )
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/core/timing/SweepTimeloopTimerReduction.cpp b/tests/core/timing/SweepTimeloopTimerReduction.cpp
index f05b224e1..7fcc4f17f 100644
--- a/tests/core/timing/SweepTimeloopTimerReduction.cpp
+++ b/tests/core/timing/SweepTimeloopTimerReduction.cpp
@@ -36,45 +36,42 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
-
-
-void dummySweep ( IBlock * block )
+void dummySweep ( walberla::IBlock * block )
{
WALBERLA_LOG_DEVEL("DummySweep on block " << block );
}
int main( int argc, char ** argv )
{
- debug::enterTestMode();
+ walberla::debug::enterTestMode();
walberla::Environment walberlaEnv( argc, argv );
// 9 processes and 8 blocks: one process does not have a block
- WALBERLA_CHECK_EQUAL( MPIManager::instance()->numProcesses(), 9 );
+ WALBERLA_CHECK_EQUAL( walberla::MPIManager::instance()->numProcesses(), 9 );
- using namespace blockforest;
+ using namespace walberla::blockforest;
SetupBlockForest sforest;
sforest.addWorkloadMemorySUIDAssignmentFunction( uniformWorkloadAndMemoryAssignment );
- sforest.init( AABB(0,0,0, 2,2,2), 2, 2, 2, false, false, false );
+ sforest.init( walberla::AABB(0,0,0, 2,2,2), 2, 2, 2, false, false, false );
// calculate process distribution
const memory_t memoryLimit = 1;
GlobalLoadBalancing::MetisConfiguration< SetupBlock > metisConfig( false, false, uniformFacesDominantCommunication );
- sforest.calculateProcessDistribution_Default( uint_c( MPIManager::instance()->numProcesses() ), memoryLimit, "hilbert", 10, false, metisConfig );
- MPIManager::instance()->useWorldComm();
+ sforest.calculateProcessDistribution_Default( walberla::uint_c( walberla::MPIManager::instance()->numProcesses() ), memoryLimit, "hilbert", 10, false, metisConfig );
+ walberla::MPIManager::instance()->useWorldComm();
// create StructuredBlockForest (encapsulates a newly created BlockForest)
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sforest, true ) );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, 10, 10, 10 ) );
+ auto bf = walberla::shared_ptr< BlockForest >( new BlockForest( walberla::uint_c( walberla::MPIManager::instance()->rank() ), sforest, true ) );
+ auto sbf = walberla::shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, 10, 10, 10 ) );
sbf->createCellBoundingBoxes();
- SweepTimeloop tl( sbf, 1 );
- tl.add() << Sweep( dummySweep, "DummySweep" );
+ walberla::SweepTimeloop tl( sbf, 1 );
+ tl.add() << walberla::Sweep( dummySweep, "DummySweep" );
- WcTimingPool timingPool;
+ walberla::WcTimingPool timingPool;
tl.run( timingPool );
timingPool.logResultOnRoot();
diff --git a/tests/core/timing/TimingPoolTest.cpp b/tests/core/timing/TimingPoolTest.cpp
index ca30ca013..11f5f5b88 100644
--- a/tests/core/timing/TimingPoolTest.cpp
+++ b/tests/core/timing/TimingPoolTest.cpp
@@ -28,7 +28,7 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
using std::cout;
using std::endl;
@@ -178,17 +178,18 @@ void merging()
pool1.merge( pool2, true );
WALBERLA_CHECK_EQUAL ( pool1["test"].getCounter(), 6 );
}
+}// namespace walberla
int main( int argc, char ** argv )
{
- debug::enterTestMode();
- MPIManager::instance()->initializeMPI( &argc, &argv );
+ walberla::debug::enterTestMode();
+ walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
- simpleTiming();
- scopedTimer();
- reduction();
- merging();
+ walberla::simpleTiming();
+ walberla::scopedTimer();
+ walberla::reduction();
+ walberla::merging();
return 0;
}
diff --git a/tests/core/timing/TimingTreeTest.cpp b/tests/core/timing/TimingTreeTest.cpp
index 74fa27e04..f0f1dc207 100644
--- a/tests/core/timing/TimingTreeTest.cpp
+++ b/tests/core/timing/TimingTreeTest.cpp
@@ -27,24 +27,22 @@
#include <iostream>
-using namespace walberla;
-
void mssleep(unsigned int ms)
{
- timing::StaticPolicy::addTime( ms * 1e-3);
+ walberla::timing::StaticPolicy::addTime( ms * 1e-3);
}
int main( int argc, char ** argv )
{
- debug::enterTestMode();
+ walberla::debug::enterTestMode();
- mpi::Environment mpiEnv(argc, argv);
+ walberla::mpi::Environment mpiEnv(argc, argv);
WALBERLA_UNUSED( mpiEnv );
- const unsigned int rank = static_cast<unsigned int> ( MPIManager::instance()->worldRank() );
+ const unsigned int rank = static_cast<unsigned int> ( walberla::MPIManager::instance()->worldRank() );
- timing::TimingTree<timing::StaticPolicy> tt;
- timing::StaticPolicy::setTime(0);
+ walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt;
+ walberla::timing::StaticPolicy::setTime(0);
tt.start("A");
mssleep(100 * rank);
@@ -76,9 +74,9 @@ int main( int argc, char ** argv )
WALBERLA_ASSERT(!tt.timerExists("A.AA.C"));
// check copy constructor
- timing::TimingTree<timing::StaticPolicy> tt2(tt);
+ walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt2(tt);
// check assignment operator
- timing::TimingTree<timing::StaticPolicy> tt3;
+ walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt3;
tt3 = tt;
WALBERLA_ASSERT(tt2.timerExists("A"));
@@ -97,10 +95,10 @@ int main( int argc, char ** argv )
WALBERLA_ASSERT(!tt3.timerExists("AAC"));
WALBERLA_ASSERT(!tt3.timerExists("A.AA.C"));
- tt2 = tt.getReduced( timing::REDUCE_TOTAL, 0 );
- tt2 = tt.getReduced( timing::REDUCE_TOTAL, 1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, 0 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, 1 );
- tt2 = tt.getReduced( timing::REDUCE_MIN, -1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_MIN, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -109,7 +107,7 @@ int main( int argc, char ** argv )
WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
}
- tt2 = tt.getReduced( timing::REDUCE_MAX, -1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_MAX, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -118,7 +116,7 @@ int main( int argc, char ** argv )
WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
}
- tt2 = tt.getReduced( timing::REDUCE_AVG, -1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_AVG, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -127,7 +125,7 @@ int main( int argc, char ** argv )
WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
}
- tt2 = tt.getReduced( timing::REDUCE_TOTAL, -1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
diff --git a/tests/domain_decomposition/PeriodicIntersect.cpp b/tests/domain_decomposition/PeriodicIntersect.cpp
index be1bd3f53..6753c472e 100644
--- a/tests/domain_decomposition/PeriodicIntersect.cpp
+++ b/tests/domain_decomposition/PeriodicIntersect.cpp
@@ -31,7 +31,7 @@
#include "stencil/D3Q27.h"
-using namespace walberla;
+namespace walberla {
bool periodicCheck( StructuredBlockForest& forest, const math::AABB& box1, const math::AABB& box2)
{
@@ -194,3 +194,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/field/FieldGatherTest.cpp b/tests/field/FieldGatherTest.cpp
index 8f6645b03..5e0aacc57 100644
--- a/tests/field/FieldGatherTest.cpp
+++ b/tests/field/FieldGatherTest.cpp
@@ -28,7 +28,7 @@
#include "field/AddToStorage.h"
-using namespace walberla;
+namespace walberla {
int main( int argc, char ** argv )
@@ -82,3 +82,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc,argv);
+}
diff --git a/tests/field/FieldMPIDatatypesTest.cpp b/tests/field/FieldMPIDatatypesTest.cpp
index 3328c1bd7..0eba71556 100644
--- a/tests/field/FieldMPIDatatypesTest.cpp
+++ b/tests/field/FieldMPIDatatypesTest.cpp
@@ -35,12 +35,9 @@
#include <random>
-namespace mpi_datatypes_test {
+namespace walberla {
-using namespace walberla;
using namespace field::communication;
-using walberla::real_t;
-using walberla::uint_t;
class FieldRandomizer
{
@@ -549,16 +546,10 @@ int main( int argc, char* argv[] )
return EXIT_SUCCESS;
}
-
-
-
-
-
-} // namespace mpi_datatypes_test
-
+} // namespace walberla
int main( int argc, char* argv[] )
{
- return mpi_datatypes_test::main( argc, argv );
+ return walberla::main( argc, argv );
}
diff --git a/tests/field/FieldTiming.cpp b/tests/field/FieldTiming.cpp
index 5e8fd3407..98271eec2 100644
--- a/tests/field/FieldTiming.cpp
+++ b/tests/field/FieldTiming.cpp
@@ -30,7 +30,8 @@
#include <sstream>
-using namespace walberla;
+namespace walberla {
+
using namespace field;
using std::cout;
@@ -263,4 +264,11 @@ int main(int argc, char ** argv)
ofstream of ( fileName.str().c_str() );
of << "size = [ " << xs << "," << ys << "," << zs <<"];" << endl;
tp.printMatlab( of );
+
+ return EXIT_SUCCESS;
+}
+}
+
+int main(int argc, char** argv){
+ return walberla::main(argc, argv);
}
diff --git a/tests/field/adaptors/AdaptorTest.cpp b/tests/field/adaptors/AdaptorTest.cpp
index 028b8db3f..bcfc43efd 100644
--- a/tests/field/adaptors/AdaptorTest.cpp
+++ b/tests/field/adaptors/AdaptorTest.cpp
@@ -41,7 +41,7 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
+namespace walberla {
typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T;
@@ -167,4 +167,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
diff --git a/tests/field/communication/FieldPackInfoTest.cpp b/tests/field/communication/FieldPackInfoTest.cpp
index d7b94789b..4b48e8f47 100644
--- a/tests/field/communication/FieldPackInfoTest.cpp
+++ b/tests/field/communication/FieldPackInfoTest.cpp
@@ -34,7 +34,7 @@
#include <cstring>
-using namespace walberla;
+namespace walberla {
void testScalarField( IBlock * block, BlockDataID fieldId )
@@ -185,3 +185,9 @@ int main(int argc, char **argv)
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/field/distributors/DistributionTest.cpp b/tests/field/distributors/DistributionTest.cpp
index 4d0e4f644..3b9a69398 100644
--- a/tests/field/distributors/DistributionTest.cpp
+++ b/tests/field/distributors/DistributionTest.cpp
@@ -32,10 +32,10 @@
#include <vector>
-using namespace walberla;
-
namespace distribution_tests {
+using namespace walberla;
+
const uint_t FieldGhostLayers( 1 );
typedef walberla::uint8_t flag_t;
diff --git a/tests/field/interpolators/FieldInterpolationTest.cpp b/tests/field/interpolators/FieldInterpolationTest.cpp
index 32adf2898..a98842aec 100644
--- a/tests/field/interpolators/FieldInterpolationTest.cpp
+++ b/tests/field/interpolators/FieldInterpolationTest.cpp
@@ -32,7 +32,7 @@
#include <vector>
-using namespace walberla;
+namespace walberla {
namespace field_interpolation_tests {
@@ -424,7 +424,8 @@ int main(int argc, char **argv) {
}
} // namespace field_interpolation_tests
+}
int main( int argc, char **argv ){
- field_interpolation_tests::main(argc, argv);
+ walberla::field_interpolation_tests::main(argc, argv);
}
\ No newline at end of file
diff --git a/tests/gather/CurveGatherTest.cpp b/tests/gather/CurveGatherTest.cpp
index 1697fd447..362ea0fba 100644
--- a/tests/gather/CurveGatherTest.cpp
+++ b/tests/gather/CurveGatherTest.cpp
@@ -37,7 +37,7 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> GlField;
@@ -103,3 +103,9 @@ int main( int argc, char ** argv )
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gather/GatherSchemeTest.cpp b/tests/gather/GatherSchemeTest.cpp
index d1904ed01..3c1b63868 100644
--- a/tests/gather/GatherSchemeTest.cpp
+++ b/tests/gather/GatherSchemeTest.cpp
@@ -36,7 +36,7 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<cell_idx_t, 1> ScalarField;
@@ -190,3 +190,9 @@ int main(int argc, char ** argv )
}
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gather/MPIGatherSchemeTest.cpp b/tests/gather/MPIGatherSchemeTest.cpp
index 2d9189b40..1bc3f7de0 100644
--- a/tests/gather/MPIGatherSchemeTest.cpp
+++ b/tests/gather/MPIGatherSchemeTest.cpp
@@ -34,8 +34,7 @@
#include "core/mpi/MPIManager.h"
-using namespace walberla;
-
+namespace walberla {
class TestGatherPackInfo : public gather::GatherPackInfo
{
@@ -87,7 +86,7 @@ public:
private:
std::set<int> receivedRanks_;
};
-
+}// namespace walberla
@@ -95,12 +94,12 @@ int main( int argc, char ** argv )
{
walberla::Environment env( argc, argv );
- debug::enterTestMode();
+ walberla::debug::enterTestMode();
- uint_t numProcesses = uint_c( MPIManager::instance()->numProcesses() );
+ walberla::uint_t numProcesses = walberla::uint_c( walberla::MPIManager::instance()->numProcesses() );
WALBERLA_CHECK( numProcesses >= 2 );
- using blockforest::createUniformBlockGrid;
+ using walberla::blockforest::createUniformBlockGrid;
auto blocks = createUniformBlockGrid( numProcesses, 1, 1,
1, 1, 1,
1,
@@ -108,8 +107,8 @@ int main( int argc, char ** argv )
false, false, false, // periodicity
false ); // do NOT keep global information
- gather::MPIGatherScheme gatherScheme( blocks->getBlockStorage(), 0 );
- gatherScheme.addPackInfo( make_shared<TestGatherPackInfo>() );
+ walberla::gather::MPIGatherScheme gatherScheme( blocks->getBlockStorage(), 0 );
+ gatherScheme.addPackInfo( walberla::make_shared<walberla::TestGatherPackInfo>() );
for(int i=0; i<3; ++i )
gatherScheme();
diff --git a/tests/geometry/ScalarFieldFromBodyTest.cpp b/tests/geometry/ScalarFieldFromBodyTest.cpp
index 2e9beccc9..095f411e3 100644
--- a/tests/geometry/ScalarFieldFromBodyTest.cpp
+++ b/tests/geometry/ScalarFieldFromBodyTest.cpp
@@ -40,9 +40,8 @@
#include <fstream>
-using namespace walberla;
+namespace walberla {
using namespace geometry;
-using walberla::uint8_t;
const uint_t confBlockCount [] = { 1, 1, 1 };
const uint_t confCells [] = { 30, 30, 30 };
@@ -287,4 +286,11 @@ int main( int argc, char ** argv )
gui.run();
}
+ return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
index cbdb1bf65..ec63490c6 100644
--- a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
+++ b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
@@ -37,9 +37,8 @@
#include <fstream>
-using namespace walberla;
+namespace walberla {
using namespace geometry;
-using walberla::uint8_t;
const uint_t confBlockCount [] = { 1, 1, 1 };
const uint_t confCells [] = { 30, 30, 30 };
@@ -97,4 +96,10 @@ int main( int argc, char ** argv )
gui.run();
}
+ return EXIT_SUCCESS;
+}
+}
+
+int main( int argc, char ** argv ){
+ return walberla::main(argc, argv);
}
diff --git a/tests/gui/GuiPdfView.cpp b/tests/gui/GuiPdfView.cpp
index fcabb5a7e..e09f74f8d 100644
--- a/tests/gui/GuiPdfView.cpp
+++ b/tests/gui/GuiPdfView.cpp
@@ -34,8 +34,7 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
-using namespace blockforest;
+namespace walberla {
typedef GhostLayerField<real_t,19> PdfField;
@@ -53,11 +52,11 @@ int main(int argc, char **argv)
const uint_t nrOfTimeSteps = 20;
// Create BlockForest
- auto blocks = createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
- cells[0],cells[1],cells[2], //cells
- 1, //dx
- false, //one block per process
- true,true,true); //periodicity
+ auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
+ cells[0],cells[1],cells[2], //cells
+ 1, //dx
+ false, //one block per process
+ true,true,true); //periodicity
// In addition to the normal GhostLayerField's we allocated additionally a field containing the whole global simulation domain for each block
@@ -83,10 +82,11 @@ int main(int argc, char **argv)
GUI gui (timeloop, blocks, argc, argv);
gui.run();
//timeloop.singleStep();
+ return EXIT_SUCCESS;
}
+} // namespace walberla
-
-
-
-
-
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gui/SimpleGuiRun.cpp b/tests/gui/SimpleGuiRun.cpp
index 54b8a6a8d..c04272d4e 100644
--- a/tests/gui/SimpleGuiRun.cpp
+++ b/tests/gui/SimpleGuiRun.cpp
@@ -41,9 +41,7 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
-using namespace blockforest;
-
+namespace walberla {
typedef GhostLayerField<real_t,19> PdfField;
typedef GhostLayerField<real_t,1> ScalarField;
@@ -62,7 +60,7 @@ int main(int argc, char **argv )
const uint_t nrOfTimeSteps = 20;
// Create BlockForest
- auto blocks = createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
+ auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
cells[0],cells[1],cells[2], //cells
1, //dx
false, //one block per process
@@ -143,9 +141,14 @@ int main(int argc, char **argv )
lbm::connectToGui<LatticeModel>( gui );
gui.run();
//timeloop.singleStep();
+ return EXIT_SUCCESS;
}
+}// namespace walberla
+int main(int argc, char **argv){
+ return walberla::main( argc, argv );
+}
diff --git a/tests/lbm/BoundaryHandlingCommunication.cpp b/tests/lbm/BoundaryHandlingCommunication.cpp
index 975f4bf0b..d8e3a7c82 100644
--- a/tests/lbm/BoundaryHandlingCommunication.cpp
+++ b/tests/lbm/BoundaryHandlingCommunication.cpp
@@ -63,8 +63,7 @@
#endif
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla{
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
@@ -399,3 +398,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/tests/lbm/Poiseuille.cpp b/tests/lbm/Poiseuille.cpp
index 5e56138fe..7f74d5eac 100644
--- a/tests/lbm/Poiseuille.cpp
+++ b/tests/lbm/Poiseuille.cpp
@@ -86,9 +86,7 @@
#include <iostream>
#include <vector>
-
-using namespace walberla;
-
+namespace walberla {
typedef walberla::uint8_t flag_t;
@@ -390,6 +388,9 @@ int main( int argc, char** argv )
*/
return 0;
}
+} // namespace walberla
-
-
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/lbm/SweepEquivalenceTest.cpp b/tests/lbm/SweepEquivalenceTest.cpp
index 52f1f35ee..e29bab05f 100644
--- a/tests/lbm/SweepEquivalenceTest.cpp
+++ b/tests/lbm/SweepEquivalenceTest.cpp
@@ -70,8 +70,7 @@
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla {
typedef walberla::uint64_t flag_t;
typedef FlagField< flag_t > FlagField_T;
@@ -864,3 +863,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/lbm/evaluations/PermeabilityTest.cpp b/tests/lbm/evaluations/PermeabilityTest.cpp
index 998efb953..9188fd04d 100644
--- a/tests/lbm/evaluations/PermeabilityTest.cpp
+++ b/tests/lbm/evaluations/PermeabilityTest.cpp
@@ -28,7 +28,7 @@
#include "timeloop/all.h"
-using namespace walberla;
+namespace walberla {
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
@@ -301,3 +301,9 @@ int main( int argc, char ** argv )
WALBERLA_ABORT( "Unexpected error: " << e.what() << "! Aborting ..." );
}
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/tests/lbm/initializer/PdfFieldInitializerTest.cpp b/tests/lbm/initializer/PdfFieldInitializerTest.cpp
index 2ecdb5e41..282fbd689 100644
--- a/tests/lbm/initializer/PdfFieldInitializerTest.cpp
+++ b/tests/lbm/initializer/PdfFieldInitializerTest.cpp
@@ -30,7 +30,7 @@
#include <sstream>
-using namespace walberla;
+namespace walberla {
typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T;
@@ -249,4 +249,10 @@ int main( int argc, char ** argv )
testDensityAndVelocityInitFromConfig( pdfFieldId, blocks, env.config(), false );
return 0;
+}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
}
\ No newline at end of file
diff --git a/tests/lbm/refinement/CommunicationEquivalence.cpp b/tests/lbm/refinement/CommunicationEquivalence.cpp
index 6cd232235..9b14c1430 100644
--- a/tests/lbm/refinement/CommunicationEquivalence.cpp
+++ b/tests/lbm/refinement/CommunicationEquivalence.cpp
@@ -63,14 +63,7 @@
enum TestMode { ENTIRE_TOP, TOP, MIDDLE, ENTIRE_BOTTOM };
static const TestMode testMode = TOP;
-
-
-///////////
-// USING //
-///////////
-
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla{
//////////////
// TYPEDEFS //
@@ -494,3 +487,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/tests/pde/CGTest.cpp b/tests/pde/CGTest.cpp
index ecc51857d..b3619d157 100644
--- a/tests/pde/CGTest.cpp
+++ b/tests/pde/CGTest.cpp
@@ -43,7 +43,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
@@ -203,3 +203,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/JacobiTest.cpp b/tests/pde/JacobiTest.cpp
index 5d048c363..22376f9b9 100644
--- a/tests/pde/JacobiTest.cpp
+++ b/tests/pde/JacobiTest.cpp
@@ -46,7 +46,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
@@ -210,3 +210,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/MGConvergenceTest.cpp b/tests/pde/MGConvergenceTest.cpp
index 0716c841c..56065b48a 100644
--- a/tests/pde/MGConvergenceTest.cpp
+++ b/tests/pde/MGConvergenceTest.cpp
@@ -44,7 +44,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
@@ -506,3 +506,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
//**********************************************************************************************************************
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/MGTest.cpp b/tests/pde/MGTest.cpp
index fa08a2bf8..648d83b38 100644
--- a/tests/pde/MGTest.cpp
+++ b/tests/pde/MGTest.cpp
@@ -45,7 +45,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
@@ -293,4 +293,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/RBGSTest.cpp b/tests/pde/RBGSTest.cpp
index b65245d47..f289a4ca8 100644
--- a/tests/pde/RBGSTest.cpp
+++ b/tests/pde/RBGSTest.cpp
@@ -46,7 +46,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
@@ -210,3 +210,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/SORTest.cpp b/tests/pde/SORTest.cpp
index cf9f6f024..46f55ea94 100644
--- a/tests/pde/SORTest.cpp
+++ b/tests/pde/SORTest.cpp
@@ -46,7 +46,7 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
@@ -212,3 +212,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/BodyFlags.cpp b/tests/pe/BodyFlags.cpp
index db7e82ce8..0c39b0d43 100644
--- a/tests/pe/BodyFlags.cpp
+++ b/tests/pe/BodyFlags.cpp
@@ -34,9 +34,8 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -127,3 +126,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/BodyIterators.cpp b/tests/pe/BodyIterators.cpp
index 0dbfcc53c..232378417 100644
--- a/tests/pe/BodyIterators.cpp
+++ b/tests/pe/BodyIterators.cpp
@@ -33,7 +33,7 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -150,3 +150,9 @@ int main( int argc, char **argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Collision.cpp b/tests/pe/Collision.cpp
index bd77d39c0..c69ac6b06 100644
--- a/tests/pe/Collision.cpp
+++ b/tests/pe/Collision.cpp
@@ -39,7 +39,7 @@
#include "core/DataTypes.h"
#include "core/math/Vector2.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using walberla::pe::fcd::analytic::collide;
@@ -271,3 +271,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/CollisionTobiasGJK.cpp b/tests/pe/CollisionTobiasGJK.cpp
index 46889c1ea..c6915d86d 100644
--- a/tests/pe/CollisionTobiasGJK.cpp
+++ b/tests/pe/CollisionTobiasGJK.cpp
@@ -46,7 +46,7 @@
#include "pe/collision/EPA.h"
#include "pe/collision/GJK.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Box, Capsule, Plane, Sphere, Union<boost::tuple<Sphere>>, Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>, Ellipsoid> BodyTuple ;
@@ -437,3 +437,9 @@ int main( int argc, char** argv )
UnionTest();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/CreateWorld.cpp b/tests/pe/CreateWorld.cpp
index 6a79b5bfb..a31fb2584 100644
--- a/tests/pe/CreateWorld.cpp
+++ b/tests/pe/CreateWorld.cpp
@@ -28,7 +28,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -56,3 +56,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DeleteBody.cpp b/tests/pe/DeleteBody.cpp
index a37e73bff..bd47954f0 100644
--- a/tests/pe/DeleteBody.cpp
+++ b/tests/pe/DeleteBody.cpp
@@ -33,7 +33,7 @@
#include <functional>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -122,3 +122,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DestroyBody.cpp b/tests/pe/DestroyBody.cpp
index 6233d4a91..ccef444fb 100644
--- a/tests/pe/DestroyBody.cpp
+++ b/tests/pe/DestroyBody.cpp
@@ -31,7 +31,7 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -116,3 +116,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DynamicRefinement.cpp b/tests/pe/DynamicRefinement.cpp
index 0b6e0b469..ef0266270 100644
--- a/tests/pe/DynamicRefinement.cpp
+++ b/tests/pe/DynamicRefinement.cpp
@@ -29,7 +29,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -193,3 +193,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/ForceSync.cpp b/tests/pe/ForceSync.cpp
index b97d40807..44acba816 100644
--- a/tests/pe/ForceSync.cpp
+++ b/tests/pe/ForceSync.cpp
@@ -38,9 +38,8 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -141,3 +140,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/HCSITS.cpp b/tests/pe/HCSITS.cpp
index c5e3a2d74..5b8deb155 100644
--- a/tests/pe/HCSITS.cpp
+++ b/tests/pe/HCSITS.cpp
@@ -27,7 +27,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -183,3 +183,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/HashGrids.cpp b/tests/pe/HashGrids.cpp
index 7b203cbe8..afefe3ce5 100644
--- a/tests/pe/HashGrids.cpp
+++ b/tests/pe/HashGrids.cpp
@@ -31,7 +31,7 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -147,3 +147,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/LoadFromConfig.cpp b/tests/pe/LoadFromConfig.cpp
index 69ccad26c..b1d381b63 100644
--- a/tests/pe/LoadFromConfig.cpp
+++ b/tests/pe/LoadFromConfig.cpp
@@ -30,7 +30,7 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
int main( int argc, char ** argv )
@@ -77,3 +77,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Marshalling.cpp b/tests/pe/Marshalling.cpp
index 985269bd6..a5272bfe3 100644
--- a/tests/pe/Marshalling.cpp
+++ b/tests/pe/Marshalling.cpp
@@ -34,7 +34,7 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::pe::communication;
@@ -224,3 +224,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/MinMaxRefinement.cpp b/tests/pe/MinMaxRefinement.cpp
index 3c13d4cfb..34cde5d21 100644
--- a/tests/pe/MinMaxRefinement.cpp
+++ b/tests/pe/MinMaxRefinement.cpp
@@ -47,7 +47,7 @@
#include <limits>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -201,3 +201,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/ParallelEquivalence.cpp b/tests/pe/ParallelEquivalence.cpp
index 03aac6f6f..5ccc4b961 100644
--- a/tests/pe/ParallelEquivalence.cpp
+++ b/tests/pe/ParallelEquivalence.cpp
@@ -36,9 +36,8 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
int runs = 1000;
@@ -321,3 +320,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/PeDocumentationSnippets.cpp b/tests/pe/PeDocumentationSnippets.cpp
index 4cf46e2f8..5c9b15724 100644
--- a/tests/pe/PeDocumentationSnippets.cpp
+++ b/tests/pe/PeDocumentationSnippets.cpp
@@ -43,7 +43,7 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
//! [Definition of Union Types]
@@ -134,3 +134,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Raytracing.cpp b/tests/pe/Raytracing.cpp
index d214fa9c9..49e4a277e 100644
--- a/tests/pe/Raytracing.cpp
+++ b/tests/pe/Raytracing.cpp
@@ -32,7 +32,7 @@
#include <sstream>
#include <tuple>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::pe::raytracing;
@@ -909,4 +909,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Refinement.cpp b/tests/pe/Refinement.cpp
index cb64385b6..c53907e41 100644
--- a/tests/pe/Refinement.cpp
+++ b/tests/pe/Refinement.cpp
@@ -40,7 +40,7 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -186,3 +186,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/RigidBody.cpp b/tests/pe/RigidBody.cpp
index 1e73e0f8b..f72d9ce0b 100644
--- a/tests/pe/RigidBody.cpp
+++ b/tests/pe/RigidBody.cpp
@@ -28,7 +28,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
void move( BodyStorage& storage, real_t dt )
@@ -170,4 +170,12 @@ int main( int argc, char** argv )
checkRotationFunctions();
checkPointFunctions();
+
+ return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SerializeDeserialize.cpp b/tests/pe/SerializeDeserialize.cpp
index 47e30000a..883a15242 100644
--- a/tests/pe/SerializeDeserialize.cpp
+++ b/tests/pe/SerializeDeserialize.cpp
@@ -34,7 +34,7 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -145,3 +145,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/ShadowCopy.cpp b/tests/pe/ShadowCopy.cpp
index 8c5dba7c4..b04db7c36 100644
--- a/tests/pe/ShadowCopy.cpp
+++ b/tests/pe/ShadowCopy.cpp
@@ -31,7 +31,7 @@
#include <functional>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef Union< boost::tuple<Sphere> > UnionT;
@@ -173,3 +173,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SimpleCCD.cpp b/tests/pe/SimpleCCD.cpp
index 20c147c69..08571dce0 100644
--- a/tests/pe/SimpleCCD.cpp
+++ b/tests/pe/SimpleCCD.cpp
@@ -33,7 +33,7 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -107,4 +107,12 @@ int main( int argc, char** argv )
WALBERLA_LOG_DEVEL_ON_ROOT(bs.size() << "\t" << pool["SCCD"].last() << "\t" << pool["HG"].last() << "\t" << sccd.getPossibleContacts().size() << "\t" << hg.getPossibleContacts().size() << "\t" << hg.active());
//std::cout << pool << std::endl;
}
+
+ return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SyncEquivalence.cpp b/tests/pe/SyncEquivalence.cpp
index 6afd4f867..a4400e0ce 100644
--- a/tests/pe/SyncEquivalence.cpp
+++ b/tests/pe/SyncEquivalence.cpp
@@ -40,7 +40,7 @@
#include "python_coupling/CreateConfig.h"
#include "python_coupling/PythonCallback.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
@@ -235,3 +235,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Synchronization.cpp b/tests/pe/Synchronization.cpp
index 17d33c41b..f718d492f 100644
--- a/tests/pe/Synchronization.cpp
+++ b/tests/pe/Synchronization.cpp
@@ -33,9 +33,8 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -487,3 +486,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SynchronizationDelete.cpp b/tests/pe/SynchronizationDelete.cpp
index fb40078fd..fe9cd228a 100644
--- a/tests/pe/SynchronizationDelete.cpp
+++ b/tests/pe/SynchronizationDelete.cpp
@@ -33,9 +33,8 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -126,3 +125,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SynchronizationLargeBody.cpp b/tests/pe/SynchronizationLargeBody.cpp
index 6bf99cc47..607db910f 100644
--- a/tests/pe/SynchronizationLargeBody.cpp
+++ b/tests/pe/SynchronizationLargeBody.cpp
@@ -32,9 +32,8 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
typedef boost::tuple<Sphere> BodyTuple ;
@@ -253,3 +252,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Union.cpp b/tests/pe/Union.cpp
index 1a814c28a..bd780f28f 100644
--- a/tests/pe/Union.cpp
+++ b/tests/pe/Union.cpp
@@ -41,9 +41,8 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
typedef Union< boost::tuple<Sphere> > UnionType ;
typedef boost::tuple<Sphere, Plane, UnionType> BodyTuple ;
@@ -132,3 +131,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/postprocessing/SQLiteTest.cpp b/tests/postprocessing/SQLiteTest.cpp
index 98d97e1be..547bd12e9 100644
--- a/tests/postprocessing/SQLiteTest.cpp
+++ b/tests/postprocessing/SQLiteTest.cpp
@@ -24,13 +24,11 @@
#include "postprocessing/sqlite/SQLite.h"
-using namespace walberla;
-
int main( int argc, char ** argv )
{
- debug::enterTestMode();
- mpi::Environment walberlaEnv( argc, argv );
+ walberla::debug::enterTestMode();
+ walberla::mpi::Environment walberlaEnv( argc, argv );
std::map<std::string, std::string> strColumns;
std::map<std::string, int> intColumns;
@@ -42,7 +40,7 @@ int main( int argc, char ** argv )
strColumns["property2"] = "value2";
strColumns["property3"] = "value3";
intColumns["i"] = int(i);
- postprocessing::storeRunInSqliteDB( "dbFile.sqlite", intColumns, strColumns );
+ walberla::postprocessing::storeRunInSqliteDB( "dbFile.sqlite", intColumns, strColumns );
}
for( int i=0; i< 100; ++i )
@@ -51,7 +49,7 @@ int main( int argc, char ** argv )
strColumns["property2"] = "value2";
strColumns["property3"] = "value3";
largeColumns["i"] = 4294967297 + i;
- postprocessing::storeRunInSqliteDB( "dbFile.sqlite", largeColumns, strColumns );
+ walberla::postprocessing::storeRunInSqliteDB( "dbFile.sqlite", largeColumns, strColumns );
}
return 0;
--
GitLab