Changeset 61

Timestamp:

2004-04-22T13:50:23+02:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX035 : # Indice correction (ii1=658) for a point localised in the Mediterranean Sea (damping term) for the ORCA 05 configuration

# Indices and comments correction for zoom functionalities

File:

• trunk/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -177 +177 @@
       END SELECT
 
-      IF( l_ctl .AND. lwp ) THEN         ! print mean trends (used for debugging)
+      IF(l_ctl) THEN         ! print mean trends (used for debugging)
          zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) )
          zsa = SUM( sa(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) )
@@ -208 +208 @@
       REWIND ( numnam )
       READ   ( numnam, namtdp )
-      IF( lzoom ) THEN
-         nmldmp = 0           ! restoring to climatology at closed north or south boundaries
-      ENDIF
+      IF( lzoom )   nmldmp = 0           ! restoring to climatology at closed north or south boundaries
 
       ! Parameter control and print
@@ -270 +268 @@
       ENDIF
 
-      ! 3. Damping coefficients initialization
-      ! --------------------------------------
+      strdmp(:,:,:) = 0.e0       ! internal damping salinity trend (used in ocesbc)
+
+      ! Damping coefficients initialization
+      ! -----------------------------------
 
       IF( lzoom ) THEN
@@ -318 +318 @@
       ! damping along the forced closed boundary over 6 grid-points
       DO jn = 1, 6
-         IF( lzoom_e )   resto( mi0(jn+1) , : , : ) = zfact(jn)         ! east  closed
-         IF( lzoom_s )   resto( : , mj0(jn+1) , : ) = zfact(jn)         ! south closed 
-         IF( lzoom_w )   resto( mi0(jpiglo-jn) , : , : ) = zfact(jn)    ! west  closed 
-         IF( lzoom_n )   resto( : , mi0(jpjglo-jn) , : ) = zfact(jn)    ! north closed
+         IF( lzoom_w )   resto( mi0(jn+jpizoom):mi1(jn+jpizoom), : , : ) = zfact(jn) ! west  closed
+         IF( lzoom_s )   resto( : , mj0(jn+jpjzoom):mj1(jn+jpjzoom), : ) = zfact(jn) ! south closed 
+         IF( lzoom_e )   resto( mi0(jpiglo+jpizoom-1-jn):mi1(jpiglo+jpizoom-1-jn) , : , : ) &
+                       &              = zfact(jn)                                 ! east  closed 
+         IF( lzoom_n )   resto( : , mj0(jpjglo+jpjzoom-1-jn):mj1(jpjglo+jpjzoom-1-jn) , : ) &
+                       &              = zfact(jn)                                 ! north closed
       END DO
 
@@ -512 +514 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  zdct(ji,jj,jk) = min( zinfl, zdct(ji,jj,jk) )
+                  zdct(ji,jj,jk) = MIN( zinfl, zdct(ji,jj,jk) )
 
                   !   ... Decrease the value in the vicinity of the coast
                   resto(ji,jj,jk) = resto(ji,jj,1)*0.5   &
-                     * ( 1. - cos( rpi*zdct(ji,jj,jk)/zinfl) )
+                     &            * ( 1. - COS( rpi*zdct(ji,jj,jk)/zinfl) )
 
                   !   ... Vertical variation from zsdmp (sea surface) to zbdmp (bottom)
-                  resto(ji,jj,jk) = resto(ji,jj,jk)*   &
-                     ( zbdmp + (zsdmp-zbdmp)*exp(-fsdept(ji,jj,jk)/hdmp) )
+                  resto(ji,jj,jk) = resto(ji,jj,jk)   &
+                     &            * ( zbdmp + (zsdmp-zbdmp)*EXP(-fsdept(ji,jj,jk)/hdmp) )
                END DO
             END DO
@@ -603 +605 @@
             ii0 = 568   ;   ii1 = 574 
             ij0 = 324   ;   ij1 = 333   ;   zmrs( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 1.e0
-            ii0 = 575   ;   ii1 = 314
+            ii0 = 575   ;   ii1 = 658
             ij0 = 314   ;   ij1 = 366   ;   zmrs( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 1.e0
             ! Black Sea (remaining part