Python FEniCS/ffcx@372d4a7

Author: FEniCS GitHub Actions

ffcx/main/_autogenerated/ffcx.ir.representation.html

@@ -483,7 +483,7 @@
 
 <dl class="py class">
 <dt class="sig sig-object py" id="ffcx.ir.representation.Integral">
-<span class="property"><span class="k"><span class="pre">class</span></span><span class="w"> </span></span><span class="sig-prename descclassname"><span class="pre">ffcx.ir.representation.</span></span><span class="sig-name descname"><span class="pre">Integral</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">integrand</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">Expr</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">integral_type</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">str</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">domain</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">subdomain_id</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">int</span><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">tuple</span><span class="p"><span class="pre">[</span></span><span class="pre">int</span><span class="p"><span class="pre">,</span></span><span class="w"> </span><span class="p"><span class="pre">...</span></span><span class="p"><span class="pre">]</span></span></span></em>, <em class="sig-param"><span class="n"><span class="pre">metadata</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">dict</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">subdomain_data</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">Any</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">extra_domain_integral_type_map</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">dict</span><span class="p"><span class="pre">[</span></span><span class="pre">Mesh</span><span class="p"><span class="pre">,</span></span><span class="w"> </span><span class="pre">str</span><span class="p"><span class="pre">]</span></span><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">None</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/ufl/integral.html#Integral"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#ffcx.ir.representation.Integral" title="Link to this definition"></a></dt>
+<span class="property"><span class="k"><span class="pre">class</span></span><span class="w"> </span></span><span class="sig-prename descclassname"><span class="pre">ffcx.ir.representation.</span></span><span class="sig-name descname"><span class="pre">Integral</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">integrand</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">Expr</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">integral_type</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">str</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">domain</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">subdomain_id</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">Integral</span><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">tuple</span><span class="p"><span class="pre">[</span></span><span class="pre">Integral</span><span class="p"><span class="pre">,</span></span><span class="w"> </span><span class="p"><span class="pre">...</span></span><span class="p"><span class="pre">]</span></span><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">Literal</span><span class="p"><span class="pre">[</span></span><span class="s"><span class="pre">'everywhere'</span></span><span class="p"><span class="pre">]</span></span></span></em>, <em class="sig-param"><span class="n"><span class="pre">metadata</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">dict</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">subdomain_data</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">Any</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">extra_domain_integral_type_map</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">dict</span><span class="p"><span class="pre">[</span></span><span class="pre">Mesh</span><span class="p"><span class="pre">,</span></span><span class="w"> </span><span class="pre">str</span><span class="p"><span class="pre">]</span></span><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">None</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/ufl/integral.html#Integral"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#ffcx.ir.representation.Integral" title="Link to this definition"></a></dt>
 <dd><p>Bases: <code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></p>
 <p>An integral over a single domain.</p>
 <p>Initialise.</p>

ffcx/main/_modules/ffcx/analysis.html

@@ -179,8 +179,8 @@ <h1>Source code for ffcx.analysis</h1><div class="highlight"><pre>
 
     <span class="n">form_data</span> <span class="o">=</span> <span class="nb">tuple</span><span class="p">(</span><span class="n">_analyze_form</span><span class="p">(</span><span class="n">form</span><span class="p">,</span> <span class="n">scalar_type</span><span class="p">)</span> <span class="k">for</span> <span class="n">form</span> <span class="ow">in</span> <span class="n">forms</span><span class="p">)</span>
     <span class="k">for</span> <span class="n">data</span> <span class="ow">in</span> <span class="n">form_data</span><span class="p">:</span>
-        <span class="n">elements</span> <span class="o">+=</span> <span class="n">data</span><span class="o">.</span><span class="n">unique_sub_elements</span>  <span class="c1"># type: ignore</span>
-        <span class="n">coordinate_elements</span> <span class="o">+=</span> <span class="n">data</span><span class="o">.</span><span class="n">coordinate_elements</span>  <span class="c1"># type: ignore</span>
+        <span class="n">elements</span> <span class="o">+=</span> <span class="n">data</span><span class="o">.</span><span class="n">unique_sub_elements</span>
+        <span class="n">coordinate_elements</span> <span class="o">+=</span> <span class="n">data</span><span class="o">.</span><span class="n">coordinate_elements</span>
 
     <span class="k">for</span> <span class="n">original_expression</span><span class="p">,</span> <span class="n">points</span> <span class="ow">in</span> <span class="n">expressions</span><span class="p">:</span>
         <span class="n">elements</span> <span class="o">+=</span> <span class="n">ufl</span><span class="o">.</span><span class="n">algorithms</span><span class="o">.</span><span class="n">extract_elements</span><span class="p">(</span><span class="n">original_expression</span><span class="p">)</span>
