Merge branch 'master' of gitlab.psi.ch:OPAL/src

opt-pilot/CMakeLists.txt

@@ -108,10 +108,7 @@ set (OPTP_LIBRARY "optp" CACHE INTERNAL "" FORCE)
 set (OPTP_LIBS
     pthread
     m
-    boost_chrono
-    boost_regex
-    boost_system
-    boost_serialization
+    ${Boost_LIBRARIES}
     wfgHypervolume
     CACHE INTERNAL "" FORCE
 )
@@ -141,4 +138,4 @@ if (DOXYGEN_FOUND)
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generating API documentation with Doxygen" VERBATIM
         )
-endif(DOXYGEN_FOUND)
\ No newline at end of file
+endif(DOXYGEN_FOUND)

opt-pilot/Util/Types.h

@@ -8,9 +8,9 @@
 #include "boost/serialization/vector.hpp"
 #include "boost/tuple/tuple.hpp"
 
-//#include "boost/variant.hpp"
-//#include "boost/fusion/adapted/struct/adapt_struct.hpp"
-//#include "boost/fusion/include/adapt_struct.hpp"
+#include "boost/variant.hpp"
+#include "boost/fusion/adapted/struct/adapt_struct.hpp"
+#include "boost/fusion/include/adapt_struct.hpp"
 
 #include "Expression/Expression.h"
 

src/Amr/AmrYtWriter.cpp

@@ -106,7 +106,7 @@ void AmrYtWriter::writeFields(const amr::AmrFieldContainer_t& rho,
         HeaderFile << std::endl;
         
         // reference ratio
-        for (std::size_t i = 0; i < refRatio.size(); ++i)
+        for (int i = 0; i < refRatio.size(); ++i)
             HeaderFile << refRatio[i] << ' ';
         HeaderFile << std::endl;
         

src/Classic/Algorithms/AmrPartBunch.cpp

@@ -4,9 +4,9 @@
 
 AmrPartBunch::AmrPartBunch(const PartData *ref)
     : PartBunchBase<double, 3>(new AmrPartBunch::pbase_t(new AmrLayout_t()), ref),
-      fieldlayout_m(nullptr),
       amrobj_mp(nullptr),
-      amrpbase_mp(dynamic_cast<AmrPartBunch::pbase_t*>(pbase))
+      amrpbase_mp(dynamic_cast<AmrPartBunch::pbase_t*>(pbase)),
+      fieldlayout_m(nullptr)
 {
     amrpbase_mp->initializeAmr();
 }
@@ -15,9 +15,9 @@ AmrPartBunch::AmrPartBunch(const PartData *ref)
 AmrPartBunch::AmrPartBunch(const std::vector<OpalParticle> &rhs,
                            const PartData *ref)
     : PartBunchBase<double, 3>(new AmrPartBunch::pbase_t(new AmrLayout_t()), rhs, ref),
-      fieldlayout_m(nullptr),
       amrobj_mp(nullptr),
-      amrpbase_mp(dynamic_cast<AmrPartBunch::pbase_t*>(pbase))
+      amrpbase_mp(dynamic_cast<AmrPartBunch::pbase_t*>(pbase)),
+      fieldlayout_m(nullptr)
 {
     amrpbase_mp->initializeAmr();
 }
@@ -25,9 +25,9 @@ AmrPartBunch::AmrPartBunch(const std::vector<OpalParticle> &rhs,
 
 AmrPartBunch::AmrPartBunch(const AmrPartBunch &rhs)
     : PartBunchBase<double, 3>(rhs),
-      fieldlayout_m(nullptr),
       amrobj_mp(nullptr),
-      amrpbase_mp(dynamic_cast<AmrPartBunch::pbase_t*>(pbase))
+      amrpbase_mp(dynamic_cast<AmrPartBunch::pbase_t*>(pbase)),
+      fieldlayout_m(nullptr)
 {
     amrpbase_mp->initializeAmr();
 }