Changeset 7 for trunk/NEMOGCM/NEMO/OPA_SRC/IOM

Timestamp:

02/08/12 18:07:19 (12 years ago)

Author:

cholod

Message:

Update of the trunk with the v3.4_r3300

Location:

trunk

Files:

• . (modified) (1 prop)
• NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) (1 diff)
• NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (1 diff)
• NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) (5 diffs)
• NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90

@@ -135 +135 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: in_out_manager.F90 3170 2011-11-22 10:49:52Z cetlod $
+   !! $Id: in_out_manager.F90 3294 2012-01-28 16:44:18Z rblod $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!=====================================================================

trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -74 +74 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: iom.F90 3104 2011-11-15 10:08:25Z cetlod $
+   !! $Id: iom.F90 3294 2012-01-28 16:44:18Z rblod $
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------

trunk/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

@@ -33 +33 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: prtctl.F90 3186 2011-11-27 08:16:19Z smasson $ 
+   !! $Id: prtctl.F90 3294 2012-01-28 16:44:18Z rblod $ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -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

trunk/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -40 +40 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: restart.F90 2977 2011-10-22 13:46:41Z cetlod $
+   !! $Id: restart.F90 3294 2012-01-28 16:44:18Z rblod $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------