Changeset 2462 for branches/DEV_r2460_v3_3beta_NOL/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

Timestamp:

2010-12-07T18:56:19+01:00 (13 years ago)

Author:

acc

Message:

DEV_r2460_v3_3beta_NOL. Changes to v3.3beta to improve assignment of ocean processes to ioserver processes when discarding land-only regions. See ticket #776

File:

• branches/DEV_r2460_v3_3beta_NOL/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) (3 diffs)

branches/DEV_r2460_v3_3beta_NOL/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

@@ -16 +16 @@
    USE lib_mpp         ! distribued memory computing library
    USE ioipsl
+#if defined key_iomput
+   USE mod_event_client
+# endif
 
    IMPLICIT NONE
@@ -278 +281 @@
          nldjt(jn) = nldj
          nlejt(jn) = nlej
+         nregproc_out(jn) = jn - 1
       END DO
       
@@ -336 +340 @@
         CALL ctl_opn( inum, 'layout.dat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., narea )
         WRITE(inum,'(a)') '   jpnij     jpi     jpj     jpk  jpiglo  jpjglo'
-        WRITE(inum,'(6i8)') jpnij,jpi,jpj,jpk,jpiglo,jpjglo
-        WRITE(inum,'(a)') 'NAREA nlci nlcj nldi nldj nlei nlej nimpp njmpp'
+        WRITE(inum,'(8i8)') jpnij,jpi,jpj,jpk,jpiglo,jpjglo,jpni,jpnj
+        WRITE(inum,'(a)') 'NAREA nlci nlcj nldi nldj nlei nlej nimpp njmpp nregproc_out'
 
         DO  jn = 1, jpnij
-         WRITE(inum,'(9i5)') jn, nlcit(jn), nlcjt(jn), &
+         WRITE(inum,'(10i5)') jn, nlcit(jn), nlcjt(jn), &
                                       nldit(jn), nldjt(jn), &
                                       nleit(jn), nlejt(jn), &
-                                      nimppt(jn), njmppt(jn)
+                                      nimppt(jn), njmppt(jn), nregproc_out(jn)
         END DO
         CLOSE(inum)   
+#ifdef key_iomput
+     ! Check nregproc_in matches nregproc_out and abort if it does not.
+     ! This should only occur on the first run of a new domain decomposition
+     ! when jpni*jpnj /= jpnij. If ioservers are not being used, Init_parallel 
+     ! will not have been called and nregproc_in will not have been allocated.
+     ! In such a case the check is unnecessary so only check for a match if 
+     ! nregproc_in has been allocated.
+      IF (ALLOCATED(nregproc_in)) THEN
+        DO  jn = 1, jpnij
+         IF ( nregproc_in(jn) /= nregproc_out(jn) ) THEN
+          WRITE(numout,*) ' nregproc_in and nregproc_out do not match.'
+          WRITE(numout,*) ' This is expected when starting a new domain docomposition.'
+          WRITE(numout,*) ' The layout.dat file has been updated and the model may be rerun.'
+          CALL ctl_stop( ' mpp_init: IO server domain colour assignment mismatch ')
+         END IF
+        END DO
+      ENDIF
+#endif
       END IF