Changeset 6772 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_crs.F90

Timestamp:

2016-07-01T18:02:45+02:00 (8 years ago)

Author:

cbricaud

Message:

clean in coarsening branch

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_crs.F90 (modified) (6 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_crs.F90

@@ -10 +10 @@
    !!            3.3  !  2010-09  (C. Ethe, G. Madec) Merge TRA-TRC
    !!----------------------------------------------------------------------
-#if   defined key_ldfslp   ||   defined key_esopa
+#if   ( defined key_ldfslp   ||   defined key_esopa ) && defined key_crs
    !!----------------------------------------------------------------------
    !!   'key_ldfslp'               slope of the lateral diffusive direction
@@ -19 +19 @@
    !!                  the isopycnal or geopotential s-coord. operator 
    !!----------------------------------------------------------------------
-!   USE oce             ! ocean dynamics and active tracers
-!   USE dom_oce         ! ocean space and time domain
-!   USE trc_oce         ! share passive tracers/Ocean variables
-!   USE zdf_oce         ! ocean vertical physics
-!   USE ldftra_oce      ! ocean active tracers: lateral physics
-!   USE ldfslp          ! iso-neutral slopes
    USE ldfslp_crs          ! iso-neutral slopes
    USE diaptr          ! poleward transport diagnostics
@@ -35 +29 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
-!   USE crs
    USE oce_trc
    USE iom, ONLY : iom_put,iom_swap
@@ -113 +106 @@
       REAL(wp)                         ::   zztmp               ! local scalar
 #endif
+      REAL(wp)                         ::   zmin,zmax
       REAL(wp), POINTER, DIMENSION(:,:  ) ::  zdkt, zdk1t, z2d
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zdit, zdjt, ztfw , zftu,  zftv 
@@ -188 +182 @@
                      &             + tmask_crs(ji,jj+1,jk+1) + tmask_crs(ji,jj,jk  ), 1. )
                   !
-                  zcof1 = - fsahtu(ji,jj,jk) * e2e3u_msk(ji,jj,jk) * uslp_crs(ji,jj,jk) * zmsku / MAX( 1._wp , e3u_max_crs(ji,jj,jk))
-                  zcof2 = - fsahtv(ji,jj,jk) * e1e3v_msk(ji,jj,jk) * vslp_crs(ji,jj,jk) * zmskv / MAX( 1._wp , e3v_max_crs(ji,jj,jk))
+                  zcof1 = - fsahtu(ji,jj,jk) * e2e3u_msk(ji,jj,jk) * uslp_crs(ji,jj,jk) * zmsku / MAX( 1._wp , fse3u_max_crs(ji,jj,jk))
+                  zcof2 = - fsahtv(ji,jj,jk) * e1e3v_msk(ji,jj,jk) * vslp_crs(ji,jj,jk) * zmskv / MAX( 1._wp , fse3v_max_crs(ji,jj,jk))
                   !
                   zftu(ji,jj,jk ) = ( zabe1 * zdit(ji,jj,jk)   &
@@ -199 +193 @@
                END DO
             END DO
-            CALL iom_swap( "nemo_crs"  )
-            CALL iom_put( "zftu" , zftu )
-            CALL iom_put( "zftv" , zftv )
-            CALL iom_swap( "nemo" )
 
             ! II.4 Second derivative (divergence) and add to the general trend