Changeset 455 for trunk/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

Timestamp:

2006-05-10T18:53:54+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_048:RB: reorganization of dynamics part, in addition change atsk to jki, suppress dynhpg_atsk.F90 dynzdf_imp_atsk.F90 dynzdf_iso.F90

File:

• trunk/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

@@ -20 +20 @@
    USE in_out_manager  ! I/O manager
    USE taumod          ! surface ocean stress
-   USE trdmod          ! ocean dynamics trends 
-   USE trdmod_oce      ! ocean variables trends
    USE prtctl          ! Print control
 
@@ -60 +58 @@
       !! ** Action : - Update (ua,va) arrays with the after vertical diffusive
       !!               mixing trend.
-      !!             - Save the trends in (ztdua,ztdva) ('l_trddyn')
       !!
       !! History :
@@ -76 +73 @@
 
       !! * Local declarations
-      INTEGER ::   &
-         ji, jj, jk,                  &  ! dummy loop indices
-         ikbu, ikbum1, ikbv, ikbvm1      ! temporary integers
+      INTEGER ::   ji, jj, jk            ! dummy loop indices
       REAL(wp) ::   &
          zrau0r, z2dt,                &  ! temporary scalars
          z2dtf, zcoef, zzws, zrhs        !    "         "
-      REAL(wp), DIMENSION(jpi,jpj) ::   &
-         ztsx, ztsy, ztbx, ztby          ! temporary workspace arrays
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
-         zwi, ztdua, ztdva               ! temporary workspace arrays
+         zwi                             ! temporary workspace arrays
       !!----------------------------------------------------------------------
 
@@ -98 +91 @@
       zrau0r = 1. / rau0      ! inverse of the reference density
       z2dt   = 2. * rdt       ! Leap-frog environnement
-      ztsx(:,:) = 0.e0
-      ztsy(:,:) = 0.e0 
-      ztbx(:,:) = 0.e0
-      ztby(:,:) = 0.e0
+
       ! Euler time stepping when starting from rest
       IF( neuler == 0 .AND. kt == nit000 )   z2dt = rdt
-
-      ! Save previous ua and va trends
-      IF( l_trddyn )   THEN
-         ztdua(:,:,:) = ua(:,:,:) 
-         ztdva(:,:,:) = va(:,:,:) 
-      ENDIF
 
       ! 1. Vertical diffusion on u
@@ -194 +178 @@
          END DO
       END DO
-
-      IF( l_trddyn )  THEN 
-         ! diagnose surface and bottom momentum fluxes
-         DO jj = 2, jpjm1   
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               ! save the surface forcing momentum fluxes
-               ztsx(ji,jj) = taux(ji,jj) / ( fse3u(ji,jj,1)*rau0 )
-               ! save bottom friction momentum fluxes
-               ikbu   = MIN( mbathy(ji+1,jj), mbathy(ji,jj) )
-               ikbum1 = MAX( ikbu-1, 1 )
-               ztbx(ji,jj) = - avmu(ji,jj,ikbu) * ua(ji,jj,ikbum1)   &
-                  / ( fse3u(ji,jj,ikbum1)*fse3uw(ji,jj,ikbu) )
-               ! subtract surface forcing and bottom friction trend from vertical
-               ! diffusive momentum trend
-               ztdua(ji,jj,1     ) = ztdua(ji,jj,1     ) - ztsx(ji,jj)
-               ztdua(ji,jj,ikbum1) = ztdua(ji,jj,ikbum1) - ztbx(ji,jj)
-            END DO
-         END DO
-      ENDIF
 
       ! Normalization to obtain the general momentum trend ua
@@ -309 +274 @@
       END DO
 
