ddfem 1.0.2__tar.gz → 1.0.4__tar.gz

{ddfem-1.0.2 → ddfem-1.0.4}/PKG-INFO

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: ddfem
-Version: 1.0.2
+Version: 1.0.4
 Summary: Diffuse domain finite element solver
 Author-email: Luke Benfield <luke.benfield@warwick.ac.uk>, Andreas Dedner <a.s.dedner@warwick.ac.uk>
 License-Expression: MIT
-Project-URL: Homepage, https://...
-Project-URL: Issues, https://...
+Project-URL: Homepage, https://gitlab.dune-project.org/dune-fem/ddfem
+Project-URL: Issues, https://gitlab.dune-project.org/dune-fem/ddfem/-/issues
+Project-URL: Documentation, https://ddfem.readthedocs.io/en/latest/index.html
+Project-URL: Repository, https://gitlab.dune-project.org/dune-fem/ddfem.git
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
@@ -13,6 +15,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fenics-ufl==2022.2.0
 Requires-Dist: numpy
+Requires-Dist: setuptools<81
+Provides-Extra: dune
+Requires-Dist: dune-fem; extra == "dune"
+Requires-Dist: pygmsh; extra == "dune"
 Dynamic: license-file
 
 # Diffuse Domain Finite Element Methods

{ddfem-1.0.2 → ddfem-1.0.4}/ddfem/boundary.py

@@ -87,7 +87,6 @@ def classify_boundary(boundary_dict):
             boundary_values.update([(kk, f) for kk in ids])
 
         else:
-            print(type(k), type(f))
             raise NotImplementedError(f"unknown boundary type {k} : {f}")
 
     return boundary_flux_cs, boundary_flux_vs, boundary_values

{ddfem-1.0.2 → ddfem-1.0.4}/ddfem/geometry/domain_dune.py

@@ -7,22 +7,25 @@ from .domain import Domain
 
 
 class DomainDune(Domain):
-    def __init__(self, omega, x, gridView):
+    def __init__(self, omega, x, gridView, filterTolerance=0):
         super().__init__(omega)
         self.x = x
         self.gridView = gridView
+        self.fullSDF = self.gridFunction(self.omega(self.x), name="full-sdf")
+        if filterTolerance>0:
+            self.gridView = self._filter(tolerance=filterTolerance)
+            self.fullSDF = self.gridFunction(self.omega(self.x), name="full-sdf")
 
         self._phi = None
         self._bndProj = None
         self._extProj = None
         self._bndProjSDFs = {}
 
-        self.fullSDF = self.gridFunction(self.omega(self.x), name="full-sdf")
 
     def gridFunction(self, expr, name):
         start_ = time.time()
         gf = dune.fem.function.gridFunction(expr, name=name, gridView=self.gridView)
-        print(f"{name} setup: {time.time() - start_}")
+        # print(f"{name} setup: {time.time() - start_}")
         return gf
 
     def phi(self, x):
@@ -67,11 +70,11 @@ class DomainDune(Domain):
                 )
 
             self.gridView.hierarchicalGrid.adapt(mark)
-            print(self.gridView.size(0))
+            # print(self.gridView.size(0))
             lowerTol /= 2
             upperTol /= 2
 
-    def _filter(self, tolerance=1):
+    def _filter(self, tolerance):
         sd = self.fullSDF
         tol = tolerance  # * self.epsilon.value: issue here with epsilon being a UFL expression due to CSG approach
         phiFilter = (

{ddfem-1.0.2 → ddfem-1.0.4}/ddfem.egg-info/PKG-INFO

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: ddfem
-Version: 1.0.2
+Version: 1.0.4
 Summary: Diffuse domain finite element solver
 Author-email: Luke Benfield <luke.benfield@warwick.ac.uk>, Andreas Dedner <a.s.dedner@warwick.ac.uk>
 License-Expression: MIT
-Project-URL: Homepage, https://...
-Project-URL: Issues, https://...
+Project-URL: Homepage, https://gitlab.dune-project.org/dune-fem/ddfem
+Project-URL: Issues, https://gitlab.dune-project.org/dune-fem/ddfem/-/issues
+Project-URL: Documentation, https://ddfem.readthedocs.io/en/latest/index.html
+Project-URL: Repository, https://gitlab.dune-project.org/dune-fem/ddfem.git
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
@@ -13,6 +15,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fenics-ufl==2022.2.0
 Requires-Dist: numpy
+Requires-Dist: setuptools<81
+Provides-Extra: dune
+Requires-Dist: dune-fem; extra == "dune"
+Requires-Dist: pygmsh; extra == "dune"
 Dynamic: license-file
 
 # Diffuse Domain Finite Element Methods

ddfem-1.0.4/ddfem.egg-info/requires.txt

@@ -0,0 +1,7 @@
+fenics-ufl==2022.2.0
+numpy
+setuptools<81
+
+[dune]
+dune-fem
+pygmsh

{ddfem-1.0.2 → ddfem-1.0.4}/pyproject.toml

@@ -7,8 +7,8 @@ packages = ["ddfem","ddfem.geometry","ddfem.transformers","ddfem.examples"]
 
 [project]
 name = "ddfem"
-version = "1.0.2"
-dependencies = [ "fenics-ufl == 2022.2.0", "numpy" ]
+version = "1.0.4"
+dependencies = [ "fenics-ufl == 2022.2.0", "numpy", "setuptools < 81" ]
 authors = [
   { name="Luke Benfield", email="luke.benfield@warwick.ac.uk" },
   { name="Andreas Dedner", email="a.s.dedner@warwick.ac.uk" },
@@ -23,6 +23,12 @@ classifiers = [
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
 
+[project.optional-dependencies]
+dune = ["dune-fem", "pygmsh"]
+
 [project.urls]
-Homepage = "https://..."
-Issues = "https://..."
+Homepage = "https://gitlab.dune-project.org/dune-fem/ddfem"
+Issues = "https://gitlab.dune-project.org/dune-fem/ddfem/-/issues"
+Documentation = "https://ddfem.readthedocs.io/en/latest/index.html"
+Repository = "https://gitlab.dune-project.org/dune-fem/ddfem.git"
+

ddfem-1.0.2/ddfem.egg-info/requires.txt

@@ -1,2 +0,0 @@
-fenics-ufl==2022.2.0
-numpy