Changeset 151 for codes/icosagcm/trunk/src/domain.f90

Timestamp:

05/13/13 14:30:31 (11 years ago)

Author:

ymipsl

Message:

Implementation of mixte parallelism MPI/OpenMP into src directory

YM

File:

• codes/icosagcm/trunk/src/domain.f90 (modified) (6 diffs)

codes/icosagcm/trunk/src/domain.f90

@@ -71 +71 @@
   SUBROUTINE create_domain
   USE grid_param
+  USE mpipara
   IMPLICIT NONE
   INTEGER :: ind,nf,ni,nj,i,j
@@ -98 +99 @@
           d%ii_end_glo=d%ii_begin_glo+d%ii_nb-1
  
-          IF (ni/=nsplit_i) THEN 
+          IF (ni/=1) THEN 
             d%ii_nb=d%ii_nb+1
-            d%ii_end_glo=d%ii_end_glo+1
+            d%ii_begin_glo=d%ii_begin_glo-1
           ENDIF
          
@@ -115 +116 @@
           d%jj_end_glo=d%jj_begin_glo+d%jj_nb-1
 
-          IF (nj/=nsplit_j) THEN 
+          IF (nj/=1) THEN 
             d%jj_nb=d%jj_nb+1
-            d%jj_end_glo=d%jj_end_glo+1
+            d%jj_begin_glo=d%jj_begin_glo-1
           ENDIF
 
@@ -142 +143 @@
           ALLOCATE(d%own(d%iim,d%jjm))
           ALLOCATE(d%ne(0:5,d%iim,d%jjm))
+          
+          IF (is_mpi_root) PRINT *,"Domain ",ind," : size ",d%ii_nb,"x",d%jj_nb
+          
         END DO
       END DO
@@ -261 +265 @@
             d%neighbour(:,k,i,j)=cell_glo(ind2)%xyz(:)
 
-!            d%ne(k,i,j)=vertex_glo(ii,jj,nf)%ne(k)
             d%ne(k,i,j)=1-2*MOD(k,2)
 
@@ -298 +301 @@
       edge_glo(e)%assign_pos=k
       edge_glo(e)%assign_delta=delta
-!      PRINT*,"Assign_edge",ind_d,ind,i,j,k,e
+
      END  SUBROUTINE assign_edge