Changeset 32 for trunk/NEMO/OPA_SRC/DIA/diagap.F90

Timestamp:

2004-02-17T10:20:15+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/DIA/diagap.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DIA/diagap.F90

@@ -21 +21 @@
 
    IMPLICIT NONE
+   PRIVATE
+
+   !! * Routine accessibility
+   PUBLIC dia_gap     ! called in step.F90 module
 
    !! * Shared module variables
-   LOGICAL, PUBLIC, PARAMETER ::   &
-      lk_diagap = .TRUE.         ! model-data diagnostics flag
+   LOGICAL, PUBLIC, PARAMETER ::   lk_diagap = .TRUE.   !: model-data diagnostics flag
 
    !! * Module variables
    INTEGER ::                 &
-!!!   numgap,                 &  ! logical unit for differences diagnostic
+!???  numgap,                 &  ! logical unit for differences diagnostic
       ngap  ,                 &  ! time step frequency
       nprg                       ! switch for control print
@@ -125 +128 @@
             END DO
          END DO
-#if defined key_mpp
-         CALL mpp_sum( volk, jpk )
-#endif
+         IF( lk_mpp )   CALL mpp_sum( volk, jpk )   ! sum over the global domain
+
          volkr(:) = 0.e0
          DO jk = 1, jpk
@@ -233 +235 @@
             smodg(jpk) = smodg(jpk) + smodg(jk) * volk(jk) / vol
          END DO  
-
-#if defined key_mpp
-          CALL mpp_sum( tdtag, jpk )
-          CALL mpp_sum( sdtag, jpk )
-          CALL mpp_sum( tmodg, jpk )
-          CALL mpp_sum( smodg, jpk )
-#endif
+          IF( lk_mpp)   CALL mpp_sum( tdtag, jpk )   ! sum over the global domain
+          IF( lk_mpp)   CALL mpp_sum( sdtag, jpk )
+          IF( lk_mpp)   CALL mpp_sum( tmodg, jpk )
+          IF( lk_mpp)   CALL mpp_sum( smodg, jpk )
 
           ! 3.  Averaged output in file numgap
@@ -291 +290 @@
 #else
    !!----------------------------------------------------------------------
-   !!   Default option :                                       Empty module
-   !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_diagap = .FALSE.   ! 'key_diagap' flag
+   !!   Default option :                                       Dummy module
+   !!----------------------------------------------------------------------
+   LOGICAL, PUBLIC, PARAMETER ::   lk_diagap = .FALSE.    !: diagap flag
 CONTAINS
-   SUBROUTINE dia_gap( kt )           ! Empty routine
-      WRITE(*,*) kt                       ! no warning in compilation phase
+   SUBROUTINE dia_gap( kt )           ! Dummy routine
+      WRITE(*,*) 'dia_gap: You should not have seen this print! error?', kt
    END SUBROUTINE dia_gap
 #endif