Changeset 719 for trunk/NEMO/OPA_SRC/lib_mpp.F90

Timestamp:

2007-10-16T16:59:56+02:00 (17 years ago)

Author:

ctlod

Message:

get back to the nemo_v2_3 version for trunk

File:

• trunk/NEMO/OPA_SRC/lib_mpp.F90 (modified) (13 diffs, 1 prop)

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -48 +48 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/lib_mpp.F90,v 1.21 2007/06/05 10:28:55 opalod Exp $ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!---------------------------------------------------------------------
@@ -270 +270 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/lib_mpp.F90,v 1.21 2007/06/05 10:28:55 opalod Exp $ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!---------------------------------------------------------------------
@@ -597 +597 @@
 #endif
 
-   SUBROUTINE mpp_lnk_3d( ptab, cd_type, psgn, cd_mpp, pval )
+   SUBROUTINE mpp_lnk_3d( ptab, cd_type, psgn, cd_mpp )
       !!----------------------------------------------------------------------
       !!                  ***  routine mpp_lnk_3d  ***
@@ -632 +632 @@
       CHARACTER(len=3), INTENT( in ), OPTIONAL ::    &
          cd_mpp        ! fill the overlap area only 
-      REAL(wp)        , INTENT(in   ), OPTIONAL           ::   pval      ! background value (used at closed boundaries)
 
       !! * Local variables
@@ -639 +638 @@
       INTEGER ::   ml_req1, ml_req2, ml_err     ! for key_mpi_isend
       INTEGER ::   ml_stat(MPI_STATUS_SIZE)     ! for key_mpi_isend
-      REAL(wp) ::   zland
       !!----------------------------------------------------------------------
 
       ! 1. standard boundary treatment
       ! ------------------------------
-
-      IF( PRESENT( pval ) ) THEN      ! set land value (zero by default)
-         zland = pval
-      ELSE
-         zland = 0.e0
-      ENDIF
 
       IF( PRESENT( cd_mpp ) ) THEN
@@ -670 +662 @@
             SELECT CASE ( cd_type )
             CASE ( 'T', 'U', 'V', 'W' )
-               ptab(     1       :jpreci,:,:) = zland
-               ptab(nlci-jpreci+1:jpi   ,:,:) = zland
+               ptab(     1       :jpreci,:,:) = 0.e0
+               ptab(nlci-jpreci+1:jpi   ,:,:) = 0.e0
             CASE ( 'F' )
-               ptab(nlci-jpreci+1:jpi   ,:,:) = zland
+               ptab(nlci-jpreci+1:jpi   ,:,:) = 0.e0
             END SELECT 
          ENDIF
@@ -681 +673 @@
          SELECT CASE ( cd_type )
          CASE ( 'T', 'U', 'V', 'W' )
-            ptab(:,     1       :jprecj,:) = zland
-            ptab(:,nlcj-jprecj+1:jpj   ,:) = zland
+            ptab(:,     1       :jprecj,:) = 0.e0
+            ptab(:,nlcj-jprecj+1:jpj   ,:) = 0.e0
          CASE ( 'F' )
-            ptab(:,nlcj-jprecj+1:jpj   ,:) = zland
+            ptab(:,nlcj-jprecj+1:jpj   ,:) = 0.e0
          END SELECT
      
@@ -1058 +1050 @@
 
 
-   SUBROUTINE mpp_lnk_2d( pt2d, cd_type, psgn, cd_mpp, pval )
+   SUBROUTINE mpp_lnk_2d( pt2d, cd_type, psgn, cd_mpp )
       !!----------------------------------------------------------------------
       !!                  ***  routine mpp_lnk_2d  ***
@@ -1092 +1084 @@
       CHARACTER(len=3), INTENT( in ), OPTIONAL ::    &
          cd_mpp        ! fill the overlap area only 
-      REAL(wp)        , INTENT(in   ), OPTIONAL           ::   pval      ! background value (used at closed boundaries)
 
       !! * Local variables
@@ -1101 +1092 @@
       INTEGER  ::   ml_req1, ml_req2, ml_err     ! for key_mpi_isend
       INTEGER  ::   ml_stat(MPI_STATUS_SIZE)     ! for key_mpi_isend
-      REAL(wp) ::   zland
       !!----------------------------------------------------------------------
-
-      IF( PRESENT( pval ) ) THEN      ! set land value (zero by default)
-         zland = pval
-      ELSE
-         zland = 0.e0
-      ENDIF
 
       ! 1. standard boundary treatment
@@ -1131 +1115 @@
             SELECT CASE ( cd_type )
             CASE ( 'T', 'U', 'V', 'W' , 'I' )
-               pt2d(     1       :jpreci,:) = zland
-               pt2d(nlci-jpreci+1:jpi   ,:) = zland
+               pt2d(     1       :jpreci,:) = 0.e0
+               pt2d(nlci-jpreci+1:jpi   ,:) = 0.e0
             CASE ( 'F' )
-               pt2d(nlci-jpreci+1:jpi   ,:) = zland
+               pt2d(nlci-jpreci+1:jpi   ,:) = 0.e0
             END SELECT
          ENDIF
@@ -1142 +1126 @@
          SELECT CASE ( cd_type )
          CASE ( 'T', 'U', 'V', 'W' , 'I' )
-            pt2d(:,     1       :jprecj) = zland
-            pt2d(:,nlcj-jprecj+1:jpj   ) = zland
+            pt2d(:,     1       :jprecj) = 0.e0
+            pt2d(:,nlcj-jprecj+1:jpj   ) = 0.e0
          CASE ( 'F' )
-            pt2d(:,nlcj-jprecj+1:jpj   ) = zland
+            pt2d(:,nlcj-jprecj+1:jpj   ) = 0.e0
          END SELECT
 
@@ -1410 +1394 @@
   
             CASE ( 'I' )                                  ! ice U-V point
-               pt2d( 2 ,nlcj) = zland
+               pt2d( 2 ,nlcj) = 0.e0
                DO ji = 2 , nlci-1
                   ijt = iloc - ji + 2