Merge pull request #14 in RZSPHER/spheral from fix_ratio_sphere to ma…

…ster * commit '56f119ed43c09c459689497396d6bb4ac19b7533': Added vector functions to the Python interface for boundary. Tightened Voronoi node tolerance by default.
LLNL · Aug 7, 2020 · 891ef94 · 891ef94
2 parents b119c63 + 56f119e
commit 891ef94
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/Pybind11Wraps/Boundary/Boundary.py b/src/Pybind11Wraps/Boundary/Boundary.py
@@ -110,6 +110,22 @@ def applyGhostBoundary9(self,
     @PYB11virtual
     @PYB11const
     def applyGhostBoundary10(self,
+                            field = "Field<%(Dimension)s, std::vector<Scalar>>&"):
+        "Apply the boundary condition to the ghost node values in the given Field."
+        return "void"
+
+    @PYB11pycppname("applyGhostBoundary")
+    @PYB11virtual
+    @PYB11const
+    def applyGhostBoundary11(self,
+                            field = "Field<%(Dimension)s, std::vector<Vector>>&"):
+        "Apply the boundary condition to the ghost node values in the given Field."
+        return "void"
+
+    @PYB11pycppname("applyGhostBoundary")
+    @PYB11virtual
+    @PYB11const
+    def applyGhostBoundary12(self,
                              field = "Field<%(Dimension)s, RKCoefficients<%(Dimension)s>>&"):
         "Apply the boundary condition to the ghost node values in the given Field."
         return "void"
@@ -199,6 +215,22 @@ def enforceBoundary9(self,
     @PYB11virtual
     @PYB11const
     def enforceBoundary10(self,
+                         field = "Field<%(Dimension)s, std::vector<Scalar>>&"):
+        "Apply the boundary condition to the violation node values in the given Field."
+        return "void"
+
+    @PYB11pycppname("enforceBoundary")
+    @PYB11virtual
+    @PYB11const
+    def enforceBoundary11(self,
+                         field = "Field<%(Dimension)s, std::vector<Vector>>&"):
+        "Apply the boundary condition to the violation node values in the given Field."
+        return "void"
+
+    @PYB11pycppname("enforceBoundary")
+    @PYB11virtual
+    @PYB11const
+    def enforceBoundary12(self,
                           field = "Field<%(Dimension)s, RKCoefficients<%(Dimension)s>>&"):
         "Apply the boundary condition to the violation node values in the given Field."
         return "void"
@@ -365,6 +397,8 @@ def enforceFieldListBoundary(self, fieldList="FieldList<%(Dimension)s, %(Value)s
                  ("ThirdRankTensor", "ThirdRankTensor"),
                  ("FourthRankTensor", "FourthRankTensor"),
                  ("FifthRankTensor", "FifthRankTensor"),
+                 ("std::vector<Scalar>", "StdVectorScalar"),
+                 ("std::vector<Vector>", "StdVectorVector"),
                  ("RKCoefficients<%(Dimension)s>", "RKCoefficients")):
         exec('''
 aflgb%(L)s = PYB11TemplateMethod(applyFieldListGhostBoundary, template_parameters="%(T)s", pyname="applyFieldListGhostBoundary")

diff --git a/src/Pybind11Wraps/Distributed/VoronoiRedistributeNodes.py b/src/Pybind11Wraps/Distributed/VoronoiRedistributeNodes.py
@@ -28,7 +28,7 @@ def pyinit(self,
                dummy = "const double",
                workBalance = ("const bool", "false"),
                balanceGenerators = ("const bool", "true"),
-               tolerance = ("const double", "1.0e-2"),
+               tolerance = ("const double", "1.0e-4"),
                maxIterations = ("const unsigned", "200")):
         "Constructor"