Index: src/unittests/BoxUnitTest.cpp
===================================================================
--- src/unittests/BoxUnitTest.cpp	(revision dd067a91bd5ce81d3092ebda02eb4e1f20978a8f)
+++ src/unittests/BoxUnitTest.cpp	(revision d66cb7b6eecf9fdb226257ff28ed46a6eeec9270)
@@ -896,13 +896,13 @@
   VECTORSET(std::vector) res;
 
-  unitBox->setCondition(0,Box::Bounce);
-  stretchedBox1->setCondition(0,Box::Bounce);
-  stretchedBox2->setCondition(0,Box::Bounce);
-  stretchedBox3->setCondition(0,Box::Bounce);
-  stretchedBox4->setCondition(0,Box::Bounce);
-  tiltedBox1->setCondition(0,Box::Bounce);
-  tiltedBox2->setCondition(0,Box::Bounce);
-  tiltedBox3->setCondition(0,Box::Bounce);
-  tiltedBox4->setCondition(0,Box::Bounce);
+  unitBox->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox1->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox2->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox3->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox4->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox1->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox2->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox3->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox4->setCondition(0,BoundaryConditions::Bounce);
 
   {
@@ -994,13 +994,13 @@
   }
 
-  unitBox->setCondition(1,Box::Bounce);
-  stretchedBox1->setCondition(1,Box::Bounce);
-  stretchedBox2->setCondition(1,Box::Bounce);
-  stretchedBox3->setCondition(1,Box::Bounce);
-  stretchedBox4->setCondition(1,Box::Bounce);
-  tiltedBox1->setCondition(1,Box::Bounce);
-  tiltedBox2->setCondition(1,Box::Bounce);
-  tiltedBox3->setCondition(1,Box::Bounce);
-  tiltedBox4->setCondition(1,Box::Bounce);
+  unitBox->setCondition(1,BoundaryConditions::Bounce);
+  stretchedBox1->setCondition(1,BoundaryConditions::Bounce);
+  stretchedBox2->setCondition(1,BoundaryConditions::Bounce);
+  stretchedBox3->setCondition(1,BoundaryConditions::Bounce);
+  stretchedBox4->setCondition(1,BoundaryConditions::Bounce);
+  tiltedBox1->setCondition(1,BoundaryConditions::Bounce);
+  tiltedBox2->setCondition(1,BoundaryConditions::Bounce);
+  tiltedBox3->setCondition(1,BoundaryConditions::Bounce);
+  tiltedBox4->setCondition(1,BoundaryConditions::Bounce);
 
   {
@@ -1092,13 +1092,13 @@
   }
 
