Changeset 3288 for branches

Timestamp:

2012-01-27T14:32:32+01:00 (12 years ago)

Author:

rblod

Message:

Update prtctl in case of one processor run

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC

Files:

• IOM/prtctl.F90 (modified) (4 diffs)
• nemogcm.F90 (modified) (2 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

@@ -123 +123 @@
       IF( PRESENT(mask2)   )   zmask2  (:,:,:)      = mask2  (:,:,:)
 
-      IF( lk_mpp ) THEN       ! processor number
+      IF( lk_mpp .AND. jpnij > 1 ) THEN       ! processor number
          sind = narea
          eind = narea
-      ELSE                    ! processors total number
+      ELSE                                    ! processors total number
          sind = 1
          eind = ijsplt
@@ -137 +137 @@
          ! Set indices for the SUM control
          IF( .NOT. lsp_area ) THEN
-            IF (lk_mpp )   THEN
+            IF (lk_mpp .AND. jpnij > 1)   THEN
                nictls = MAX( 1, nlditl(jn) - overlap )
                nictle = nleitl(jn) + overlap * MIN( 1, nlcitl(jn) - nleitl(jn)) 
@@ -229 +229 @@
       !!----------------------------------------------------------------------
 
-      IF( lk_mpp ) THEN       ! processor number
+      IF( lk_mpp .AND. jpnij > 1 ) THEN       ! processor number
          sind = narea
          eind = narea
-      ELSE                    ! total number of processors
+      ELSE                                    ! total number of processors
          sind = 1
          eind = ijsplt
@@ -294 +294 @@
       ktime = 1
 
-      IF( lk_mpp ) THEN
+      IF( lk_mpp .AND. jpnij > 1 ) THEN
          sind = narea
          eind = narea

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -270 +270 @@
          WRITE(numout,*) '                       NEMO team'
          WRITE(numout,*) '            Ocean General Circulation Model'
-         WRITE(numout,*) '                version 3.4_beta  (2011) '
+         WRITE(numout,*) '                  version 3.4  (2011) '
          WRITE(numout,*)
          WRITE(numout,*)
@@ -414 +414 @@
       !
       IF( ln_ctl ) THEN                 ! sub-domain area indices for the control prints
-         IF( lk_mpp ) THEN
+         IF( lk_mpp .AND. jpnij > 1 ) THEN
             isplt = jpni   ;   jsplt = jpnj   ;   ijsplt = jpni*jpnj   ! the domain is forced to the real split domain
          ELSE