Changeset 888 for trunk/NEMO/OPA_SRC/TRD

Timestamp:

2008-04-11T19:05:03+02:00 (16 years ago)

Author:

ctlod

Message:

merge dev_001_SBC branche with the trunk to include the New Surface Module package, see ticket: #113

File:

• trunk/NEMO/OPA_SRC/TRD/trdmod.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -12 +12 @@
    !!   trd_mod_init     : Initialization step
    !!----------------------------------------------------------------------
-   USE phycst                  ! physical constants
    USE oce                     ! ocean dynamics and tracers variables
    USE dom_oce                 ! ocean space and time domain variables
@@ -18 +17 @@
    USE trdmod_oce              ! ocean variables trends
    USE ldftra_oce              ! ocean active tracers lateral physics
+   USE sbc_oce                 ! surface boundary condition: ocean
+   USE phycst                  ! physical constants
    USE trdvor                  ! ocean vorticity trends 
    USE trdicp                  ! ocean bassin integral constraints properties
    USE trdmld                  ! ocean active mixed layer tracers trends 
    USE in_out_manager          ! I/O manager
-   USE taumod                  ! surface ocean stress
 
    IMPLICIT NONE
@@ -37 +37 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -124 +124 @@
                   DO ji = fs_2, fs_jpim1   ! vector opt.
                      ! save the surface forcing momentum fluxes
-                     ztswu(ji,jj) = taux(ji,jj) / ( fse3u(ji,jj,1)*rau0 )
-                     ztswv(ji,jj) = tauy(ji,jj) / ( fse3v(ji,jj,1)*rau0 )
+                     ztswu(ji,jj) = utau(ji,jj) / ( fse3u(ji,jj,1)*rau0 )
+                     ztswv(ji,jj) = vtau(ji,jj) / ( fse3v(ji,jj,1)*rau0 )
                      ! save bottom friction momentum fluxes
                      ikbu   = MIN( mbathy(ji+1,jj  ), mbathy(ji,jj) )
@@ -175 +175 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   ! save the surface forcing momentum fluxes
-                  ztswu(ji,jj) = taux(ji,jj) / ( fse3u(ji,jj,1)*rau0 )
-                  ztswv(ji,jj) = tauy(ji,jj) / ( fse3v(ji,jj,1)*rau0 )
+                  ztswu(ji,jj) = utau(ji,jj) / ( fse3u(ji,jj,1)*rau0 )
+                  ztswv(ji,jj) = vtau(ji,jj) / ( fse3v(ji,jj,1)*rau0 )
                   ! save bottom friction momentum fluxes
                   ikbu   = MIN( mbathy(ji+1,jj  ), mbathy(ji,jj) )