Added Disk Mesh Export (#10)

* Changed lsVTKWriter/Reader to apply() standard. * Added lsToDiskMesh.
ViennaTools · Nov 15, 2019 · e8c318e · e8c318e
1 parent e0c8bc5
commit e8c318e
Show file tree

Hide file tree

Showing 157 changed files with 2,066 additions and 818 deletions.
diff --git a/CMakeFiles/cmake.check_cache b/CMakeFiles/cmake.check_cache
diff --git a/Examples/AirGapDeposition/AirGapDeposition.cpp b/Examples/AirGapDeposition/AirGapDeposition.cpp
@@ -60,7 +60,7 @@ int main() {
     std::cout << "Extracting..." << std::endl;
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(substrate, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("plane.vtp");
+    lsVTKWriter(mesh, "plane.vtk").apply();
   }
 
   {
@@ -76,7 +76,7 @@ int main() {
       std::cout << "Extracting..." << std::endl;
       lsMesh mesh;
       lsToMesh<double, D>(trench, mesh).apply();
-      lsVTKWriter(mesh).writeVTKLegacy("box.vtp");
+      lsVTKWriter(mesh, "box.vtk").apply();
     }
 
     // Create trench geometry
@@ -119,7 +119,7 @@ int main() {
               << numberOfSteps << std::flush;
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(newLayer, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("trench" + std::to_string(i) + ".vtk");
+    lsVTKWriter(mesh, "trench" + std::to_string(i) + ".vtk").apply();
   }
   std::cout << std::endl;
   std::cout << "Time passed during advection: " << passedTime << std::endl;

diff --git a/Examples/Deposition/Deposition.cpp b/Examples/Deposition/Deposition.cpp
@@ -76,7 +76,7 @@ int main() {
     std::cout << "Extracting..." << std::endl;
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(substrate, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("trench-0.vtp");
+    lsVTKWriter(mesh, "trench-0.vtk").apply();
   }
 
   // Now grow new material isotropically
@@ -103,11 +103,10 @@ int main() {
 
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(newLayer, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("trench-" + std::to_string(counter) +
-                                     ".vtp");
+    lsVTKWriter(mesh, "trench-" + std::to_string(counter) + ".vtk").apply();
 
     lsToMesh<double, D>(newLayer, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("LS-" + std::to_string(counter) + ".vtp");
+    lsVTKWriter(mesh, "LS-" + std::to_string(counter) + ".vtk").apply();
 
     ++counter;
   }
@@ -121,7 +120,7 @@ int main() {
   //   lsMesh mesh;
   //   lsToSurfaceMesh<double, D>(newLayer, mesh).apply();
   //
-  //   lsVTKWriter(mesh).writeVTKLegacy("grown.vtp");
+  //   lsVTKWriter(mesh, "grown.vtk").apply();
   // }
 
   return 0;

diff --git a/Examples/PatternedSubstrate/PatternedSubstrate.cpp b/Examples/PatternedSubstrate/PatternedSubstrate.cpp
@@ -8,6 +8,7 @@
 #include <lsExpand.hpp>
 #include <lsMakeGeometry.hpp>
 #include <lsPrune.hpp>
+#include <lsToDiskMesh.hpp>
 #include <lsToMesh.hpp>
 #include <lsToSurfaceMesh.hpp>
 #include <lsToVoxelMesh.hpp>
@@ -196,8 +197,7 @@ int main() {
                 << numberOfEtchSteps << std::flush;
       lsMesh mesh;
       lsToSurfaceMesh<double, D>(substrate, mesh).apply();
-      lsVTKWriter(mesh).writeVTKLegacy("substrate-" + std::to_string(i) +
-                                       ".vtp");
+      lsVTKWriter(mesh, "substrate-" + std::to_string(i) + ".vtk").apply();
 
       advectionKernel.apply();
       passedTime += advectionKernel.getAdvectionTime();
@@ -206,13 +206,20 @@ int main() {
 
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(substrate, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy(
-        "substrate-" + std::to_string(numberOfEtchSteps) + ".vtp");
+    lsVTKWriter(mesh, "substrate-" + std::to_string(numberOfEtchSteps) + ".vtk")
+        .apply();
 
     std::cout << "Time passed during directional etch: " << passedTime
               << std::endl;
   }
 
+  // make disk mesh and output
+  {
+    lsMesh mesh;
+    lsToDiskMesh<double, 3>(substrate, mesh).apply();
+    lsVTKWriter(mesh, "diskMesh.vtk").apply();
+  }
+
   // Deposit new layer ----------------------------------------------
   // new level set for new layer
   lsDomain<double, D> fillLayer(substrate);
@@ -232,8 +239,9 @@ int main() {
                 << numberOfDepoSteps << std::flush;
       lsMesh mesh;
       lsToSurfaceMesh<double, D>(fillLayer, mesh).apply();
-      lsVTKWriter(mesh).writeVTKLegacy(
-          "fillLayer-" + std::to_string(numberOfEtchSteps + 1 + i) + ".vtp");
+      lsVTKWriter(mesh, "fillLayer-" +
+                            std::to_string(numberOfEtchSteps + 1 + i) + ".vtk")
+          .apply();
 
       advectionKernel.apply();
       passedTime += advectionKernel.getAdvectionTime();
@@ -242,9 +250,11 @@ int main() {
 
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(fillLayer, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy(
-        "fillLayer-" + std::to_string(numberOfEtchSteps + numberOfDepoSteps) +
-        ".vtp");
+    lsVTKWriter(mesh,
+                "fillLayer-" +
+                    std::to_string(numberOfEtchSteps + numberOfDepoSteps) +
+                    ".vtk")
+        .apply();
 
     std::cout << "Time passed during isotropic deposition: " << passedTime
               << std::endl;
@@ -254,10 +264,10 @@ int main() {
   {
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(substrate, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("final-substrate.vtp");
+    lsVTKWriter(mesh, "final-substrate.vtk").apply();
 
     lsToSurfaceMesh<double, D>(fillLayer, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("final-fillLayer.vtp");
+    lsVTKWriter(mesh, "final-fillLayer.vtk").apply();
   }
 
   return 0;

diff --git a/Examples/PeriodicBoundary/PeriodicBoundary.cpp b/Examples/PeriodicBoundary/PeriodicBoundary.cpp
@@ -69,7 +69,7 @@ int main() {
         .apply();
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(pillar, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("pillar.vtp");
+    lsVTKWriter(mesh, "pillar.vtk").apply();
     lsBooleanOperation<double, D> boolOp(substrate, pillar,
                                          lsBooleanOperationEnum::UNION);
     boolOp.apply();
@@ -96,7 +96,7 @@ int main() {
               << numberOfSteps << std::flush;
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(substrate, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("pillar-" + std::to_string(i) + ".vtp");
+    lsVTKWriter(mesh, "pillar-" + std::to_string(i) + ".vtk").apply();
 
     advectionKernel.apply();
     passedTime += advectionKernel.getAdvectionTime();

diff --git a/Examples/SharedLib/SharedLib.cpp b/Examples/SharedLib/SharedLib.cpp
@@ -51,8 +51,8 @@ int main() {
     lsToSurfaceMesh_float_3(sphere1, mesh1).apply();
     lsToSurfaceMesh_float_3(sphere2, mesh2).apply();
 
-    lsVTKWriter(mesh1).writeVTKLegacy("sphere1.vtk");
-    lsVTKWriter(mesh2).writeVTKLegacy("sphere2.vtk");
+    lsVTKWriter(mesh1, "sphere1.vtk").apply();
+    lsVTKWriter(mesh2, "sphere2.vtk").apply();
   }
 
   // Perform a boolean operation
@@ -66,7 +66,7 @@ int main() {
 
   mesh.print();
 
-  lsVTKWriter(mesh).writeVTKLegacy("after.vtk");
+  lsVTKWriter(mesh, "after.vtk").apply();
 
   return 0;
 }
diff --git a/Examples/VoidEtching/VoidEtching.cpp b/Examples/VoidEtching/VoidEtching.cpp
@@ -118,7 +118,7 @@ int main() {
               << numberOfSteps << std::flush;
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(substrate, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("void-" + std::to_string(i) + ".vtp");
+    lsVTKWriter(mesh, "void-" + std::to_string(i) + ".vtk").apply();
 
     advectionKernel.apply();
     passedTime += advectionKernel.getAdvectionTime();

diff --git a/Tests/Advection/Advection.cpp b/Tests/Advection/Advection.cpp
@@ -54,7 +54,7 @@ int main() {
     std::cout << "Extracting..." << std::endl;
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(sphere1, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("before.vtk");
+    lsVTKWriter(mesh, "before.vtk").apply();
   }
 
   // instantiate velocities
@@ -82,7 +82,7 @@ int main() {
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(sphere1, mesh).apply();
     mesh.print();
-    lsVTKWriter(mesh).writeVTKLegacy("after.vtk");
+    lsVTKWriter(mesh, "after.vtk").apply();
   }
 
   return 0;

diff --git a/Tests/Advection2D/Advection2D.cpp b/Tests/Advection2D/Advection2D.cpp
@@ -60,10 +60,10 @@ int main() {
   {
     lsMesh mesh;
     lsToMesh<double, D>(sphere1, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("sphere.vtk");
+    lsVTKWriter(mesh, "sphere.vtk").apply();
 
     lsToSurfaceMesh<double, D>(sphere1, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("before2D.vtk");
+    lsVTKWriter(mesh, "before2D.vtk").apply();
   }
 
   // Advect the sphere
@@ -96,7 +96,7 @@ int main() {
     std::cout << "Extracting..." << std::endl;
     lsToSurfaceMesh<double, D>(sphere1, mesh).apply();
     mesh.print();
-    lsVTKWriter(mesh).writeVTKLegacy("after2D.vtk");
+    lsVTKWriter(mesh, "after2D.vtk").apply();
   }
 
   return 0;

diff --git a/Tests/AdvectionPlane/AdvectionPlane.cpp b/Tests/AdvectionPlane/AdvectionPlane.cpp
@@ -62,8 +62,8 @@ int main() {
     lsToMesh<double, D>(plane, mesh).apply();
 
     mesh.print();
-    lsVTKWriter(explMesh).writeVTKLegacy("before.vtk");
-    lsVTKWriter(mesh).writeVTKLegacy("beforeLS.vtk");
+    lsVTKWriter(explMesh, "before.vtk").apply();
+    lsVTKWriter(mesh, "beforeLS.vtk").apply();
   }
 
   // fill vector with lsDomain pointers
@@ -90,7 +90,7 @@ int main() {
 
   // mesh.print();
 
-  lsVTKWriter(mesh).writeVTKLegacy("after.vtk");
+  lsVTKWriter(mesh, "after.vtk").apply();
 
   return 0;
 }
diff --git a/Tests/BooleanOperation/BooleanOperation.cpp b/Tests/BooleanOperation/BooleanOperation.cpp
@@ -41,8 +41,8 @@ int main() {
     lsToSurfaceMesh<double, D>(sphere1, mesh1).apply();
     lsToSurfaceMesh<double, D>(sphere2, mesh2).apply();
 
-    lsVTKWriter(mesh1).writeVTKLegacy("sphere1.vtk");
-    lsVTKWriter(mesh2).writeVTKLegacy("sphere2.vtk");
+    lsVTKWriter(mesh1, "sphere1.vtk").apply();
+    lsVTKWriter(mesh2, "sphere2.vtk").apply();
   }
 
   // Perform a boolean operation
@@ -56,7 +56,7 @@ int main() {
 
   mesh.print();
 
-  lsVTKWriter(mesh).writeVTKLegacy("after.vtk");
+  lsVTKWriter(mesh, "after.vtk").apply();
 
   return 0;
 }
diff --git a/Tests/BoundaryConditions/BoundaryConditions.cpp b/Tests/BoundaryConditions/BoundaryConditions.cpp
@@ -39,7 +39,7 @@ int main() {
     std::cout << "Extracting..." << std::endl;
     lsMesh mesh;
     lsToSurfaceMesh<double, D>(levelSet, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("plane.vtk");
+    lsVTKWriter(mesh, "plane.vtk").apply();
   }
 
   return 0;

diff --git a/Tests/CalculateNormalVectors/CalculateNormalVectors.cpp b/Tests/CalculateNormalVectors/CalculateNormalVectors.cpp
@@ -52,14 +52,14 @@ int main() {
 
   // normal vectors are only valid as long as the underlying
   // level set does not change
-  lsCalculateNormalVectors<double, 3>(sphere1).apply();
+  lsCalculateNormalVectors<double, 3>(sphere1, true).apply();
   auto &normalVectors = sphere1.getNormalVectors();
 
   std::cout << "Number of Normal vectors: " << normalVectors.size()
             << std::endl;
 
   lsMesh mesh;
-  lsToMesh<double, 3>(sphere1, mesh, true).apply();
+  lsToMesh<double, 3>(sphere1, mesh, true, true).apply();
 
   // also output LS values as scalar data
   std::vector<double> scalars;
@@ -76,8 +76,10 @@ int main() {
   // set normal vectors as vectordata to mesh
   mesh.insertNextVectorData(normalVectors, "Normals");
 
-  auto writer = lsVTKWriter(mesh);
-  writer.writeVTKLegacy("explicit.vtk");
+  auto writer = lsVTKWriter();
+  writer.setMesh(mesh);
+  writer.setFileName("explicit.vtk");
+  writer.apply();
 
   return 0;
 }
diff --git a/Tests/ConvexHull/ConvexHull.cpp b/Tests/ConvexHull/ConvexHull.cpp
@@ -57,7 +57,7 @@ int main() {
         hrleVectorType<double, 3>(cloud.points[i][0], cloud.points[i][1], 0.));
     pointMesh.vertices.push_back(hrleVectorType<unsigned, 1>(i));
   }
-  lsVTKWriter(pointMesh).writeVTP("points.vtp");
+  lsVTKWriter(pointMesh, lsFileFormatEnum::VTP, "points.vtp").apply();
 
   lsMakeGeometry<double, D> geom;
   lsDomain<double, D> levelSet;
@@ -70,7 +70,7 @@ int main() {
     std::cout << "Extracting..." << std::endl;
     lsToSurfaceMesh<double, D>(levelSet, mesh).apply();
     mesh.print();
-    lsVTKWriter(mesh).writeVTKLegacy("LSMesh.vtk");
+    lsVTKWriter(mesh, "LSMesh.vtk").apply();
   }
 
   return 0;

diff --git a/Tests/ConvexHull3D/ConvexHull3D.cpp b/Tests/ConvexHull3D/ConvexHull3D.cpp
@@ -108,11 +108,11 @@ int main() {
     pointMesh.vertices.push_back(hrleVectorType<unsigned, 1>(i));
   }
   std::cout << "Output point cloud" << std::endl;
-  lsVTKWriter(pointMesh).writeVTP("points.vtp");
+  lsVTKWriter(pointMesh, lsFileFormatEnum::VTP, "points.vtp").apply();
 
   // std::cout << "Output surface mesh" << std::endl;
   // mesh.print();
-  // lsVTKWriter(mesh).writeVTP("hull.vtp");
+  // lsVTKWriter(mesh, lsFileFormatEnum::VTP, "hull.vtp").apply();
 
   std::cout << "create level set" << std::endl;
   lsDomain<double, D> levelSet(0.18);
@@ -128,18 +128,18 @@ int main() {
   lsMesh LSMesh;
   std::cout << "Output level set grid" << std::endl;
   lsToMesh<double, D>(levelSet, LSMesh).apply();
-  lsVTKWriter(LSMesh).writeVTP("LS.vtp");
+  lsVTKWriter(LSMesh, lsFileFormatEnum::VTP, "LS.vtp").apply();
 
   std::cout << "Output level set surface" << std::endl;
   lsToSurfaceMesh<double, D>(levelSet, LSMesh).apply();
-  lsVTKWriter(LSMesh).writeVTP("LSmesh.vtp");
+  lsVTKWriter(LSMesh, lsFileFormatEnum::VTP, "LSmesh.vtp").apply();
 
   // {
   //   lsMesh mesh;
   //   std::cout << "Extracting..." << std::endl;
   //   lsToSurfaceMesh<double, D>(sphere1, mesh).apply();
   //   mesh.print();
-  //   lsVTKWriter(mesh).writeVTKLegacy("after2D.vtk");
+  //   lsVTKWriter(mesh, "after2D.vtk").apply();
   // }
 
   return 0;

diff --git a/Tests/Expand/Expand.cpp b/Tests/Expand/Expand.cpp
@@ -39,18 +39,18 @@ int main() {
   {
     lsMesh mesh;
     lsToMesh<double, D>(sphere1, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("sphere.vtk");
+    lsVTKWriter(mesh, "sphere.vtk").apply();
   }
 
   {
     lsMesh mesh;
     lsExpand<double, D>(sphere1, 5).apply();
     lsToMesh<double, D>(sphere1, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("sphereExpanded.vtk");
+    lsVTKWriter(mesh, "sphereExpanded.vtk").apply();
 
     lsReduce<double, D>(sphere1, 1).apply();
     lsToMesh<double, D>(sphere1, mesh).apply();
-    lsVTKWriter(mesh).writeVTKLegacy("sphereReduced.vtk");
+    lsVTKWriter(mesh, "sphereReduced.vtk").apply();
   }
 
   return 0;