Changeset 653

Timestamp:

12/28/17 14:57:54 (6 years ago)

Author:

dubos

Message:

devel/unstructured : streamline loop unrolling

File:

• codes/icosagcm/devel/Python/src/unstructured/macros.jin (modified) (4 diffs)

codes/icosagcm/devel/Python/src/unstructured/macros.jin

@@ -53 +53 @@
 -------------------------------------------------------------------------- #}
 
+{# NB : degree = number of elements in stencil, for instance number of edges of primal cell #}
+{# define the degrees for which a special version of code is generated #}
+{% set degree_primal, degree_dual, degree_trisk = (4,5,6), (3,4), (4,10) %}
 
 {# ----------------------- SEQUENCE, FORALL ----------------------- #}
@@ -139 +142 @@
 {% if has_primal %}
 SELECT CASE(primal_deg(ij))
-CASE(4)
-{{ get_edges(thecode, mesh, 4) }}
-{{ vloop(mesh, lrange, flags, code, 4) }}
-CASE(5)
-{{ get_edges(thecode, mesh, 5) }}
-{{ vloop(mesh, lrange, flags, code, 5) }}
-CASE(6)
-{{ get_edges(thecode, mesh, 6) }}
-{{ vloop(mesh, lrange, flags, code, 6) }}
+{% for degree in degree_primal %}
+CASE({{ degree }})
+{{ get_edges(thecode, mesh, degree) }}
+{{ vloop(mesh, lrange, flags, code, degree) }}
+{% endfor %}
 CASE DEFAULT
 {{ vloop(mesh, lrange, flags, code) }}
@@ -155 +154 @@
 {% if has_dual %}
 SELECT CASE(dual_deg(ij))
-CASE(3)
-{{ get_edges(thecode, mesh, 3) }}
-{{ get_vertices(thecode,mesh,3) }}
-{{ vloop(mesh, lrange, flags, code, 3) }}
-CASE(4)
-{{ get_edges(thecode, mesh, 4) }}
-{{ get_vertices(thecode,mesh,4) }}
-{{ vloop(mesh, lrange, flags, code, 4) }}
+{% for degree in degree_dual %}
+CASE({{ degree }})
+{{ get_edges(thecode, mesh, degree) }}
+{{ get_vertices(thecode,mesh,degree) }}
+{{ vloop(mesh, lrange, flags, code, degree) }}
+{% endfor %}
 CASE DEFAULT
 {{ vloop(mesh, lrange, flags, code) }}
@@ -170 +167 @@
 {% if has_trisk %}
 SELECT CASE(trisk_deg(edge))
-CASE(10)
-{{ vloop(mesh, lrange, flags, code, 10) }}
-CASE(4)
-{{ vloop(mesh, lrange, flags, code, 4) }}
+{% for degree in degree_trisk %}
+CASE({{ degree }})
+{{ vloop(mesh, lrange, flags, code, degree) }}
+{% endfor %}
 CASE DEFAULT
 {{ vloop(mesh, lrange, flags, code) }}