@@ -257,8 +257,8 @@ <h1>Source code for ffcx.analysis</h1><div class="highlight"><pre>
         <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Form (</span><span class="si">{</span><span class="n">form</span><span class="si">}</span><span class="s2">) contains unsupported custom integrals.&quot;</span><span class="p">)</span>
 
     <span class="c1"># Check that coordinate element is based on basix.ufl._ElementBase</span>
-    <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="n">form</span><span class="o">.</span><span class="n">_integrals</span><span class="p">:</span>
-        <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">i</span><span class="o">.</span><span class="n">_ufl_domain</span><span class="o">.</span><span class="n">_ufl_coordinate_element</span><span class="p">,</span> <span class="n">basix</span><span class="o">.</span><span class="n">ufl</span><span class="o">.</span><span class="n">_ElementBase</span><span class="p">)</span>
+    <span class="k">for</span> <span class="n">_integral</span> <span class="ow">in</span> <span class="n">form</span><span class="o">.</span><span class="n">_integrals</span><span class="p">:</span>
+        <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">_integral</span><span class="o">.</span><span class="n">_ufl_domain</span><span class="o">.</span><span class="n">_ufl_coordinate_element</span><span class="p">,</span> <span class="n">basix</span><span class="o">.</span><span class="n">ufl</span><span class="o">.</span><span class="n">_ElementBase</span><span class="p">)</span>
 
     <span class="c1"># Check for complex mode</span>
     <span class="n">complex_mode</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">issubdtype</span><span class="p">(</span><span class="n">scalar_type</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">complexfloating</span><span class="p">)</span>
@@ -277,7 +277,7 @@ <h1>Source code for ffcx.analysis</h1><div class="highlight"><pre>
 
     <span class="c1"># Determine unique quadrature degree and quadrature scheme</span>
     <span class="c1"># per each integral data</span>
-    <span class="k">for</span> <span class="nb">id</span><span class="p">,</span> <span class="n">integral_data</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">form_data</span><span class="o">.</span><span class="n">integral_data</span><span class="p">):</span>  <span class="c1"># type: ignore</span>
+    <span class="k">for</span> <span class="nb">id</span><span class="p">,</span> <span class="n">integral_data</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">form_data</span><span class="o">.</span><span class="n">integral_data</span><span class="p">):</span>
         <span class="c1"># Iterate through groups of integral data. There is one integral</span>
         <span class="c1"># data for all integrals with same domain, itype, subdomain_id</span>
         <span class="c1"># (but possibly different metadata).</span>

ffcx/main/_modules/ffcx/ir/representation.html

@@ -238,13 +238,13 @@ <h1>Source code for ffcx.ir.representation</h1><div class="highlight"><pre>
     <span class="n">integral_names</span> <span class="o">=</span> <span class="p">{}</span>
     <span class="n">form_names</span> <span class="o">=</span> <span class="p">{}</span>
     <span class="k">for</span> <span class="n">fd_index</span><span class="p">,</span> <span class="n">fd</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">analysis</span><span class="o">.</span><span class="n">form_data</span><span class="p">):</span>
