Changeset 6289 for branches

Timestamp:

2019-11-04T10:22:17+01:00 (5 years ago)

Author:

josefine.ghattas

Message:

Moved protection if is_omp_root inside subroutine grid_allocate_glo. This is now done only on the allocation part in the subroutine, the first part must be done by all threads. This is needed to run in debug mode at Jean-Zay (intel 2019).

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/intersurf.f90 (modified) (3 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/intersurf.f90

@@ -746 +746 @@
     IF (printlev >= 1) WRITE(numout,*) 'Start ORCHIDEE intitalization phase'
     
-    IF (is_omp_root) THEN
-       IF (PRESENT(grid)) THEN
-          IF (grid==unstructured) THEN
-             CALL grid_allocate_glo(6)
-          ELSE
-             CALL grid_allocate_glo(4)
-          END IF
+    IF (PRESENT(grid)) THEN
+       IF (grid==unstructured) THEN
+          CALL grid_allocate_glo(6)
        ELSE
           CALL grid_allocate_glo(4)
        END IF
-    ENDIF
+    ELSE
+       CALL grid_allocate_glo(4)
+    END IF
    
     CALL barrier2_omp()
@@ -765 +763 @@
     CALL bcast(index_g)  
 
-    IF (printlev_loc >= 2) THEN
+    IF (printlev >= 2) THEN
        WRITE(numout,*) "kjpindex = ",kjpindex
        WRITE(numout,*) "offset for OMP = ",offset_omp
@@ -776 +774 @@
           WRITE(numout,*) "ROOT global, Index global : ",index_g(:)
        ENDIF
+       WRITE(numout,*) "NbNeighb = ", NbNeighb
     END IF
-