Merge branch 'develop' into 'develop'

Move stl for SphereGPU to app folder

See merge request irmb/VirtualFluids_dev!152

apps/gpu/LBM/SphereGPU/Sphere.cpp

@@ -152,15 +152,15 @@ int main(int argc, char *argv[])
                                     6.0 * L,  0.8 * L,  0.8 * L, dx);
 
         // use primitive
-        Object *sphere = new Sphere(0.0, 0.0, 0.0, dSphere / 2.0);
+        // Object *sphere = new Sphere(0.0, 0.0, 0.0, dSphere / 2.0);
 
         // use stl
-        // std::string stlPath = "stl/sphere02.stl";
-        // if (useConfigFile && config.contains("STLPath")) {
-        //     stlPath = config.getValue<std::string>("STLPath");
-        // }
-        // std::cout << "Reading stl from " << stlPath << "." << std::endl;
-        // Object *sphere = TriangularMesh::make(stlPath);
+        std::string stlPath = "./apps/gpu/LBM/SphereGPU/sphere02.stl";
+        if (useConfigFile && config.contains("STLPath")) {
+            stlPath = config.getValue<std::string>("STLPath");
+        }
+        std::cout << "Reading stl from " << stlPath << "." << std::endl;
+        Object *sphere = TriangularMesh::make(stlPath);
 
         gridBuilder->addGeometry(sphere);
         gridBuilder->setPeriodicBoundaryCondition(false, false, false);

apps/gpu/LBM/SphereGPU/config.txt

@@ -14,6 +14,7 @@ Prefix=Sphere01
 #informations for reading
 ##################################################
 GridPath="grid/"
+#STLPath=./stl/Sphere/sphere02.stl
 
 ##################################################
 #number of grid levels