Changeset 723 for codes

Timestamp:

08/09/18 13:32:43 (6 years ago)

Author:

dubos

Message:

devel : created serial kernels to debug OpenMP (bugfix)

File:

• codes/icosagcm/devel/Python/src/hexagonal/macros.jin (modified) (11 diffs)

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

@@ -29 +29 @@
 #ifdef PASS_PRE2
 
+#ifdef HEX_MASTER
+#define BARRIER
+#else
 #define BARRIER !$OMP BARRIER
+#endif
 
 #define KERNEL(name) {% call define_kernel(#name) %}
@@ -86 +90 @@
 {% macro at_level_primal(lev,ext) -%}
 {{ define('LL', lev) }}
+!DIR$ SIMD
 DO ij={{ ij_omp(ext) }}
-{{ caller() }}
+  {{ caller() }}
 END DO
 {%- endmacro %}
@@ -94 +99 @@
 {{ define('LL', 'l') }}
 DO l = {{ range }}
+  !DIR$ SIMD
   DO ij={{ ij_omp(ext) }}
     {{ caller() }}
@@ -106 +112 @@
 {% macro at_level_edge(lev,ext) -%}
 {{ define('LL', lev) }}
+!DIR$ SIMD
 DO ij={{ ij_omp(ext) }}
       {{ caller('u_right','t_right') }}
@@ -116 +123 @@
 {{ define('LL', 'l') }}
 DO l = {{ range }}
+   !DIR$ SIMD
    DO ij={{ ij_omp(ext) }}
       {{ caller('u_right','t_right') }}
@@ -147 +155 @@
 we shall write special code for l=1 and start the loop at l=2 #}
 
-IF (ll_begin==1) THEN
+IF ({{ll_begin}}==1) THEN
   {{ define('IS_BOTTOM_LEVEL', '_TRUE_') }}
   {{ define_levels('1', 'ij,1', 'ij,1', thecode) }}
-   !DIR$ SIMD
+    !DIR$ SIMD
     DO ij={{ij_range}}
       {{ thecode }}
     END DO
 END IF
-{% set start_omp='ll_beginp1' %}
+{% set start_omp=ll_beginp1 %}
 {% endif %}
 
@@ -161 +169 @@
 {{ 'ERROR : using _IS_TOP_LAYER_ in a loop ending at l=llm+1' if end=='llm+1' }}
 {# the code checks whether l==llm, write special code for l=llm and end the loop at l=llm-1 #}
-{% set end_omp, is_top_layer = 'll_endm1', True %}
+{% set end_omp, is_top_layer = ll_endm1, True %}
 {% endif %}
 
@@ -167 +175 @@
 {# the code checks whether l==llm+1, write special code for l=llm+1 and end the loop at l=llm #}
 {{ 'ERROR : using _IS_TOP_INTERFACE_ in a loop ending at l=llm' if end=='llm' }}
-{% set end_omp, is_top_inter ='ll_end', True %}
+{% set end_omp, is_top_inter = ll_end, True %}
 {% endif %}
 
@@ -173 +181 @@
 {{ define_levels('l', 'ij,l-1', 'ij,l', thecode) }}
 DO l = {{start_omp}}, {{end_omp}}
-!DIR$ SIMD
+  !DIR$ SIMD
   DO ij={{ij_range}}
   {{ thecode }}
@@ -180 +188 @@
 
 {% if is_top_layer %}
-IF(ll_end==llm) THEN
+IF({{ll_end}}==llm) THEN
   {{ define('IS_TOP_LAYER', '_TRUE_') }}
   {{ define_levels('llm', 'ij,llm-1', 'ij,llm', thecode) }}
@@ -191 +199 @@
 
 {% if is_top_inter %}
-IF(ll_endp1==llm+1) THEN
+IF({{ll_endp1}}==llm+1) THEN
   {{ define('IS_TOP_INTERFACE', '_TRUE_') }}
   {{ define_levels('llm+1', 'ij,llm', 'ij,llm', thecode) }}