-      IF( l_trddyn )  THEN 
-         ! diagnose surface and bottom momentum fluxes
-         DO jj = 2, jpjm1   
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               ! save the surface forcing momentum fluxes
-               ztsy(ji,jj) = tauy(ji,jj) / ( fse3v(ji,jj,1)*rau0 )
-               ! save bottom friction momentum fluxes
-               ikbv   = MIN( mbathy(ji,jj+1), mbathy(ji,jj) )
-               ikbvm1 = MAX( ikbv-1, 1 )
-               ztby(ji,jj) = - avmv(ji,jj,ikbv) * va(ji,jj,ikbvm1)   &
-                  / ( fse3v(ji,jj,ikbvm1)*fse3vw(ji,jj,ikbv) )
-               ! subtract surface forcing and bottom friction trend from vertical
-               ! diffusive momentum trend
-               ztdva(ji,jj,1     ) = ztdva(ji,jj,1     ) - ztsy(ji,jj)
-               ztdva(ji,jj,ikbvm1) = ztdva(ji,jj,ikbvm1) - ztby(ji,jj)
-            END DO
-         END DO
-      ENDIF
+! flux de surface doit etre calcule dans trdmod et boootom stress
+! deduit par integration verticale dans trmod pour jpdtdzdf
+!RB      IF( l_trddyn )  THEN 
+!         ! diagnose surface and bottom momentum fluxes
+!         DO jj = 2, jpjm1   
+!            DO ji = fs_2, fs_jpim1   ! vector opt.
+!               ! save the surface forcing momentum fluxes
+!               ztsy(ji,jj) = tauy(ji,jj) / ( fse3v(ji,jj,1)*rau0 )
+!               ztsx(ji,jj) = taux(ji,jj) / ( fse3u(ji,jj,1)*rau0 )
+!               ! save bottom friction momentum fluxes
+!               ikbv   = MIN( mbathy(ji,jj+1), mbathy(ji,jj) )
+!               ikbvm1 = MAX( ikbv-1, 1 )
+!               ztby(ji,jj) = - avmv(ji,jj,ikbv) * va(ji,jj,ikbvm1)   &
+!                  / ( fse3v(ji,jj,ikbvm1)*fse3vw(ji,jj,ikbv) )
+!               ! subtract surface forcing and bottom friction trend from vertical
+!               ! diffusive momentum trend
+!               ztdva(ji,jj,1     ) = ztdva(ji,jj,1     ) - ztsy(ji,jj)
+!               ztdva(ji,jj,ikbvm1) = ztdva(ji,jj,ikbvm1) - ztby(ji,jj)
+!            END DO
+!         END DO
+!      ENDIF
 
       ! Normalization to obtain the general momentum trend va
@@ -337 +305 @@
       END DO
 
-      ! save the vertical diffusion trends for diagnostic
-      ! momentum trends
-      IF( l_trddyn )  THEN 
-         ztdua(:,:,:) = ua(:,:,:) - ztdua(:,:,:)
-         ztdva(:,:,:) = va(:,:,:) - ztdva(:,:,:)
-
-         CALL trd_mod(ztdua, ztdva, jpdtdzdf, 'DYN', kt)
-         ztdua(:,:,:) = 0.e0
-         ztdva(:,:,:) = 0.e0
-         ztdua(:,:,1) = ztsx(:,:)
-         ztdva(:,:,1) = ztsy(:,:)
-         CALL trd_mod(ztdua , ztdva , jpdtdswf, 'DYN', kt)
-         ztdua(:,:,:) = 0.e0
-         ztdva(:,:,:) = 0.e0
-         ztdua(:,:,1) = ztbx(:,:)
-         ztdva(:,:,1) = ztby(:,:)
-         CALL trd_mod(ztdua , ztdva , jpdtdbfr, 'DYN', kt)
-      ENDIF
-
-      IF(ln_ctl) THEN         ! print sum trends (used for debugging)
-         CALL prt_ctl(tab3d_1=ua, clinfo1=' zdf  - Ua: ', mask1=umask, &
-            &         tab3d_2=va, clinfo2=' Va: ', mask2=vmask, clinfo3='dyn')
-      ENDIF
-
    END SUBROUTINE dyn_zdf_imp