Remove StringUtil from GPU lib, as StringUtil exists in basics. Add exports.

Change in cmake: When BUILDTYPE is not defined in vf_add_library(), a library is build regarding the CMAKE_BUILDY_TYPE.

CMake/VirtualFluidsMacros.cmake

@@ -112,6 +112,15 @@ function(vf_add_library)
     else()
         vf_get_library_name (library_name)
     endif()
+
+    if(NOT DEFINED ARG_BUILDTYPE)
+        if(BUILD_SHARED_LIBS)
+            set(ARG_BUILDTYPE "shared")
+        else()
+            set(ARG_BUILDTYPE "static")
+        endif()
+    endif()
+
     status("Configuring the target: ${library_name} (type=${ARG_BUILDTYPE})...")
 
 

apps/gpu/LBM/DrivenCavity/CMakeLists.txt

@@ -2,8 +2,9 @@ PROJECT(DrivenCavity)
 
 #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-DOMPI_SKIP_MPICXX" )
 
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluids_GPU basics GridGenerator FILES DrivenCavity.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES DrivenCavity.cpp )
 
 set_source_files_properties(DrivenCavity.cpp PROPERTIES LANGUAGE CUDA)
 
 linkCUDA()
+linkMPI()

apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp

@@ -9,6 +9,8 @@
 #include <exception>
 #include <memory>
 
+#include "mpi.h"
+
 //////////////////////////////////////////////////////////////////////////
 
 #include "Core/DataTypes.h"
@@ -122,7 +124,9 @@ void multipleLevel(const std::string& configPath)
     
 	Communicator* comm = Communicator::getInstanz();
 	SPtr<ConfigFileReader> configReader = ConfigFileReader::getNewInstance();
-	SPtr<ConfigData> configData = configReader->readConfigFile(configPath);
+
+    std::cout << configPath << std::endl;
+	SPtr<ConfigData> configData = configReader->readConfigFile(configPath.c_str());
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -350,11 +354,9 @@ int main( int argc, char* argv[])
 
 			targetPath = __FILE__;
 
-#ifdef _WIN32
-			targetPath = targetPath.substr(0, targetPath.find_last_of('\\') + 1);
-#else
 			targetPath = targetPath.substr(0, targetPath.find_last_of('/') + 1);
-#endif
+
+
 
 			std::cout << targetPath << std::endl;
 

gpu.cmake

@@ -61,9 +61,9 @@ IF (VF.BUILD_VF_GPU)
     #add_subdirectory(targets/apps/LBM/BaselMultiGPU)
 
     add_subdirectory(apps/gpu/LBM/DrivenCavity)
-    add_subdirectory(apps/gpu/LBM/gridGeneratorTest)
-    add_subdirectory(apps/gpu/LBM/TGV_3D)
-    add_subdirectory(apps/gpu/LBM/TGV_3D_MultiGPU)
+    #add_subdirectory(apps/gpu/LBM/gridGeneratorTest)
+    #add_subdirectory(apps/gpu/LBM/TGV_3D)
+    #add_subdirectory(apps/gpu/LBM/TGV_3D_MultiGPU)
 ELSE()
     MESSAGE( STATUS "exclude Virtual Fluids GPU." )
 ENDIF()

src/basics/CMakeLists.txt

 
 include(Core/buildInfo.cmake)
 
-vf_add_library(BUILDTYPE static EXCLUDE buildInfo.in.cpp)
+vf_add_library(EXCLUDE buildInfo.in.cpp)
 
 vf_get_library_name (library_name)
 target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Core)

src/basics/Core/Input/ConfigFileReader/ConfigFileReader.cpp

@@ -6,20 +6,17 @@
 #include <fstream>
 #include <iostream>
 
-BASICS_EXPORT std::shared_ptr<ConfigFileReader> ConfigFileReader::getNewInstance()
+std::shared_ptr<ConfigFileReader> ConfigFileReader::getNewInstance()
 {
     return std::shared_ptr<ConfigFileReader>(new ConfigFileReader());
 }
 
