Changeset 4437 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/partition_mod.F90

Timestamp:

2014-02-04T13:14:54+01:00 (10 years ago)

Author:

trackstand2

Message:

Trim columns in exchs_generic and init mbkmax in mpp_init3

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/partition_mod.F90 (modified) (4 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/partition_mod.F90

@@ -14 +14 @@
                       nperio,      &  ! Local periodicity 
                       nwidthmax,   &  ! Width of widest northern domain
-                      narea           ! ID of local area (= rank + 1)
+                      narea,       &  ! ID of local area (= rank + 1)
+                      mbkmax          ! Deepest level above ocean floor
 #if defined key_mpp_mpi
    USE lib_mpp,        ONLY: mppsize, mppsync, mpi_comm_opa,                &
@@ -115 +116 @@
       INTEGER :: iproc, jproc                  ! Loop index
       INTEGER :: ierr                          ! Error flag
-      INTEGER :: i,j !,npoints ! ARPDBG for debugging only
+      INTEGER :: ji, jj
       CHARACTER(LEN=4) :: intStr
 
@@ -181 +182 @@
             WRITE (997,FMT='("0 1 0 setrgbcolor")')
             WRITE (997,FMT='("newpath")')
-            DO j = 1,jpjglo,1
-               DO i = 1,jpiglo,1
-                  IF(imask(i,j) /= 1)THEN
-                     WRITE (997,FMT='(I3," u ",I3," u 1 u 0 360 arc closepath")') i, j
+            DO jj = 1,jpjglo,1
+               DO ji = 1,jpiglo,1
+                  IF(imask(ji,jj) /= 1)THEN
+                     WRITE (997,FMT='(I3," u ",I3," u 1 u 0 360 arc closepath")') ji, jj
                      ! Use 'fill' instead of 'stroke' to get filled circles
                      WRITE (997,FMT='("fill")')
@@ -298 +299 @@
       ! read
       CALL write_partition()
+
+      ! Initialise mbkmax because it's needed in any halo swap calls but we didn't have
+      ! jpi and jpj until the partitioning was done.
+      DO jj=1,jpj,1
+         DO ji=1,jpi,1
+            mbkmax(ji,jj) = ibotlevel(MIN(jpiglo,ji+nimpp-1), &
+                                      MIN(jpjglo,jj+njmpp-1))
+         END DO
+      END DO
 
       ! ARPDBG - test comms setup