Changeset 32 for trunk/NEMO/OPA_SRC/LDF/ldfslp.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/LDF/ldfslp.F90 (modified) (11 diffs)

trunk/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -29 +29 @@
 
    !! * Share module variables
-   LOGICAL , PUBLIC, PARAMETER ::   lk_ldfslp = .TRUE.     ! slopes flag
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &
-      uslp, wslpi,         &  ! i_slope at U- and W-points
-      vslp, wslpj             ! j-slope at V- and W-points
+   LOGICAL , PUBLIC, PARAMETER ::   lk_ldfslp = .TRUE.     !: slopes flag
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &  !:
+      uslp, wslpi,         &  !: i_slope at U- and W-points
+      vslp, wslpj             !: j-slope at V- and W-points
    
    !! * Module variables
@@ -95 +95 @@
 
       !! * Local declarations
-      INTEGER  ::   ji, jj, jk      ! dummy loop indices
+      INTEGER  ::   ji, jj, jk              ! dummy loop indices
+      INTEGER  ::   ii0, ii1, ij0, ij1      ! temporary integer
 #if defined key_partial_steps
       INTEGER  ::   iku, ikv  ! temporary integers
@@ -120 +121 @@
       
       zeps  =  1.e-20
-      zmg   = -1.0 / g
-      zm05g = -0.5 / g
+      zmg   = -1.0 / grav
+      zm05g = -0.5 / grav
 
       zww(:,:,:) = 0.e0
@@ -177 +178 @@
          
          ! Local vertical density gradient evaluated from N^2
-         ! zwy = d/dz(prd)= - ( prd ) / g * mk(pn2) -- at t point
+         ! zwy = d/dz(prd)= - ( prd ) / grav * mk(pn2) -- at t point
 
          DO jj = 1, jpj
@@ -323 +324 @@
          
          ! Local vertical density gradient evaluated from N^2
-         !     zwy = d/dz(prd)= - mk ( prd ) / g * pn2 -- at w point
+         !     zwy = d/dz(prd)= - mk ( prd ) / grav * pn2 -- at w point
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -450 +451 @@
             !
             !                                             ! Gibraltar Strait
-            uslp ( mi0(69):mi1(71) , mj0(50):mj1(53) , jk ) = 0.0e0
-            vslp ( mi0(68):mi1(71) , mj0(51):mj1(53) , jk ) = 0.0e0
-            wslpi( mi0(69):mi1(71) , mj0(51):mj1(53) , jk ) = 0.0e0
-            wslpj( mi0(69):mi1(71) , mj0(51):mj1(53) , jk ) = 0.0e0
+            ij0 =  50   ;   ij1 =  53
+            ii0 =  69   ;   ii1 =  71   ;   uslp ( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
+            ij0 =  51   ;   ij1 =  53
+            ii0 =  68   ;   ii1 =  71   ;   vslp ( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
+            ii0 =  69   ;   ii1 =  71   ;   wslpi( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
+            ii0 =  69   ;   ii1 =  71   ;   wslpj( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
 
             !                                             ! Mediterrannean Sea
-            uslp ( mi0(71):mi1(90) , mj0(49):mj1(56) , jk ) = 0.0e0
-            vslp ( mi0(70):mi1(90) , mj0(50):mj1(56) , jk ) = 0.0e0
-            wslpi( mi0(71):mi1(90) , mj0(50):mj1(56) , jk ) = 0.0e0
-            wslpj( mi0(71):mi1(90) , mj0(50):mj1(56) , jk ) = 0.0e0
+            ij0 =  49   ;   ij1 =  56
+            ii0 =  71   ;   ii1 =  90   ;   uslp ( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
+            ij0 =  50   ;   ij1 =  56
+            ii0 =  70   ;   ii1 =  90   ;   vslp ( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
+            ii0 =  71   ;   ii1 =  90   ;   wslpi( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
+            ii0 =  71   ;   ii1 =  90   ;   wslpj( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , jk ) = 0.e0
          ENDIF
          !                                             ! ===============
@@ -527 +532 @@
 
       zeps  =  1.e-20
-      zmg   = -1.0 / g
-      zm05g = -0.5 / g
+      zmg   = -1.0 / grav
+      zm05g = -0.5 / grav
 
 
@@ -567 +572 @@
 
       ! Local vertical density gradient evaluated from N^2
-      ! zwy = d/dz(prd)= - ( prd ) / g * mk(pn2) -- at t point
+      ! zwy = d/dz(prd)= - ( prd ) / grav * mk(pn2) -- at t point
 
       !-----------------------------------------------------------------------
@@ -619 +624 @@
 
       ! Local vertical density gradient evaluated from N^2
-      !     zwy = d/dz(prd)= - ( prd ) / g * mk(pn2) -- at t point
+      !     zwy = d/dz(prd)= - ( prd ) / grav * mk(pn2) -- at t point
       zwy ( :, jpj) = 0.0e0
       zwy ( jpi, :) = 0.0e0
@@ -673 +678 @@
 
       ! Local vertical density gradient evaluated from N^2
-      ! zwy = d/dz(prd)= - mk ( prd ) / g * pn2 -- at w point
+      ! zwy = d/dz(prd)= - mk ( prd ) / grav * pn2 -- at w point
 # if defined key_vectopt_loop   &&   ! defined key_autotasking
       jj = 1
@@ -809 +814 @@
    !!   Dummy module :                 NO Rotation of lateral mixing tensor
    !!------------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_ldfslp = .FALSE.    ! slopes flag
+   LOGICAL, PUBLIC, PARAMETER ::   lk_ldfslp = .FALSE.    !: slopes flag
 CONTAINS
    SUBROUTINE ldf_slp( kt, prd, pn2 )        ! Dummy routine
       INTEGER, INTENT(in) :: kt 
       REAL,DIMENSION(:,:,:), INTENT(in) :: prd, pn2
-      WRITE(*,*) kt, prd, pn2
+      WRITE(*,*) 'ldf_slp: You should not have seen this print! error?', kt, prd(1,1,1), pn2(1,1,1)
    END SUBROUTINE ldf_slp
 #endif