Changeset ac6d04 for test/unit_test/library

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1666 5161e1c8-67bf-11de-9fd5-51895aff932f

Location:

test/unit_test/library

Files:

• dirichlet_cs.cpp (added)
• dirichlet_cs_mpi.cpp (added)
• dirichlet_fas.cpp (added)
• dirichlet_fas_lr.cpp (added)
• dirichlet_fas_lr_mpi.cpp (added)
• dirichlet_fas_mpi.cpp (added)
• periodic_cs.cpp (added)
• periodic_cs_mpi.cpp (added)
• periodic_fas.cpp (added)
• periodic_fas_mpi.cpp (moved) (moved from test/unit_test/periodic_fas_mpi.cpp ) (5 diffs)

test/unit_test/library/periodic_fas_mpi.cpp

@@ -10 +10 @@
 #endif
 
+#include <boost/test/unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
+
 #ifdef HAVE_MPI
 
 #include <mpi.h>
+#ifdef HAVE_MARMOT
+#include <enhancempicalls.h>
+#include <sourceinfompicalls.h>
+#endif
 
 #include "base/factory.hpp"
+#include "base/math.hpp"
 #include "comm/comm_mpi.hpp"
 #include "comm/domain_decomposition_mpi.hpp"
@@ -31 +39 @@
 
 #include "interface_sinus.hpp"
-#include "periodic_fas_mpi.hpp"
 
 using namespace VMG;
-using VMGTests::PeriodicFASMPITestSuite;
 
-CPPUNIT_TEST_SUITE_REGISTRATION(PeriodicFASMPITestSuite);
+const vmg_float sine_factor = static_cast<vmg_float>(2.0 * Math::pi);
 
-void PeriodicFASMPITestSuite::setUp()
+struct LibraryPeriodicFASMPIFixture
 {
+  LibraryPeriodicFASMPIFixture()
+  {
   Factory& factory = MG::GetFactory();
 
@@ -45 +53 @@
   comm->Register("COMM");
 
-  Interface* interface = new VMGInterfaces::InterfaceSinus(comm->BoundaryConditions(), 2, 6, 0.0, 1.0);
+  Interface* interface = new VMGInterfaces::InterfaceSinus(sine_factor, comm->BoundaryConditions(), 2, 6, 0.0, 1.0);
   MG::SetInterface(interface, comm);
 
@@ -69 +77 @@
   factory.RegisterObjectStorage("POSTSMOOTHSTEPS", 3);
   factory.RegisterObjectStorage("PRECISION", 1e-10);
-  factory.RegisterObjectStorage("MAX_ITERATION", 20);
+  factory.RegisterObjectStorage("MAX_ITERATION", 7);
 
   MG::IsInitialized();
-}
 
-void PeriodicFASMPITestSuite::tearDown()
-{
+  MG::PostInit();
+  }
+
+  ~LibraryPeriodicFASMPIFixture()
+  {
   MG::Destroy();
-}
+  }
+};
 
-void PeriodicFASMPITestSuite::PeriodicFASMPITest()
+BOOST_FIXTURE_TEST_CASE(LibraryPeriodicFASMPITest, LibraryPeriodicFASMPIFixture)
 {
   MG::Solve();
@@ -86 +97 @@
   double res = MG::GetComm()->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs());
 
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, fabs(res/res_init), 1e-10);
+  BOOST_CHECK_SMALL(res/res_init, 1e-10);
 }