Changeset 1129 for trunk/NEMO/OPA_SRC/DYN

Timestamp:

2008-06-24T08:45:37+02:00 (16 years ago)

Author:

ctlod

Message:

trunk: compilation error when key_trddyn is active related to the dynamics advection flux formulation, see ticket: #211

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• dynadv_cen2.F90 (modified) (6 diffs)
• dynadv_ubs.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/DYN/dynadv_cen2.F90

@@ -16 +16 @@
    USE dynspg_oce     ! surface pressure gradient
    USE in_out_manager ! I/O manager
-   USE dynspg_rl     ! I/O manager
+   USE dynspg_rl      ! surface pressure gradient
+   USE trdmod         ! ocean dynamics trends
+   USE trdmod_oce     ! ocean variables trends
+   USE prtctl         ! Print control
 
    IMPLICIT NONE
@@ -45 +48 @@
       !!
       !! ** Action : - Update (ua,va) with the now vorticity term trend
-      !!             - save the trends in (utrd,vtrd) in 2 parts (relative
-      !!               and planetary vorticity trends) ('key_trddyn')
       !!----------------------------------------------------------------------
       USE oce, ONLY:   zfu => ta,   & ! use ta as 3D workspace
@@ -66 +67 @@
       ENDIF
 
+      IF( l_trddyn ) THEN           ! Save ua and va trends
+         zfu_uw(:,:,:) = ua(:,:,:)
+         zfv_vw(:,:,:) = va(:,:,:)
+      ENDIF
 
       ! I. Horizontal advection
@@ -99 +104 @@
                ua(ji,jj,jk) = ua(ji,jj,jk) + zua
                va(ji,jj,jk) = va(ji,jj,jk) + zva
-#if defined key_trddyn
-               utrd(ji,jj,jk,1) = zua                    ! save the horizontal advective trend of momentum
-               vtrd(ji,jj,jk,1) = zva 
-#endif
             END DO
          END DO
@@ -109 +110 @@
       !                                                ! ===============
 
+      IF( l_trddyn ) THEN      ! save the horizontal advection trend for diagnostic
+         zfu_uw(:,:,:) = ua(:,:,:) - zfu_uw(:,:,:)
+         zfv_vw(:,:,:) = va(:,:,:) - zfv_vw(:,:,:)
+         CALL trd_mod( zfu_uw, zfv_vw, jpdyn_trd_had, 'DYN', kt )
+      ENDIF
+      !
 
       ! II. Vertical advection
       ! ----------------------
+
+      IF( l_trddyn ) THEN           ! Save ua and va trends
+         zfu_t(:,:,:) = ua(:,:,:)
+         zfv_t(:,:,:) = va(:,:,:)
+      ENDIF
 
       ! Second order centered tracer flux at w-point
@@ -159 +171 @@
       END DO
 
+      IF( l_trddyn ) THEN      ! save the vertical advection trend for diagnostic
+         zfu_t(:,:,:) = ua(:,:,:) - zfu_t(:,:,:)
+         zfv_t(:,:,:) = va(:,:,:) - zfv_t(:,:,:)
+         CALL trd_mod( zfu_t, zfv_t, jpdyn_trd_zad, 'DYN', kt )
+      ENDIF
+
+      !                             ! Control print
+      IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' cen2 adv - Ua: ', mask1=umask,   &
+         &                       tab3d_2=va, clinfo2=           ' Va: ', mask2=vmask, clinfo3='dyn' )
+      !
    END SUBROUTINE dyn_adv_cen2
 

trunk/NEMO/OPA_SRC/DYN/dynadv_ubs.F90

@@ -17 +17 @@
    USE dynspg_oce     ! surface pressure gradient
    USE in_out_manager ! I/O manager
-   USE dynspg_rl      ! I/O manager
+   USE dynspg_rl      ! surface pressure gradient
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
+   USE trdmod         ! ocean dynamics trends
+   USE trdmod_oce     ! ocean variables trends
+   USE prtctl         ! Print control
 
    IMPLICIT NONE
@@ -97 +100 @@
       zlv_vu(:,:,:,:) = 0.e0 
 
-      
+      IF( l_trddyn ) THEN           ! Save ua and va trends
+         zfu_uw(:,:,:) = ua(:,:,:)
+         zfv_vw(:,:,:) = va(:,:,:)
+      ENDIF
+
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -191 +198 @@
                ua(ji,jj,jk) = ua(ji,jj,jk) + zua
                va(ji,jj,jk) = va(ji,jj,jk) + zva
-#if defined key_trddyn
-               utrd(ji,jj,jk,1) = zua                    ! save the horizontal advective trend of momentum
-               vtrd(ji,jj,jk,1) = zva 
-#endif
             END DO
          END DO
@@ -201 +204 @@
       !                                                ! ===============
 
+      IF( l_trddyn ) THEN      ! save the horizontal advection trend for diagnostic
+         zfu_uw(:,:,:) = ua(:,:,:) - zfu_uw(:,:,:)
+         zfv_vw(:,:,:) = va(:,:,:) - zfv_vw(:,:,:)
+         CALL trd_mod( zfu_uw, zfv_vw, jpdyn_trd_had, 'DYN', kt )
+      ENDIF
 
       ! II. Vertical advection
       ! ----------------------
+
+      IF( l_trddyn ) THEN           ! Save ua and va trends
+         zfu_t(:,:,:) = ua(:,:,:)
+         zfv_t(:,:,:) = va(:,:,:)
+      ENDIF
 
       ! Second order centered tracer flux at w-point
@@ -251 +264 @@
       END DO
 
+      IF( l_trddyn ) THEN      ! save the vertical advection trend for diagnostic
+         zfu_t(:,:,:) = ua(:,:,:) - zfu_t(:,:,:)
+         zfv_t(:,:,:) = va(:,:,:) - zfv_t(:,:,:)
+         CALL trd_mod( zfu_t, zfv_t, jpdyn_trd_zad, 'DYN', kt )
+      ENDIF
+
+      !                             ! Control print
+      IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' ubs2 adv - Ua: ', mask1=umask,   &
+         &                       tab3d_2=va, clinfo2=           ' Va: ', mask2=vmask, clinfo3='dyn' )
+
    END SUBROUTINE dyn_adv_ubs