Changeset 34 for trunk/NEMO/OPA_SRC

Timestamp:

2004-02-17T16:07:07+01:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX016 : Compilation error is solved

Location:

trunk/NEMO/OPA_SRC/TRA

Files:

• traldf_iso.F90 (modified) (3 diffs)
• trazdf_iso.F90 (modified) (5 diffs)
• trazdf_iso_vopt.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/TRA/traldf_iso.F90

@@ -83 +83 @@
          zabe1, zabe2, zcof1, zcof2,   &  ! temporary scalars
          zmsku, zmskv, zbtr, zta, zsa, &
+#if defined key_traldf_eiv
          zcg1, zcg2, zuwk, zvwk,       &
          zuwk1, zvwk1,                 &
+#endif
          ztagu, ztagv, zsagu, zsagv
       REAL(wp), DIMENSION(jpi,jpj) ::   &
          zdkt, zdk1t,      &  ! workspace
-         zdks, zdk1s,      &
-         zftug, zftvg,                 &
+         zdks, zdk1s
+#if defined key_traldf_eiv
+      REAL(wp), DIMENSION(jpi,jpj) ::   &
+         zftug, zftvg,                  &
          zfsug, zfsvg
+#endif
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
          zftv, zfsv                       ! workspace
@@ -164 +169 @@
          END DO
 
+#   if defined key_traldf_eiv
          !                              ! ---------------------------------------!
-         IF( lk_traldf_eiv ) THEN       ! Eddy induced vertical advective fluxes !
-            !                           ! ---------------------------------------!
+         !                              ! Eddy induced vertical advective fluxes !
+         !                              ! ---------------------------------------!
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -192 +198 @@
                END DO
             END DO
-         ENDIF
+#   endif
 
          ! II.4 Second derivative (divergence) and add to the general trend

trunk/NEMO/OPA_SRC/TRA/trazdf_iso.F90

@@ -126 +126 @@
          ztavg, zsavg,          &  ! ???
          zcoef0, zcoef3,        &  ! ???
-         zcoef4, zcoeg3, zavi,  &  ! ???
+         zcoef4, zavi,          &  ! ???
          zbtr, zmku, zmkv,      &  !
-         zuwki, zvwki, zuwk,    &  !
-         zvwk, ztav, zsav
+         ztav, zsav
       REAL(wp), DIMENSION(jpi,jpk) ::   &
          zwd, zws, zwi,         &  ! ???
@@ -136 +135 @@
          ztfw, zdit, zdjt, zdj1t,   &
          zsfw, zdis, zdjs, zdj1s,   &
-         zavt, zavs
+         zavt
 #if defined key_traldf_eiv   ||   defined key_esopa
       REAL(wp), DIMENSION(jpi,jpk) ::   &
-         ztfwg, zsfwg
+         ztfwg, zsfwg, zcoeg3,          &
+         zuwk, zvwk,                    &
+         zuwki, zvwki, zavs
 #endif
       !!---------------------------------------------------------------------
@@ -219 +220 @@
          ztfw(:,jpk) = 0.e0
          zsfw(:,jpk) = 0.e0
-         IF( lk_traldf_eiv ) THEN
-            ztfwg(:, 1 ) = 0.e0
-            zsfwg(:, 1 ) = 0.e0
-            ztfwg(:,jpk) = 0.e0
-            zsfwg(:,jpk) = 0.e0
-         ENDIF
+#if defined key_traldf_eiv
+         ztfwg(:, 1 ) = 0.e0
+         zsfwg(:, 1 ) = 0.e0
+         ztfwg(:,jpk) = 0.e0
+         zsfwg(:,jpk) = 0.e0
+#endif
 
          ! interior (2=<jk=<jpk-1)
@@ -276 +277 @@
          END DO
 
+#if defined key_traldf_eiv
          !                              ! ---------------------------------------!
-         IF( lk_traldf_eiv ) THEN       ! Eddy induced vertical advective fluxes !
-            !                           ! ---------------------------------------!
+         !                              ! Eddy induced vertical advective fluxes !
+         !                              ! ---------------------------------------!
 #if defined key_traldf_c2d || defined key_traldf_c3d
             DO jk = 2, jpkm1
@@ -330 +332 @@
             END DO
 #endif
-         ENDIF
+
+#endif
 
          ! I.5 Divergence of vertical fluxes added to the general tracer trend

trunk/NEMO/OPA_SRC/TRA/trazdf_iso_vopt.F90

@@ -506 +506 @@
          ztavg, zsavg,           &  ! temporary scalars
          zcoef0, zcoef3,         &  !    "         "
-         zcoef4, zcoeg3,         &  !    "         "
-         zbtr, zmku, zmkv  ,     &  !    "         "
-         zuwki, zvwki, zuwk,     &  !    "         "
-         zvwk, ztav, zsav
+         zcoef4,                 &  !    "         "
+         zbtr, zmku, zmkv,       &  !    "         "
+#if defined key_traldf_eiv
+         zcoeg3,                 &  !    "         "
+         zuwki, zvwki,           &  !    "         "
+         zuwk, zsav,             &  !    "         "
+#endif
+         zvwk, ztav
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
          zwz, zwt, ztfw, zsfw       ! temporary workspace arrays
@@ -604 +608 @@
       END DO
 
+#if defined key_traldf_eiv
       !                              ! ---------------------------------------!
-      IF( lk_traldf_eiv ) THEN       ! Eddy induced vertical advective fluxes !
-         !                           ! ---------------------------------------!
+      !                              ! Eddy induced vertical advective fluxes !
+      !                              ! ---------------------------------------!
          zwx(:,:, 1 ) = 0.e0
          zwy(:,:, 1 ) = 0.e0
@@ -650 +655 @@
             END DO
          END DO
-      ENDIF
+#endif
 
       ! I.5 Divergence of vertical fluxes added to the general tracer trend