-ConfigFileReader::ConfigFileReader() = default;
-
-BASICS_EXPORT ConfigFileReader::~ConfigFileReader() = default;
-
-BASICS_EXPORT std::shared_ptr<ConfigData> ConfigFileReader::readConfigFile(const std::string &filePath) const
+std::shared_ptr<ConfigData> ConfigFileReader::readConfigFile(const char* filePath) const
 {
+    std::cout << filePath << std::endl;
     std::shared_ptr<ConfigDataImp> data = ConfigDataImp::getNewInstance();
     std::ifstream stream;
-    stream.open(filePath.c_str(), std::ios::in);
+    stream.open(filePath, std::ios::in);
     if (stream.fail())
         throw std::runtime_error("can not open config file!");
     std::unique_ptr<input::Input> input = input::Input::makeInput(stream, "config");

src/basics/Core/Input/ConfigFileReader/ConfigFileReader.h

 #ifndef CONFIGFILEREADER_H
 #define CONFIGFILEREADER_H
 
-#include "../Input.h"
 
 #include <memory>
+#include <string>
+
+#include "basics_export.h"
 
 class ConfigData;
 
@@ -11,11 +13,10 @@ class ConfigFileReader
 {
 public:
     BASICS_EXPORT static std::shared_ptr<ConfigFileReader> getNewInstance();
-    BASICS_EXPORT virtual ~ConfigFileReader();
 
-    BASICS_EXPORT std::shared_ptr<ConfigData> readConfigFile(const std::string &filePath) const;
+    BASICS_EXPORT std::shared_ptr<ConfigData> readConfigFile(const char* filePath) const;
 
 private:
-    ConfigFileReader();
+    ConfigFileReader() = default;
 };
 #endif

src/basics/Core/buildInfo.in.cpp

-#include "buildInfo.h"
-
 #include "basics_export.h"
 
 namespace buildInfo

src/basics/basics/writer/WbWriterVtkXmlBinary.h

@@ -37,7 +37,9 @@
 
 #include <basics/writer/WbWriter.h>
 
-class WbWriterVtkXmlBinary : public WbWriter
+#include "basics_export.h"
+
+class BASICS_EXPORT WbWriterVtkXmlBinary : public WbWriter
 {
 public:
     static WbWriterVtkXmlBinary *getInstance()

src/basics/geometry3d/GbObject3D.h

@@ -49,6 +49,8 @@ class GbObject3DCreator;
 
 #include <PointerDefinitions.h>
 
+#include "basics_export.h"
+
 //////////////////////////////////////////////////////////////////////////
 //!
 //! \class GbObject3D
@@ -57,7 +59,7 @@ class GbObject3DCreator;
 //!
 //////////////////////////////////////////////////////////////////////////
 
-class GbObject3D : public ObObject
+class BASICS_EXPORT GbObject3D : public ObObject
 {
 public:
     // abstract Methods

src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp

@@ -7,6 +7,9 @@
 #include <fstream>
 #include <sstream>
 
+#include "Core/StringUtilities/StringUtil.h"
+#include <cassert>
+
 //#include <math.h>
 //#include "LB.h"
 

src/gpu/VirtualFluids_GPU/Calculation/Cp.h

@@ -3,7 +3,6 @@
 
 #include "LBM/LB.h"
 #include "GPU/GPU_Interface.h"
-#include "Utilities/StringUtil.hpp"
 #include "Parameter/Parameter.h"
 #include "GPU/CudaMemoryManager.h"
 

src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp

@@ -7,6 +7,8 @@
 #include <fstream>
 #include <sstream>
 
+#include "Core/StringUtilities/StringUtil.h"
+
 //#include <math.h>
 //#include "LB.h"
 

src/gpu/VirtualFluids_GPU/Calculation/DragLift.h

@@ -3,7 +3,6 @@
 
 #include "LBM/LB.h"
 #include "GPU/GPU_Interface.h"
-#include "Utilities/StringUtil.hpp"
 #include "Parameter/Parameter.h"
 #include "GPU/CudaMemoryManager.h"
 

src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp

@@ -7,9 +7,9 @@
 #include <stdio.h>
 #include <fstream>
 #include <sstream>
-#include "Utilities/StringUtil.hpp"
 #include "GPU/CudaMemoryManager.h"
 
+#include "Core/StringUtilities/StringUtil.h"
 //using namespace std;
 //////////////////////////////////////////////////////////////////////////
 

src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp

@@ -9,6 +9,7 @@
 #include <sstream>
 //using namespace std;
 //////////////////////////////////////////////////////////////////////////
+#include "Core/StringUtilities/StringUtil.h"
 
 void setSizeOfPlane(Parameter* para, int lev, unsigned int z)
 {

src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.h

@@ -3,7 +3,6 @@
 
 #include "Parameter/Parameter.h"
 #include "GPU/CudaMemoryManager.h"
-#include "Utilities/StringUtil.hpp"
 #include "basics/utilities/UbSystem.h"
 
 #include <iostream>

src/gpu/VirtualFluids_GPU/Input/ConfigFile.cpp

 #include "ConfigFile.h"
-#include "Utilities/StringUtil.hpp"
 #include <errno.h>
 #include <algorithm>
 #include <sstream>
 #include <iostream>
 #include <string>
 
+#include "Core/StringUtilities/StringUtil.h"
+
 
 ConfigFile::ConfigFile( const char *strConfigFile ) 
 {

src/gpu/VirtualFluids_GPU/Input/VtkXmlReader.hpp

@@ -10,7 +10,6 @@
 #ifndef VTK_XML_READER_H
 #define VTK_XML_READER_H
 
-#include "Utilities/StringUtil.hpp"
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/foreach.hpp>
@@ -18,6 +17,8 @@
 #include <vector>
 #include <iostream>
 
+#include "Core/StringUtilities/StringUtil.h"
+
 namespace vtk_xml_reader
 {
 	template <class T>

src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp

@@ -19,7 +19,7 @@
 #include "Output/VeloASCIIWriter.hpp"
 //////////////////////////////////////////////////////////////////////////
 #include "Utilities/Buffer2D.hpp"
-#include "Utilities/StringUtil.hpp"
+#include "Core/StringUtilities/StringUtil.h"
 //////////////////////////////////////////////////////////////////////////
 #include "Init/InitLattice.h"
 #include "Init/DefineGrid.h"