-        <span class="n">form_names</span><span class="p">[</span><span class="n">fd_index</span><span class="p">]</span> <span class="o">=</span> <span class="n">naming</span><span class="o">.</span><span class="n">form_name</span><span class="p">(</span><span class="n">fd</span><span class="o">.</span><span class="n">original_form</span><span class="p">,</span> <span class="n">fd_index</span><span class="p">,</span> <span class="n">prefix</span><span class="p">)</span>  <span class="c1"># type: ignore</span>
-        <span class="k">for</span> <span class="n">itg_index</span><span class="p">,</span> <span class="n">itg_data</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">fd</span><span class="o">.</span><span class="n">integral_data</span><span class="p">):</span>  <span class="c1"># type: ignore</span>
+        <span class="n">form_names</span><span class="p">[</span><span class="n">fd_index</span><span class="p">]</span> <span class="o">=</span> <span class="n">naming</span><span class="o">.</span><span class="n">form_name</span><span class="p">(</span><span class="n">fd</span><span class="o">.</span><span class="n">original_form</span><span class="p">,</span> <span class="n">fd_index</span><span class="p">,</span> <span class="n">prefix</span><span class="p">)</span>
+        <span class="k">for</span> <span class="n">itg_index</span><span class="p">,</span> <span class="n">itg_data</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">fd</span><span class="o">.</span><span class="n">integral_data</span><span class="p">):</span>
             <span class="n">integral_names</span><span class="p">[(</span><span class="n">fd_index</span><span class="p">,</span> <span class="n">itg_index</span><span class="p">)]</span> <span class="o">=</span> <span class="n">naming</span><span class="o">.</span><span class="n">integral_name</span><span class="p">(</span>
-                <span class="n">fd</span><span class="o">.</span><span class="n">original_form</span><span class="p">,</span>  <span class="c1"># type: ignore</span>
+                <span class="n">fd</span><span class="o">.</span><span class="n">original_form</span><span class="p">,</span>
                 <span class="n">itg_data</span><span class="o">.</span><span class="n">integral_type</span><span class="p">,</span>
                 <span class="n">fd_index</span><span class="p">,</span>
-                <span class="n">itg_data</span><span class="o">.</span><span class="n">subdomain_id</span><span class="p">,</span>
+                <span class="n">itg_data</span><span class="o">.</span><span class="n">subdomain_id</span><span class="p">,</span>  <span class="c1"># type: ignore</span>
                 <span class="n">prefix</span><span class="p">,</span>
             <span class="p">)</span>
 

ffcx/main/_modules/ufl/integral.html

@@ -92,7 +92,8 @@ <h1>Source code for ufl.integral</h1><div class="highlight"><pre>
 
 <span class="kn">from</span><span class="w"> </span><span class="nn">__future__</span><span class="w"> </span><span class="kn">import</span> <span class="n">annotations</span>
 
-<span class="kn">from</span><span class="w"> </span><span class="nn">typing</span><span class="w"> </span><span class="kn">import</span> <span class="n">Any</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">numbers</span>
+<span class="kn">from</span><span class="w"> </span><span class="nn">typing</span><span class="w"> </span><span class="kn">import</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Literal</span>
 
 <span class="kn">import</span><span class="w"> </span><span class="nn">ufl</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">ufl.checks</span><span class="w"> </span><span class="kn">import</span> <span class="n">is_python_scalar</span><span class="p">,</span> <span class="n">is_scalar_constant_expression</span>
@@ -124,7 +125,7 @@ <h1>Source code for ufl.integral</h1><div class="highlight"><pre>
         <span class="n">integrand</span><span class="p">:</span> <span class="n">Expr</span><span class="p">,</span>
         <span class="n">integral_type</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span>
         <span class="n">domain</span><span class="p">,</span>
-        <span class="n">subdomain_id</span><span class="p">:</span> <span class="nb">int</span> <span class="o">|</span> <span class="nb">tuple</span><span class="p">[</span><span class="nb">int</span><span class="p">,</span> <span class="o">...</span><span class="p">],</span>
+        <span class="n">subdomain_id</span><span class="p">:</span> <span class="n">numbers</span><span class="o">.</span><span class="n">Integral</span> <span class="o">|</span> <span class="nb">tuple</span><span class="p">[</span><span class="n">numbers</span><span class="o">.</span><span class="n">Integral</span><span class="p">,</span> <span class="o">...</span><span class="p">]</span> <span class="o">|</span> <span class="n">Literal</span><span class="p">[</span><span class="s2">&quot;everywhere&quot;</span><span class="p">],</span>
         <span class="n">metadata</span><span class="p">:</span> <span class="nb">dict</span><span class="p">,</span>
         <span class="n">subdomain_data</span><span class="p">:</span> <span class="n">Any</span><span class="p">,</span>
         <span class="n">extra_domain_integral_type_map</span><span class="p">:</span> <span class="nb">dict</span><span class="p">[</span><span class="n">Mesh</span><span class="p">,</span> <span class="nb">str</span><span class="p">]</span> <span class="o">|</span> <span class="kc">None</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>