Merge branch 'feature/explicit_template_instantiation' into 'master'

Instantiate ProblemStat and ProblemInstat for YaspGridBasis explicitly

See merge request amdis/amdis-core!10

src/amdis/CMakeLists.txt

@@ -8,7 +8,7 @@ dune_library_add_sources(amdis SOURCES
     Initfile.cpp
     InitfileParser.cpp
     ProblemInstatBase.cpp
-    # ProblemInstat.cpp
+    ProblemInstat.cpp
     ProblemStat.cpp
     StandardProblemIteration.cpp
 )

src/amdis/ProblemInstat.cpp

-#define AMDIS_NO_EXTERN_PROBLEMINSTAT
+#include "config.h"
 #include "ProblemInstat.hpp"
-#undef AMDIS_NO_EXTERN_PROBLEMINSTAT
-
 
 namespace AMDiS
 {
   // explicit template instatiation
-  // template class ProblemInstat<YaspGridBasis<2,1>>;
+  template class ProblemInstat<YaspGridBasis<2,1>>;
+  template class ProblemInstat<YaspGridBasis<2,2>>;
+
 } // end namespace AMDiS

src/amdis/ProblemInstat.hpp

@@ -110,6 +110,10 @@ namespace AMDiS
     return {name, prob, initialProb};
   }
 
+  // mark template as explicitly instantiated in cpp file
+  extern template class ProblemInstat<YaspGridBasis<2,1>>;
+  extern template class ProblemInstat<YaspGridBasis<2,2>>;
+
 } // end namespace AMDiS
 
 #include "ProblemInstat.inc.hpp"

src/amdis/ProblemStat.cpp

-#define AMDIS_NO_EXTERN_PROBLEMSTAT
+#include "config.h"
 #include "ProblemStat.hpp"
-#undef AMDIS_NO_EXTERN_PROBLEMSTAT
-
 
 namespace AMDiS
 {
+  // explicit template instatiation
+  template class ProblemStat<YaspGridBasis<2,1>>;
+  template class ProblemStat<YaspGridBasis<2,2>>;
 
 } // end namespace AMDiS

src/amdis/ProblemStat.hpp

@@ -499,7 +499,10 @@ namespace AMDiS
     return {name, grid, globalBasis};
   }
 
+  // mark templates as explicitly instantiated in cpp file
+  extern template class ProblemStat<YaspGridBasis<2,1>>;
+  extern template class ProblemStat<YaspGridBasis<2,2>>;
+
 } // end namespace AMDiS
 
 #include "ProblemStat.inc.hpp"
-