Changeset 202 for codes/icosagcm/trunk

Timestamp:

07/09/14 00:25:57 (10 years ago)

Author:

dubos

Message:

OpenMP fixes (not tested)

Location:

codes/icosagcm/trunk/src

Files:

• caldyn_gcm.f90 (modified) (1 diff)
• icosa_gcm.f90 (modified) (4 diffs)
• timeloop_gcm.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -55 +55 @@
 
     DO ind=1,ndomain
+       IF (.NOT. assigned_domain(ind)) CYCLE
        CALL swap_dimensions(ind)
        CALL swap_geometry(ind)

codes/icosagcm/trunk/src/icosa_gcm.f90

@@ -12 +12 @@
   USE xios_mod
   USE write_field
-  USE getin_mod
+!  USE getin_mod
   IMPLICIT NONE
   
-  TYPE(t_field),POINTER,SAVE :: sum_ne(:)
-  TYPE(t_field),POINTER,SAVE :: sum_ne_glo(:)
-  REAL(rstd),POINTER :: pt_sum_ne(:)
-  
-  INTEGER :: ind,i,j,k,n
-  REAL(rstd) :: tot_sum=0
-  REAL(rstd) :: vect(3,6)
-  REAL(rstd) :: centr(3),dist
- 
   CALL init_mpipara
   CALL trace_off
@@ -38 +29 @@
 !$OMP PARALLEL  
   CALL compute_geometry
+  CALL check_total_area
   
   CALL init_disvert 
   CALL init_vertical_interp
 
-  CALL allocate_field(sum_ne,field_T,type_real)
-  
-!$OMP BARRIER
-!$OMP MASTER
-  DO ind=1,ndomain
-     
-    pt_sum_ne=sum_ne(ind)
-     
-    CALL swap_dimensions(ind)
-    CALL swap_geometry(ind)
-    
-    DO j=jj_begin,jj_end
-      DO i=ii_begin,ii_end
-        n=(j-1)*iim+i
-        pt_sum_ne(n)=0
-        DO k=1,6
-          pt_sum_ne(n)=pt_sum_ne(n)+ne(n,k)
-        ENDDO
-        IF (domain(ind)%own(i,j)) tot_sum=tot_sum+Ai(n)
-      ENDDO
-    ENDDO
-  ENDDO
-  
-  IF (is_mpi_root) PRINT *," Diff surf",1-tot_sum/(4*Pi*radius*radius)
-!$OMP END MASTER
-
- 
   CALL WriteField("Ai",geom%Ai)
   
@@ -76 +41 @@
   CALL output_field_init
   CALL init_timeloop
-
-
+  
   CALL timeloop
 
@@ -86 +50 @@
   CALL close_time_counter
   CALL finalize_mpipara
+
+CONTAINS
   
-END PROGRAM ICOSA_gcm 
+  SUBROUTINE check_total_area
+    IMPLICIT NONE
+    TYPE(t_field),POINTER,SAVE :: sum_ne(:)
+    TYPE(t_field),POINTER,SAVE :: sum_ne_glo(:)
+    REAL(rstd),POINTER :: pt_sum_ne(:)
+    
+    INTEGER :: ind,i,j,k,n
+    REAL(rstd) :: vect(3,6)
+    REAL(rstd) :: centr(3),dist    
+    REAL(rstd) :: tot_sum=0
+    CALL allocate_field(sum_ne,field_T,type_real)
+    
+    !$OMP BARRIER
+    !$OMP MASTER
+    DO ind=1,ndomain
+       
+       pt_sum_ne=sum_ne(ind)
+       
+       CALL swap_dimensions(ind)
+       CALL swap_geometry(ind)
+       
+       DO j=jj_begin,jj_end
+          DO i=ii_begin,ii_end
+             n=(j-1)*iim+i
+             pt_sum_ne(n)=0
+             DO k=1,6
+                pt_sum_ne(n)=pt_sum_ne(n)+ne(n,k)
+             ENDDO
+             IF (domain(ind)%own(i,j)) tot_sum=tot_sum+Ai(n)
+          ENDDO
+       ENDDO
+    ENDDO
+    
+    IF (is_mpi_root) PRINT *," Diff surf",1-tot_sum/(4*Pi*radius*radius)
+    !$OMP END MASTER
+    
+  END SUBROUTINE check_total_area
+END PROGRAM ICOSA_gcm

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -232 +232 @@
 !!$OMP BARRIER
   DO ind=1,ndomain
+     IF (.NOT. assigned_domain(ind)) CYCLE
      CALL swap_dimensions(ind)
      CALL swap_geometry(ind)