Changeset 635 for trunk/NEMO/OPA_SRC

Timestamp:

2007-03-07T14:26:45+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_update_007:RB: add key_mpp_dyndist for dynamic distribution with key_agrif activated

Location:

trunk/NEMO/OPA_SRC

Files:

• lib_mpp.F90 (modified) (3 diffs)
• par_oce.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -98 +98 @@
    !! The processor number is a required power of two : 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024,...
    INTEGER, PARAMETER ::   &
-      nprocmax = 2**10,    &  ! maximun dimension
-      ndim_mpp = jpnij        ! dimension for this simulation
+      nprocmax = 2**10     ! maximun dimension
 
 #if defined key_mpp_mpi
@@ -416 +415 @@
             npvm_tids(0) = npvm_mytid
             npvm_me = 0
-            IF( ndim_mpp > nprocmax ) THEN
+            IF( jpnij > nprocmax ) THEN
                WRITE(ctmp1,*) 'npvm_mytid=', npvm_mytid, ' too great'
                CALL ctl_stop( ctmp1 )
 
             ELSE
-               npvm_nproc = ndim_mpp
+               npvm_nproc = jpnij
             ENDIF
 
@@ -536 +535 @@
          ENDIF
          !          --- END receive dimension ---
-         IF( ndim_mpp > nprocmax ) THEN
+         IF( jpnij > nprocmax ) THEN
             WRITE(ctmp1,*) 'mytid=',nt3d_mytid,' too great'
             CALL ctl_stop( ctmp1 )
          ELSE
-            nt3d_nproc =  ndim_mpp
+            nt3d_nproc =  jpnij
          ENDIF
          IF( mpparent_print /= 0 ) THEN

trunk/NEMO/OPA_SRC/par_oce.F90

@@ -25 +25 @@
    !!      so jpiglo=jpi and jpjglo=jpj
 
-   INTEGER, PUBLIC, PARAMETER ::    &  !:
+#if ! defined key_mpp_dyndist 
+   INTEGER, PUBLIC, PARAMETER ::    &  !: 
       jpni   = 1,                   &  !: number of processors following i 
       jpnj   = 1,                   &  !: number of processors following j
-      jpnij  = 1,                   &  !: nb of local domain = nb of processors 
+      jpnij  = 1                       !: nb of local domain = nb of processors 
       !                                !  ( <= jpni x jpnj )
+#else
+   INTEGER, PUBLIC ::               &  !
+      jpni      ,                   &  !: number of processors following i 
+      jpnj      ,                   &  !: number of processors following j
+      jpnij                            !: nb of local domain = nb of processors 
+      !                                !  ( <= jpni x jpnj )
+#endif
+
+   INTEGER, PUBLIC, PARAMETER ::    &  !:
       jpr2di = 0,                   &  !: number of columns for extra outer halo 
       jpr2dj = 0,                   &  !: number of rows    for extra outer halo