Changeset 5779 for branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90

Timestamp:

2015-10-06T18:28:13+02:00 (9 years ago)

Author:

mathiot

Message:

ISF coupling branch: correct some compilation issues, remove code related to MISOMIP/ISOMIP+ and polishing

File:

• branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 (modified) (3 diffs)

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90

@@ -163 +163 @@
    FUNCTION glob_sum_full_2d( ptab )
       !!----------------------------------------------------------------------
-      !!                  ***  FUNCTION  glob_sum_2d ***
-      !!
-      !! ** Purpose : perform a sum in calling DDPDD routine
+      !!                  ***  FUNCTION  glob_sum_full_2d ***
+      !!
+      !! ** Purpose : perform a sum in calling DDPDD routine (nomask)
       !!----------------------------------------------------------------------
       REAL(wp), INTENT(in), DIMENSION(:,:) ::   ptab
-      REAL(wp)                             ::   glob_sum_full_2d   ! global masked sum
+      REAL(wp)                             ::   glob_sum_full_2d   ! global sum
       !!
       !!-----------------------------------------------------------------------
@@ -179 +179 @@
    FUNCTION glob_sum_full_3d( ptab )
       !!----------------------------------------------------------------------
-      !!                  ***  FUNCTION  glob_sum_3d ***
-      !!
-      !! ** Purpose : perform a sum on a 3D array in calling DDPDD routine
+      !!                  ***  FUNCTION  glob_sum_full_3d ***
+      !!
+      !! ** Purpose : perform a sum on a 3D array in calling DDPDD routine (nomask)
       !!----------------------------------------------------------------------
       REAL(wp), INTENT(in), DIMENSION(:,:,:) ::   ptab
-      REAL(wp)                               ::   glob_sum_full_3d   ! global masked sum
+      REAL(wp)                               ::   glob_sum_full_3d   ! global sum
       !!
       INTEGER    ::   ji, jj, jk   ! dummy loop indices
@@ -192 +192 @@
       ijpk = SIZE(ptab,3)
       !
-      glob_sum_3d = 0.e0
+      glob_sum_full_3d = 0.e0
       DO jk = 1, ijpk
-         glob_sum_3d = glob_sum_3d + SUM( ptab(:,:,jk) )
+         glob_sum_full_3d = glob_sum_full_3d + SUM( ptab(:,:,jk) )
       END DO
       IF( lk_mpp )   CALL mpp_sum( glob_sum_full_3d )