ddfem 1.0.1__tar.gz → 1.0.3__tar.gz

{ddfem-1.0.1 → ddfem-1.0.3}/PKG-INFO

@@ -1,21 +1,28 @@
 Metadata-Version: 2.4
 Name: ddfem
-Version: 1.0.1
+Version: 1.0.3
 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fenics-ufl>=2022
+Requires-Dist: fenics-ufl==2022.2.0
 Requires-Dist: numpy
+Provides-Extra: dune
+Requires-Dist: dune-fem; extra == "dune"
 Dynamic: license-file
 
 # Diffuse Domain Finite Element Methods
 
 This is a package for solving complex PDEs based on the diffuse domain idea.
 
+[Documentation][0]
+
+[0]: https://ddfem.readthedocs.io/en/latest/index.html

{ddfem-1.0.1 → ddfem-1.0.3}/README.md

@@ -2,3 +2,6 @@
 
 This is a package for solving complex PDEs based on the diffuse domain idea.
 
+[Documentation][0]
+
+[0]: https://ddfem.readthedocs.io/en/latest/index.html

{ddfem-1.0.1 → ddfem-1.0.3}/ddfem/__init__.py

@@ -2,3 +2,4 @@ from . import geometry
 from . import transformers
 from . import boundary
 from .model2ufl import model2ufl
+from .plot import plotSolution

{ddfem-1.0.1 → ddfem-1.0.3}/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.1 → ddfem-1.0.3}/ddfem/geometry/domain.py

@@ -7,6 +7,9 @@ class Domain:
     def __init__(self, omega):
         self.omega = omega
 
+    def __call__(self,x):
+        return self.omega(x)
+
     def phi(self, x):
         tol = 1e-10
         return (1 - tol) * self.omega.phi(x) + tol

{ddfem-1.0.1 → ddfem-1.0.3}/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.1 → ddfem-1.0.3}/ddfem/model2ufl.py

@@ -103,6 +103,7 @@ def model_ufl(Model, space, initialTime=0, DirichletBC=DirichletBC):
         f_c_model = f_c_model * dx
     if f_v_model:
         f_v_model = f_v_model * dx
+    # !!! fix issue with f_?_model==zero not being a form
     return (
         f_c_model,
         f_v_model,

ddfem-1.0.3/ddfem/plot.py

@@ -0,0 +1,13 @@
+from matplotlib import pyplot as plt
+from dune.fem.function import gridFunction
+from ufl import SpatialCoordinate, triangle
+
+def plotSolution(domain,uh,figsize, **kwargs):
+    x = SpatialCoordinate(triangle)
+    fig, axs = plt.subplots(1,2, figsize=[2*figsize[0],figsize[1]])
+    uh.plot(figure=(fig,axs[0]),**kwargs)
+    gridFunction(uh*domain.chi(x)).plot(figure=(fig,axs[1]),**kwargs)
+    for a in axs:
+        gridFunction(domain.phi(x), gridView=uh.space.gridView).plot(
+             onlyContours=True,contours=[0.5],gridLines=None,
+             contourWidth=2, contourColor="black", figure=(fig,a))

{ddfem-1.0.1 → ddfem-1.0.3}/ddfem.egg-info/PKG-INFO

@@ -1,21 +1,28 @@
 Metadata-Version: 2.4
 Name: ddfem
-Version: 1.0.1
+Version: 1.0.3
 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fenics-ufl>=2022
+Requires-Dist: fenics-ufl==2022.2.0
 Requires-Dist: numpy
+Provides-Extra: dune
+Requires-Dist: dune-fem; extra == "dune"
 Dynamic: license-file
 
 # Diffuse Domain Finite Element Methods
 
 This is a package for solving complex PDEs based on the diffuse domain idea.
 
+[Documentation][0]
+
+[0]: https://ddfem.readthedocs.io/en/latest/index.html

{ddfem-1.0.1 → ddfem-1.0.3}/ddfem.egg-info/SOURCES.txt

@@ -3,8 +3,8 @@ README.md
 pyproject.toml
 ddfem/__init__.py
 ddfem/boundary.py
-ddfem/dune.py
 ddfem/model2ufl.py
+ddfem/plot.py
 ddfem.egg-info/PKG-INFO
 ddfem.egg-info/SOURCES.txt
 ddfem.egg-info/dependency_links.txt

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

@@ -0,0 +1,5 @@
+fenics-ufl==2022.2.0
+numpy
+
+[dune]
+dune-fem

{ddfem-1.0.1 → ddfem-1.0.3}/pyproject.toml

@@ -7,8 +7,8 @@ packages = ["ddfem","ddfem.geometry","ddfem.transformers","ddfem.examples"]
 
 [project]
 name = "ddfem"
-version = "1.0.1"
-dependencies = [ "fenics-ufl >= 2022", "numpy" ]
+version = "1.0.3"
+dependencies = [ "fenics-ufl == 2022.2.0", "numpy" ]
 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"]
+
 [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.1/ddfem/dune.py

@@ -1,3 +0,0 @@
-import geometry
-from geometry import dunedomain
-geometry.domain = 

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

@@ -1,2 +0,0 @@
-fenics-ufl>=2022
-numpy