Changeset 1049 for codes/icosagcm/devel/DySL/unstructured/macros.jin

Timestamp:

09/17/20 11:58:14 (4 years ago)

Author:

dubos

Message:

devel/DySL : match whole keywords with "KEY is in CODE"

File:

• codes/icosagcm/devel/DySL/unstructured/macros.jin (modified) (5 diffs)

codes/icosagcm/devel/DySL/unstructured/macros.jin

@@ -127 +127 @@
 {% macro get_edges(thecode, mesh,degree) %}
 {% for iedge in range(1,degree+1) %} 
-{{ 'edge%d = %s_edge(%d,ij)'%(iedge,mesh,iedge) if 'EDGE' in thecode }} 
-{% endfor %}
-{% for iedge in range(1,degree+1) %} 
-{{ 'le_de%d = le_de(edge%d)'%(iedge,iedge) if 'LE_DE' in thecode }}      
-{% endfor %}
-{% for iedge in range(1,degree+1) %} 
-{{ 'sign%d = %s_ne(%d,ij)'%(iedge,mesh,iedge) if 'SIGN' in thecode }}   
-{% endfor %}
-{% for iedge in range(1,degree+1) %} 
-{{ 'ij_up%d = up(edge%d)'%(iedge,iedge) if 'VERTEX1' in thecode }}
-{% endfor %}
-{% for iedge in range(1,degree+1) %} 
-{{ 'ij_down%d = down(edge%d)'%(iedge,iedge) if 'VERTEX2' in thecode }}
+{{ 'edge%d = %s_edge(%d,ij)'%(iedge,mesh,iedge) if 'EDGE' is in thecode }} 
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'le_de%d = le_de(edge%d)'%(iedge,iedge) if 'LE_DE' is in thecode }}      
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'de%d = de(edge%d)'%(iedge,iedge) if 'DE' is in thecode }}      
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'le%d = le(edge%d)'%(iedge,iedge) if 'LE' is in thecode }}
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'sign%d = %s_ne(%d,ij)'%(iedge,mesh,iedge) if 'SIGN' is in(thecode) }}   
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'ij_up%d = up(edge%d)'%(iedge,iedge) if 'VERTEX1' is in thecode }}
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'ij_down%d = down(edge%d)'%(iedge,iedge) if 'VERTEX2' is in thecode }}
 {% endfor %}
 {% endmacro %}
@@ -303 +309 @@
 END DO
 !$OMP END DO
-{{ cundef(thecode, ('EDGE','LE_DE','SIGN','CELL1','CELL2','VERTEX1','VERTEX2') ) }}
+{{ cundef(thecode, ('EDGE','LE_DE','LE','DE','SIGN','CELL1','CELL2','VERTEX1','VERTEX2') ) }}
 {%- endmacro %}
 
@@ -314 +320 @@
 {{ cdef(thecode, 'SIGN', 'sign%d'%iedge) }}
 {{ cdef(thecode, 'LE_DE', 'le_de%d'%iedge) }}
+{{ cdef(thecode, 'DE', 'de%d'%iedge) }}
+{{ cdef(thecode, 'LE', 'le%d'%iedge) }}
 {{ cdef(thecode, 'VERTEX1', 'l,ij_up%d'%iedge) }}
 {{ cdef(thecode, 'VERTEX2', 'l,ij_down%d'%iedge) }}
@@ -322 +330 @@
 {{ cdef(thecode, 'SIGN', mesh + '_ne(iedge,ij)') }}
 {{ cdef(thecode, 'LE_DE', 'le_de(edge)') }}
+{{ cdef(thecode, 'DE', 'de(edge)') }}
+{{ cdef(thecode, 'LE', 'le(edge)') }}
 {{ cdef(thecode, 'VERTEX1', 'l,ij_up') }}
 {{ cdef(thecode, 'VERTEX2', 'l,ij_down') }}
@@ -331 +341 @@
 END DO
 {% endif %}
-{{ cundef(thecode, ('EDGE', 'SIGN', 'LE_DE', 'VERTEX1', 'VERTEX2') ) }}
+{{ cundef(thecode, ('EDGE', 'SIGN', 'LE_DE', 'LE', 'DE', 'VERTEX1', 'VERTEX2') ) }}
 {%- endmacro %}