Changeset 29 for trunk/NEMO/OPA_SRC

Timestamp:

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

Author:

opalod

Message:

CT : BUGFIX013 : Running problem in a beta-plane case is solved

File:

• trunk/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DOM/domhgr.F90

@@ -101 +101 @@
       !! * local declarations
       INTEGER  ::   ji, jj          ! dummy loop indices
-      INTEGER  ::   jeq             ! index of equator T point (computed for case 4)
+      INTEGER  ::   ijeq             ! index of equator T point (computed for case 4)
       REAL(wp) ::   &
          zti, zui, zvi, zfi,     &  ! temporary scalars
@@ -234 +234 @@
          !  The formula should work even if the equator is outside the domain.
          zarg = rpi / 4. - rpi / 180. * ppgphi0 / 2.
-         jeq = ABS( 180./rpi * LOG( COS( zarg ) / SIN( zarg ) ) / ppe1_deg )
-
-         IF(lwp) WRITE(numout,*) '          Index of the equator on the MERCATOR grid:', jeq
+         ijeq = ABS( 180./rpi * LOG( COS( zarg ) / SIN( zarg ) ) / ppe1_deg )
+
+         IF(lwp) WRITE(numout,*) '          Index of the equator on the MERCATOR grid:', ijeq
 
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zti = FLOAT( ji - 1 + nimpp - 1 )         ;   ztj = FLOAT( jj - jeq + njmpp - 1 )
-               zui = FLOAT( ji - 1 + nimpp - 1 ) + 0.5   ;   zuj = FLOAT( jj - jeq + njmpp - 1 )
-               zvi = FLOAT( ji - 1 + nimpp - 1 )         ;   zvj = FLOAT( jj - jeq + njmpp - 1 ) + 0.5
-               zfi = FLOAT( ji - 1 + nimpp - 1 ) + 0.5   ;   zfj = FLOAT( jj - jeq + njmpp - 1 ) + 0.5
+               zti = FLOAT( ji - 1 + nimpp - 1 )         ;   ztj = FLOAT( jj - ijeq + njmpp - 1 )
+               zui = FLOAT( ji - 1 + nimpp - 1 ) + 0.5   ;   zuj = FLOAT( jj - ijeq + njmpp - 1 )
+               zvi = FLOAT( ji - 1 + nimpp - 1 )         ;   zvj = FLOAT( jj - ijeq + njmpp - 1 ) + 0.5
+               zfi = FLOAT( ji - 1 + nimpp - 1 ) + 0.5   ;   zfj = FLOAT( jj - ijeq + njmpp - 1 ) + 0.5
          ! Longitude
                glamt(ji,jj) = ppglam0 + ppe1_deg * zti
@@ -336 +336 @@
          zf0     = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south
 
-         ff(:,:) = ( zf0  + zbeta * gphif(:,:) )                          ! f = f0 +beta* y ( y=0 at south)
+         ff(:,:) = ( zf0  + zbeta * gphif(:,:) * 1.e+3 )                      ! f = f0 +beta* y ( y=0 at south)
 
          IF(lwp) WRITE(numout,*) '          Beta-plane: Beta parameter = constant = ', ff(1,1)
@@ -560 +560 @@
          !                                             ! =====================
          IF( n_cla == 0 ) THEN
-            e2u( mi0(160):mi1(161) , mj0(88):mj1(88) ) =  18.e3   ! Bab el Mandeb (e2u = 18 km)
+            ii0 = 160   ;   ii1 = 161        ! Bab el Mandeb (e2u = 18 km)
+            ij0 =  88   ;   ij1 =  88   ;   e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij0) ) =  18.e3 
             IF(lwp) WRITE(numout,*)
             IF(lwp) WRITE(numout,*) '          Bab el Mandeb: e2u reduced to 18 km'
          ENDIF 
- 
-         e2u( mi0(145):mi1(146) , mj0(116):mj1(116) ) =  15.e3    ! Sound Strait (e2u = 15 km)
+
+         ii0 = 145   ;   ii1 = 146        ! Sound Strait (e2u = 15 km)
+         ij0 = 116   ;   ij1 = 116   ;   e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij0) ) =  15.e3 
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '        : Reduced e2u at the Sound Strait'