-  unitBox->setCondition(2,Box::Bounce);
-  stretchedBox1->setCondition(2,Box::Bounce);
-  stretchedBox2->setCondition(2,Box::Bounce);
-  stretchedBox3->setCondition(2,Box::Bounce);
-  stretchedBox4->setCondition(2,Box::Bounce);
-  tiltedBox1->setCondition(2,Box::Bounce);
-  tiltedBox2->setCondition(2,Box::Bounce);
-  tiltedBox3->setCondition(2,Box::Bounce);
-  tiltedBox4->setCondition(2,Box::Bounce);
+  unitBox->setCondition(2,BoundaryConditions::Bounce);
+  stretchedBox1->setCondition(2,BoundaryConditions::Bounce);
+  stretchedBox2->setCondition(2,BoundaryConditions::Bounce);
+  stretchedBox3->setCondition(2,BoundaryConditions::Bounce);
+  stretchedBox4->setCondition(2,BoundaryConditions::Bounce);
+  tiltedBox1->setCondition(2,BoundaryConditions::Bounce);
+  tiltedBox2->setCondition(2,BoundaryConditions::Bounce);
+  tiltedBox3->setCondition(2,BoundaryConditions::Bounce);
+  tiltedBox4->setCondition(2,BoundaryConditions::Bounce);
 
   {
@@ -1195,13 +1195,13 @@
   VECTORSET(std::vector) res;
 
-  unitBox->setCondition(0,Box::Ignore);
-  stretchedBox1->setCondition(0,Box::Ignore);
-  stretchedBox2->setCondition(0,Box::Ignore);
-  stretchedBox3->setCondition(0,Box::Ignore);
-  stretchedBox4->setCondition(0,Box::Ignore);
-  tiltedBox1->setCondition(0,Box::Ignore);
-  tiltedBox2->setCondition(0,Box::Ignore);
-  tiltedBox3->setCondition(0,Box::Ignore);
-  tiltedBox4->setCondition(0,Box::Ignore);
+  unitBox->setCondition(0,BoundaryConditions::Ignore);
+  stretchedBox1->setCondition(0,BoundaryConditions::Ignore);
+  stretchedBox2->setCondition(0,BoundaryConditions::Ignore);
+  stretchedBox3->setCondition(0,BoundaryConditions::Ignore);
+  stretchedBox4->setCondition(0,BoundaryConditions::Ignore);
+  tiltedBox1->setCondition(0,BoundaryConditions::Ignore);
+  tiltedBox2->setCondition(0,BoundaryConditions::Ignore);
+  tiltedBox3->setCondition(0,BoundaryConditions::Ignore);
+  tiltedBox4->setCondition(0,BoundaryConditions::Ignore);
 
   {
@@ -1293,13 +1293,13 @@
   }
 
-  unitBox->setCondition(1,Box::Ignore);
-  stretchedBox1->setCondition(1,Box::Ignore);
-  stretchedBox2->setCondition(1,Box::Ignore);
-  stretchedBox3->setCondition(1,Box::Ignore);
-  stretchedBox4->setCondition(1,Box::Ignore);
-  tiltedBox1->setCondition(1,Box::Ignore);
-  tiltedBox2->setCondition(1,Box::Ignore);
-  tiltedBox3->setCondition(1,Box::Ignore);
-  tiltedBox4->setCondition(1,Box::Ignore);
+  unitBox->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox1->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox2->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox3->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox4->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox1->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox2->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox3->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox4->setCondition(1,BoundaryConditions::Ignore);
 
   {
@@ -1391,13 +1391,13 @@
   }
 
-  unitBox->setCondition(2,Box::Ignore);
-  stretchedBox1->setCondition(2,Box::Ignore);
-  stretchedBox2->setCondition(2,Box::Ignore);
-  stretchedBox3->setCondition(2,Box::Ignore);
-  stretchedBox4->setCondition(2,Box::Ignore);
-  tiltedBox1->setCondition(2,Box::Ignore);
-  tiltedBox2->setCondition(2,Box::Ignore);
-  tiltedBox3->setCondition(2,Box::Ignore);
-  tiltedBox4->setCondition(2,Box::Ignore);
+  unitBox->setCondition(2,BoundaryConditions::Ignore);
+  stretchedBox1->setCondition(2,BoundaryConditions::Ignore);
+  stretchedBox2->setCondition(2,BoundaryConditions::Ignore);
+  stretchedBox3->setCondition(2,BoundaryConditions::Ignore);
+  stretchedBox4->setCondition(2,BoundaryConditions::Ignore);
+  tiltedBox1->setCondition(2,BoundaryConditions::Ignore);
+  tiltedBox2->setCondition(2,BoundaryConditions::Ignore);
+  tiltedBox3->setCondition(2,BoundaryConditions::Ignore);
+  tiltedBox4->setCondition(2,BoundaryConditions::Ignore);
 
   {
@@ -1494,39 +1494,39 @@
   VECTORSET(std::vector) res;
 
-  unitBox->setCondition(0,Box::Bounce);
-  unitBox->setCondition(1,Box::Ignore);
-  unitBox->setCondition(2,Box::Wrap);
-
-  stretchedBox1->setCondition(0,Box::Bounce);
-  stretchedBox1->setCondition(1,Box::Ignore);
-  stretchedBox1->setCondition(2,Box::Wrap);
-
-  stretchedBox2->setCondition(0,Box::Bounce);
-  stretchedBox2->setCondition(1,Box::Ignore);
-  stretchedBox2->setCondition(2,Box::Wrap);
-
-  stretchedBox3->setCondition(0,Box::Bounce);
-  stretchedBox3->setCondition(1,Box::Ignore);
-  stretchedBox3->setCondition(2,Box::Wrap);
-
-  stretchedBox4->setCondition(0,Box::Bounce);
-  stretchedBox4->setCondition(1,Box::Ignore);
-  stretchedBox4->setCondition(2,Box::Wrap);
-
-  tiltedBox1->setCondition(0,Box::Bounce);
-  tiltedBox1->setCondition(1,Box::Ignore);
-  tiltedBox1->setCondition(2,Box::Wrap);
-
-  tiltedBox2->setCondition(0,Box::Bounce);
-  tiltedBox2->setCondition(1,Box::Ignore);
-  tiltedBox2->setCondition(2,Box::Wrap);
-
-  tiltedBox3->setCondition(0,Box::Bounce);
-  tiltedBox3->setCondition(1,Box::Ignore);
-  tiltedBox3->setCondition(2,Box::Wrap);
-
-  tiltedBox4->setCondition(0,Box::Bounce);
-  tiltedBox4->setCondition(1,Box::Ignore);
-  tiltedBox4->setCondition(2,Box::Wrap);
+  unitBox->setCondition(0,BoundaryConditions::Bounce);
+  unitBox->setCondition(1,BoundaryConditions::Ignore);
+  unitBox->setCondition(2,BoundaryConditions::Wrap);
+
+  stretchedBox1->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox1->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox1->setCondition(2,BoundaryConditions::Wrap);
+
+  stretchedBox2->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox2->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox2->setCondition(2,BoundaryConditions::Wrap);
+
+  stretchedBox3->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox3->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox3->setCondition(2,BoundaryConditions::Wrap);
+
+  stretchedBox4->setCondition(0,BoundaryConditions::Bounce);
+  stretchedBox4->setCondition(1,BoundaryConditions::Ignore);
+  stretchedBox4->setCondition(2,BoundaryConditions::Wrap);
+
+  tiltedBox1->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox1->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox1->setCondition(2,BoundaryConditions::Wrap);
+
+  tiltedBox2->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox2->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox2->setCondition(2,BoundaryConditions::Wrap);
+
+  tiltedBox3->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox3->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox3->setCondition(2,BoundaryConditions::Wrap);
+
+  tiltedBox4->setCondition(0,BoundaryConditions::Bounce);
+  tiltedBox4->setCondition(1,BoundaryConditions::Ignore);
+  tiltedBox4->setCondition(2,BoundaryConditions::Wrap);
 
   {
@@ -1646,5 +1646,5 @@
 
   // create update BoundaryConditionsChanged
-  unitBox->setCondition(0, Box::Wrap);
+  unitBox->setCondition(0, BoundaryConditions::Wrap);
   CPPUNIT_ASSERT_EQUAL((int)2, observer_general->updates);
   CPPUNIT_ASSERT_EQUAL(false, observer_matrix->wasNotified);
