Changeset 16 for trunk/NEMO/OPA_SRC/DTA/dtasal.F90

Timestamp:

2004-02-17T09:06:15+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/DTA/dtasal.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -23 +23 @@
    
    !! * Shared module variables
-   LOGICAL , PUBLIC, PARAMETER ::   lk_dtasal = .TRUE.    ! salinity data flag
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &
-      s_dta       ! salinity data at given time-step
+   LOGICAL , PUBLIC, PARAMETER ::   lk_dtasal = .TRUE.    !: salinity data flag
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &  !:
+      s_dta       !: salinity data at given time-step
 
    !! * Module variables
@@ -81 +81 @@
       INTEGER ::   ji, jj, jk, jl    ! dummy loop indicies
       INTEGER ::   &
-         imois, iman, ik, i15,  &  ! temporary integers
-         ipi, ipj, ipk, itime      !    "          "
+         imois, iman, ik, i15,       &  ! temporary integers
+         ipi, ipj, ipk, itime,       &  !    "          "
+         il0, il1, ii0, ii1, ij0, ij1   !    "          "
       INTEGER, DIMENSION(jpmois) ::   istep
       REAL(wp) ::   &
@@ -186 +187 @@
             !                                        !  ORCA_R2 configuration
             !                                        ! =======================
-         
-            DO jj = mj0(101), mj1(109)                      ! Reduced salinity in the Alboran Sea
-               DO ji = mi0(141), mi1(155)
+            ij0 = 101   ;   ij1 = 109
+            ii0 = 141   ;   ii1 = 155   
+            DO jj = mj0(ij0), mj1(ij1)                      ! Reduced salinity in the Alboran Sea
+               DO ji = mi0(ii0), mi1(ii1)
                   DO jk = 13, 13
                      saldta(ji,jj,jk,:) = saldta(ji,jj,jk,:) - 0.15
@@ -205 +207 @@
             IF( n_cla == 1 ) THEN 
                !                                         ! New salinity profile at Gibraltar
-               saldta( mi0(139):mi1(139) , mj0(101):mj1(101) , : , : ) =   &
-                  &                                    saldta( mi0(138):mi1(138) , mj0(101):mj1(101) , : , : )
-               saldta( mi0(139):mi1(139) , mj0(102):mj1(102) , : , : ) =   &
-                  &                                    saldta( mi0(138):mi1(138) , mj0(102):mj1(102) , : , : )
-               DO jl = mi0(138), mi1(138)                ! New temperature profile at Gibraltar
-                  DO jj = mj0(101), mj1(102)
-                     DO ji = mi0(139), mi1(139)
+               il0 = 138   ;   il1 = 138   
+               ij0 = 101   ;   ij1 = 101
+               ii0 = 139   ;   ii1 = 139   
+               saldta( mi0(ii0):mi1(ii1), mj0(ij0):mj1(ij1) , : , : ) =   &
+                  &                                    saldta( mi0(il0):mi1(il1) , mj0(ij0):mj1(ij1) , : , : )
+               ij0 = 101   ;   ij1 = 101
+               saldta( mi0(ii0):mi1(ii1), mj0(ij0):mj1(ij1) , : , : ) =   &
+                  &                                    saldta( mi0(il0):mi1(il1) , mj0(ij0):mj1(ij1) , : , : )
+               il0 = 138   ;   il1 = 138   
+               ij0 = 101   ;   ij1 = 102
+               ii0 = 139   ;   ii1 = 139   
+               DO jl = mi0(ii0), mi1(ii1)                ! New salinity profile at Gibraltar
+                  DO jj = mj0(ij0), mj1(ij1)
+                     DO ji = mi0(ii0), mi1(ii1)
                         saldta(ji,jj,:,:) = saldta(jl,jj,:,:)
                      END DO
@@ -217 +226 @@
                END DO
 
-               DO jl = mi0(164), mi1(164)                ! New salinity profile at Bab el Mandeb
-                  DO jj = mj0(88), mj1(88)
-                     DO ji = mi0(161), mi1(163)
+               il0 = 164   ;   il1 = 164   
+               ij0 =  88   ;   ij1 =  88
+               ii0 = 161   ;   ii1 = 163   
+               DO jl = mi0(ii0), mi1(ii1)                ! New salinity profile at Bab el Mandeb
+                  DO jj = mj0(ij0), mj1(ij1)
+                     DO ji = mi0(ii0), mi1(ii1)
                         saldta(ji,jj,:,:) = saldta(jl,jj,:,:)
                      END DO
                   END DO
-                  DO jj = mj0(87), mj1(87)
-                     DO ji = mi0(161), mi1(163)
+                  ij0 =  87   ;   ij1 =  87
+                  DO jj = mj0(ij0), mj1(ij1)
+                     DO ji = mi0(ii0), mi1(ii1)
                         saldta(ji,jj,:,:) = saldta(jl,jj,:,:)
                      END DO
@@ -280 +293 @@
    !!   Default option:                                    NO salinity data
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dtasal = .FALSE.   ! salinity data flag
+   LOGICAL , PUBLIC, PARAMETER ::   lk_dtasal = .FALSE.   !: salinity data flag
 CONTAINS
    SUBROUTINE dta_sal( kt )        ! Empty routine
-      WRITE(*,*) kt
+      WRITE(*,*) 'dta_sal: You should not have seen this print! error?', kt
    END SUBROUTINE dta_sal
 #endif