ddfem 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

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/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/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/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/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/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.dist-info → ddfem-1.0.3.dist-info}/METADATA

@@ -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.dist-info → ddfem-1.0.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
-ddfem/__init__.py,sha256=N860erjFVjXifNwEQ_ejRF99ub195M6eC9GIOqeIhyU,106
-ddfem/boundary.py,sha256=qpvvjRBBUZHZULIRovuz1h8U30KQRtYERIJxN5O251c,7570
-ddfem/dune.py,sha256=oU4bKiG4AndEhMVhAi1Nnmo9cEhjceTW3X2ptv6ombU,67
-ddfem/model2ufl.py,sha256=lEEmMmZWbcxprHD9pRWwZfIdiLg3ScQkR7V_N48qqAw,4265
+ddfem/__init__.py,sha256=vQb-XOm3isbvckRLe_Zi7vcSwu1iWAZYAokP37kNk_M,137
+ddfem/boundary.py,sha256=N3HGprdboCb3OIEYr_z-b7bvNnuyQjG47h-jPzU3XDg,7534
+ddfem/model2ufl.py,sha256=DedK1xWQ7L8l71i259jtxgoTSkIoDKV4BV52PMasZQU,4323
+ddfem/plot.py,sha256=eL9e8uhJrDHN44bJ5nzeXpKkTx-bL5MMzGU1Tm07Hoo,605
 ddfem/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ddfem/examples/advection_diffusion.py,sha256=9UPILICF3Sfh3SA7zJk6iDabXmvIa4GowJd62qaWOd8,2081
 ddfem/examples/beam.py,sha256=awZvrgw92ANJgD1MGhhEVZ0eBsSNmhuwegpS8AHiiPk,4687
@@ -20,8 +20,8 @@ ddfem/geometry/__init__.py,sha256=ePmkipwfdhM88qrStE__n0VFKqvl8AKK4VjsAsivt4Y,29
 ddfem/geometry/arc.py,sha256=ouK8gxkd2f8RtpAK33p6-zU5RoyMejxEge2IEcCOtR4,1381
 ddfem/geometry/ball.py,sha256=Q_ped9ay3KypU8sKutAXPH9XkEFJx5hIK7qTCy1Y26E,679
 ddfem/geometry/box.py,sha256=ecXUMI2a17-hZZyUXol08z7wk3IZn1yHE_CV9YIyR18,915
-ddfem/geometry/domain.py,sha256=n4Cu1sFy19ONUuQec2EICtoSBYzS-H_sLB2YxU5dads,1363
-ddfem/geometry/domain_dune.py,sha256=2ArzeRU42o4-TS21DXajPSCXj_3SlgGdehgN7QJhQzc,2600
+ddfem/geometry/domain.py,sha256=9yZpJhWqDrQ6MuWXg6HjJRFntcNbwtgdIbKIulQD_kM,1419
+ddfem/geometry/domain_dune.py,sha256=VbowbqLwUq04S27nIbz8SisHnEc15s08VCCivB27Wz8,2801
 ddfem/geometry/helpers.py,sha256=kunsuciuJJwkcZgDn8A7wbKYSqIAYjdvhei_YfjvVtk,1049
 ddfem/geometry/pie.py,sha256=WjgYPI6YvkcxPTQB1SjdN22dFQHV0X8kSO6QcXDLBSU,1003
 ddfem/geometry/plane.py,sha256=hCRLa06yXfXzfms2JIbAusdPf5qFUy9DrjNDfZ-0TGA,500
@@ -34,8 +34,8 @@ ddfem/transformers/NNS.py,sha256=lGQVCd1x6KrzVyOEAIttaDXBFjP9nLBIj9wnp_fvYtg,341
 ddfem/transformers/NS.py,sha256=fsih358oeayvmovhTAuddjbx7O0K_faF5qTAMQdHH8s,3612
 ddfem/transformers/__init__.py,sha256=okno6aFZoIPaJRi_Nw7cM63jpy18rS2yHsSuG7Vb4Og,195
 ddfem/transformers/transformer_base.py,sha256=Ey6iGk203lnzJOhLjMxyQNgKbclba_RIPpMW22OT7zQ,6347
-ddfem-1.0.1.dist-info/licenses/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ddfem-1.0.1.dist-info/METADATA,sha256=_jSNqnAB71Fb33U16dUgV6jGoSyb1kLlpYGGbZaJv88,663
-ddfem-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ddfem-1.0.1.dist-info/top_level.txt,sha256=LF2T9-5A2Bak81PqbCcsAex8d5Xrla2Wq8yrlQi-ZtY,6
-ddfem-1.0.1.dist-info/RECORD,,
+ddfem-1.0.3.dist-info/licenses/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ddfem-1.0.3.dist-info/METADATA,sha256=4eHMTzgnd6ot1UdcifO40Bs1-DLjo20WjWTUDo-uYnc,1037
+ddfem-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ddfem-1.0.3.dist-info/top_level.txt,sha256=LF2T9-5A2Bak81PqbCcsAex8d5Xrla2Wq8yrlQi-ZtY,6
+ddfem-1.0.3.dist-info/RECORD,,

ddfem/dune.py

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