Introduce MeshSequence + handle restrictions on MeshSequence #264

ksagiyam · 2024-03-27T15:47:51Z

Depend on #382 (small).

In multi-domain (submesh) problems, there are situations where, say, an exterior-facet integration of domainA is an interior-facet integration of domainB. In this PR we extend the Measure class to correctly represent such integration. Specifically, in the above example, if we choose domainA as the "primal" integration domain, we define the interested measure as:

meas = Measure(
    "ds", domainA,
    extra_measures=(
        Measure("dS", domainB),
    )
)

. This required changing:

integral sorting (form.py),
IntegralData grouping (algorithms/domain_analysis.py),
signature (algorithms/signature.py),

accordingly.

We also modified RestrictionPropagator class and apply_restrictions() function. apply_restriction() function now takes default_restrictions kwarg, so that we can specify the default restrictions domain-wise. In the above case, we will have something like:

apply_restrictions(
    integral,
    default_restrictions={
        domainA: None,
        domainB: "+",
    }
)

.

ufl/exproperators.py

jorgensd · 2025-01-13T15:01:50Z

ufl/algorithms/apply_coefficient_split.py

+                restriction = t._side
+                t, = t.ufl_operands
+            elif t._ufl_terminal_modifiers_:
+                raise ValueError("Missing handler for terminal modifier type %s, object is %s." % (type(t), repr(t)))


Is there a reason for not using f-strings here?

No. I will fix it when I tidy this up. Thanks.

jorgensd · 2025-01-13T15:14:55Z

ufl/algorithms/apply_coefficient_split.py

+            # Only split mixed coefficients
+            return o
+        # Reference value expected
+        assert reference_value


Should this throw a run-time error instead of an assertion, as something has clearly gone wrong if you have gotten here without t being a Coefficient and ReferenceValue.

Yes, fixed.

mscroggs · 2025-02-21T11:18:58Z

Should this PR be closed in favour of #303? Or this a different feature?

ufl/algorithms/apply_restrictions.py

ufl/algorithms/domain_analysis.py

ufl/integral.py

ufl/measure.py

dham

I'm basically happy with this.

dham · 2025-06-25T15:32:18Z

ufl/measure.py

@@ -122,6 +130,8 @@ def __init__(
                affecting how code is generated, including parameters
                for optimization or debugging of generated code
            subdomain_data: object representing data to interpret subdomain_id with
+            extra_measures: additional domain-integral_type map
+                for multi-domain problems


Needs serious documentation.

dham · 2025-06-25T15:38:51Z

ufl/algorithms/signature.py

@@ -143,6 +143,9 @@ def compute_form_signature(form, renumbering):  # FIXME: Fix callers
        integrand_hashdata = compute_expression_hashdata(integral.integrand(), terminal_hashdata)

        domain_hashdata = integral.ufl_domain()._ufl_signature_data_(renumbering)
+        extra_measures_hash_data = tuple(


Suggested change

extra_measures_hash_data = tuple(

extra_measures_hashdata = tuple(

dham · 2025-06-25T15:39:04Z

ufl/algorithms/signature.py

@@ -153,6 +156,7 @@ def compute_form_signature(form, renumbering):  # FIXME: Fix callers
            integrand_hashdata,
            domain_hashdata,
            integral.integral_type(),
+            extra_measures_hash_data,


Suggested change

extra_measures_hash_data,

extra_measures_hashdata,

ksagiyam · 2025-06-26T02:49:19Z

@jorgensd I will touch up slightly more today, but could you have a look at this PR?

ksagiyam · 2025-06-27T22:56:05Z

Updated the description.

… ...) on construction

This was referenced Mar 27, 2024

Ksagiyam/submesh core firedrakeproject/firedrake#3478

Draft

introduce MixedMesh firedrakeproject/tsfc#309

Draft

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from e07f9fa to d574909 Compare July 20, 2024 14:30

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch 8 times, most recently from e66d41d to d3e72fb Compare August 20, 2024 22:31

ksagiyam mentioned this pull request Aug 21, 2024

introduce MeshSequence class #303

Merged

ksagiyam commented Aug 21, 2024

View reviewed changes

ufl/exproperators.py Outdated Show resolved Hide resolved

ksagiyam changed the title ~~Introduce MixedMesh~~ Introduce MixedMesh + handle restrictions on MixedMesh Aug 21, 2024

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch 2 times, most recently from 23696eb to ae55b3b Compare November 20, 2024 13:38

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from ae55b3b to 4ced3a7 Compare December 10, 2024 15:53

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch 5 times, most recently from 7e4dd44 to ef8fd99 Compare January 10, 2025 21:23

jorgensd reviewed Jan 13, 2025

View reviewed changes

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch 2 times, most recently from 988189f to 36559fc Compare January 17, 2025 21:33

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from 36559fc to 9317b5b Compare February 6, 2025 23:48

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from 9317b5b to 883ee0b Compare February 20, 2025 13:38

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from 883ee0b to 2d76a5e Compare March 7, 2025 12:55

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch 6 times, most recently from 3f5f1ea to b2f2fec Compare June 17, 2025 16:33

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch 10 times, most recently from f55fd36 to 5882239 Compare June 25, 2025 01:15

ksagiyam commented Jun 25, 2025

View reviewed changes

ufl/algorithms/apply_restrictions.py Outdated Show resolved Hide resolved

ufl/algorithms/domain_analysis.py Show resolved Hide resolved

ufl/integral.py Outdated Show resolved Hide resolved

ufl/measure.py Show resolved Hide resolved

dham changed the title ~~Introduce MixedMesh + handle restrictions on MixedMesh~~ Introduce MeshSequence + handle restrictions on MeshSequence Jun 25, 2025

dham requested changes Jun 25, 2025

View reviewed changes

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch 3 times, most recently from fb5f4a4 to abc62d6 Compare June 27, 2025 17:20

ksagiyam marked this pull request as ready for review June 27, 2025 22:56

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from 5350b9f to 1b26a8f Compare July 7, 2025 01:18

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from 1b26a8f to 5650c45 Compare July 17, 2025 16:03

ksagiyam added 2 commits July 17, 2025 17:56

simplify Indexed(ComponentTensor(Indexed(ListTensor(...), ...), ...),…

0f165a6

… ...) on construction

handle restrictions on MeshSequence

6ec0d57

ksagiyam force-pushed the ksagiyam/introduce_mixed_map branch from 5650c45 to 6ec0d57 Compare July 18, 2025 08:05

	extra_measures_hash_data = tuple(
	extra_measures_hashdata = tuple(

Uh oh!

Introduce MeshSequence + handle restrictions on MeshSequence #264

Are you sure you want to change the base?

Introduce MeshSequence + handle restrictions on MeshSequence #264

Uh oh!

Conversation

ksagiyam commented Mar 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mscroggs commented Feb 21, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dham left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ksagiyam commented Jun 26, 2025

Uh oh!

ksagiyam commented Jun 27, 2025

Uh oh!

Uh oh!

ksagiyam commented Mar 27, 2024 •

edited

Loading