Changeset 32 for trunk/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90

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/LDF/ldfdyn_c2d.h90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90

@@ -17 +17 @@
       !!
       !! ** Method :
-      !!                   **** W A R N I N G ****
-      !!                     ORCA OCEAN VERSION
-      !!    This method is relevant ONLY for the grid build by the method
-      !!               given in the 'Reference' section.
-      !!                   **** W A R N I N G ****
-      !!
       !!      2D eddy viscosity coefficients ( longitude, latitude )
       !!
@@ -55 +49 @@
 
          zdx_max = MAXVAL( e1t(:,:) )
-#if defined key_mpp
-         CALL mpp_max( zdx_max )
-#endif
+         IF( lk_mpp )   CALL mpp_max( zdx_max )   ! max over the global domain
+
          IF(lwp) WRITE(numout,*) '              laplacian operator: ahm proportional to e1'
          IF(lwp) WRITE(numout,*) '              Caution, here we assume your mesh is isotropic ...'
@@ -96 +89 @@
 
          zdx_max = MAXVAL( e1u(:,:) )
-#if defined key_mpp
-         CALL mpp_max( zdx_max )
-#endif
+         IF( lk_mpp )   CALL mpp_max( zdx_max )   ! max over the global domain
+
          IF(lwp) WRITE(numout,*) '              bi-laplacian operator: ahm proportional to e1**3 '
          IF(lwp) WRITE(numout,*) '              Caution, here we assume your mesh is isotropic ...'
@@ -141 +133 @@
 
       !! * Arguments
-      LOGICAL, INTENT (in) :: ld_print   ! If true, output arrays on numout
+      LOGICAL, INTENT (in) ::   ld_print   ! If true, output arrays on numout
 
       !! * Local variables
-      INTEGER :: ji, jj      ! dummy loop indices
-      INTEGER :: inumcf, iost, iim, ijm
-      INTEGER :: jn
-      INTEGER :: ifreq, il1, il2, ij, ii, inorth, isouth
-      INTEGER :: ipi, ipj, iumout, iwork, icompt, ibtest, ikmax
-      INTEGER :: ijpt0, ijpt1, iipt0, iipt1
-      INTEGER ,DIMENSION(jpidta,jpidta) :: idata
-      INTEGER ,DIMENSION(jpi   ,jpj   ) :: icof
+      INTEGER ::   ji, jj, jn      ! dummy loop indices
+      INTEGER ::   inum = 11       ! temporary logical unit
+      INTEGER ::   iost, iim, ijm
+      INTEGER ::   ifreq, il1, il2, ij, ii
+      INTEGER, DIMENSION(jpidta,jpidta) ::   idata
+      INTEGER, DIMENSION(jpi   ,jpj   ) ::   icof
 
       REAL(wp) ::   zahmeq, zcoft, zcoff, zmsk
@@ -173 +163 @@
       ! ===================== equatorial strip (20N-20S) defined at t-points
 
-      inumcf = 15
-      OPEN( UNIT=inumcf,FILE='ahmcoef',STATUS='OLD',   &
-            FORM='FORMATTED', ACCESS='SEQUENTIAL', ERR=111 ,   &
-            IOSTAT= iost) 
+      OPEN( UNIT=inum, FILE='ahmcoef', STATUS='OLD',   &
+         &  FORM='FORMATTED', ACCESS='SEQUENTIAL', ERR=111 ,   &
+         &  IOSTAT= iost ) 
       IF( iost == 0 ) THEN
          IF(lwp) WRITE(numout,*) '     file   : ahmcoef open ok'
-         IF(lwp) WRITE(numout,*) '     unit   = ', inumcf
+         IF(lwp) WRITE(numout,*) '     unit   = ', inum
          IF(lwp) WRITE(numout,*) '     status = OLD'
          IF(lwp) WRITE(numout,*) '     form   = FORMATTED'
@@ -195 +184 @@
       ENDIF
 
-      REWIND inumcf
-      READ(inumcf,9101) clexp, iim, ijm
-      READ(inumcf,'(/)')
+      REWIND inum
+      READ(inum,9101) clexp, iim, ijm
+      READ(inum,'(/)')
       ifreq = 40
       il1 = 1
       DO jn = 1, jpidta/ifreq+1
-         READ(inumcf,'(/)')
+         READ(inum,'(/)')
          il2 = MIN( jpidta, il1+ifreq-1 )
-         READ(inumcf,9201) ( ii, ji = il1, il2, 5 )
-         READ(inumcf,'(/)')
+         READ(inum,9201) ( ii, ji = il1, il2, 5 )
+         READ(inum,'(/)')
          DO jj = jpjdta, 1, -1
-            READ(inumcf,9202) ij, ( idata(ji,jj), ji = il1, il2 )
+            READ(inum,9202) ij, ( idata(ji,jj), ji = il1, il2 )
          END DO
          il1 = il1 + ifreq