Adding changes for PDATA_FULL

src/FiniteDifference/util/common.hpp

@@ -11,6 +11,8 @@
 #define STAGGERED_GRID 1
 #define NORMAL_GRID 0
 
+#include "util/common.hpp"
+
 template<typename T, typename Sfinae = void>
 struct has_grid_type: std::false_type {};
 

src/initialize/initialize_wrapper_cpu.cpp

 #include "initialize_wrapper.hpp"
 #include "VCluster/VCluster.hpp"
 
+#ifndef NO_INIT_AND_MAIN
 
 void openfpm_init_wrapper(int * argc, char *** argv)
 {
@@ -11,3 +12,5 @@ void openfpm_finalize_wrapper()
 {
 	openfpm_finalize();
 }
+
+#endif
\ No newline at end of file

src/initialize/initialize_wrapper_cuda.cu

@@ -3,6 +3,8 @@
 #include "initialize_wrapper.hpp"
 #include "VCluster/VCluster.hpp"
 
+#ifndef NO_INIT_AND_MAIN
+
 void openfpm_init_wrapper(int * argc, char *** argv)
 {
 	openfpm_init(argc,argv);
@@ -12,3 +14,5 @@ void openfpm_finalize_wrapper()
 {
 	openfpm_finalize();
 }
+
+#endif

src/main.cpp

@@ -3,14 +3,18 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 
-#include "unit_test_init_cleanup.hpp"
-
 #include "config.h"
+
 #include "FiniteDifference/util/common_test.hpp"
 #include "util/util_num_unit_tests.hpp"
+
 #include "PSE/Kernels_unit_tests.hpp"
 #include "Draw/DrawParticles_unit_tests.hpp"
 
+#ifndef NO_INIT_AND_MAIN
+
+#include "unit_test_init_cleanup.hpp"
+
 // initialization function:
 bool init_unit_test()
 {
@@ -22,3 +26,5 @@ int main(int argc, char* argv[])
 {
   return boost::unit_test::unit_test_main( &init_unit_test, argc, argv );
 }
+
+#endif