Changeset 15 for trunk/NEMO/OPA_SRC/step.F90

Timestamp:

2004-02-17T08:25:44+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

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

trunk/NEMO/OPA_SRC/step.F90

@@ -168 +168 @@
       !! * local declarations
       INTEGER ::   indic    ! error indicator if < 0
+      INTEGER ::   ii0, ii1, ij0, ij1   ! temporary integers
       !! ---------------------------------------------------------------------
 
@@ -245 +246 @@
             CASE ( 05 )                         ! ORCA R2 configuration
                avt  (:,:,2) = avt  (:,:,2) + 1.e-3 * upsrnfh(:,:)   ! increase diffusivity of rivers mouths
-               IF( lk_zdfddm )   fsavs(:,:,2) = fsavs(:,:,2) + 1.e-3 * upsrnfh(:,:)   
             CASE ( 2  )                         ! ORCA R2 configuration
-               avt( mi0(140):mi1(140) , mj0(102):mj1(102) , 2:jpkm1 ) =    &   ! Strait of Gibraltar
-               avt( mi0(140):mi1(140) , mj0(102):mj1(102) , 2:jpkm1 ) / 5.e0    
-               avt( mi0(161):mi1(161) , mj0( 88):mj1( 88) , 2:jpkm1 ) =    &   ! Strait of Bab el Mandeb
-               avt( mi0(161):mi1(161) , mj0( 88):mj1( 88) , 2:jpkm1 ) / 5.e0
+               ij0 = 102   ;   ij1 = 102   ;   ii0 = 140   ;   ii1 = 140
+               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) =    &   ! Strait of Gibraltar
+               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) / 5.e0    
+               ij0 =  88   ;   ij1 =  88   ;   ii0 = 161   ;   ii1 = 161
+               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) =    &   ! Strait of Bab el Mandeb
+               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) / 5.e0
             CASE ( 4  )                         ! ORCA R4 configuration
-               avt( mi0( 71):mi1( 71) , mj0( 52):mj1( 52) , 2:jpkm1 ) =    &   ! Strait of Gibraltar
-               avt( mi0( 71):mi1( 71) , mj0( 52):mj1( 52) , 2:jpkm1 ) / 5.e0
+               ij0 =  52   ;   ij1 =  52   ;   ii0 =  71   ;   ii1 =  71
+               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) =    &   ! Strait of Gibraltar
+               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) / 5.e0
          END SELECT
       ENDIF
@@ -332 +335 @@
 
       !                                                        ! vertical diffusion
-      IF( l_trazdf_exp      )   CALL tra_zdf_exp( kstp )               ! explicit time stepping (time splitting scheme)
-      IF( l_trazdf_imp      )   CALL tra_zdf_imp( kstp )               ! implicit time stepping (euler backward)
-      IF( l_trazdf_iso      )   CALL tra_zdf_iso( kstp )               ! isopycnal
+      IF( l_trazdf_exp      )   CALL tra_zdf_exp     ( kstp )          ! explicit time stepping (time splitting scheme)
+      IF( l_trazdf_imp      )   CALL tra_zdf_imp     ( kstp )          ! implicit time stepping (euler backward)
+      IF( l_trazdf_iso      )   CALL tra_zdf_iso     ( kstp )          ! isopycnal
       IF( l_trazdf_iso_vo   )   CALL tra_zdf_iso_vopt( kstp )          ! vector opt. isopycnal
 
@@ -377 +380 @@
 
       !                                                     ! horizontal gradient of Hydrostatic pressure 
-      IF( l_dyn_hpg     )   CALL dyn_hpg     ( kstp )             ! default case  (k-j-i loop)
-      IF( l_dyn_hpg_tsk )   CALL dyn_hpg_atsk( kstp )             ! autatask case (j-k-i loop)
-
-                            CALL dyn_zad    ( kstp )        ! vertical advection       
+      IF( lk_dynhpg        )   CALL dyn_hpg     ( kstp )             ! default case  (k-j-i loop)
+      IF( lk_dynhpg_tsk    )   CALL dyn_hpg_atsk( kstp )             ! autatask case (j-k-i loop)
+
+                               CALL dyn_zad    ( kstp )     ! vertical advection       
 
       !                                                     ! vertical diffusion