Changeset 719 for trunk/NEMO/C1D_SRC/step1d.F90

Timestamp:

2007-10-16T16:59:56+02:00 (17 years ago)

Author:

ctlod

Message:

get back to the nemo_v2_3 version for trunk

File:

• trunk/NEMO/C1D_SRC/step1d.F90 (modified) (4 diffs, 1 prop)

trunk/NEMO/C1D_SRC/step1d.F90

@@ -15 +15 @@
    USE dom_oce         ! ocean space and time domain variables 
    USE zdf_oce         ! ocean vertical physics variables
-   USE sbc_oce         ! surface boundary condition: ocean
    USE ldftra_oce
    USE ldfdyn_oce
@@ -25 +24 @@
    USE dtatem          ! ocean temperature data           (dta_tem routine)
    USE dtasal          ! ocean salinity    data           (dta_sal routine)
+   USE dtasst          ! ocean sea surface temerature     (dta_sst routine)
+   USE taumod          ! surface stress                   (tau     routine)
+   USE flxmod          ! thermohaline fluxes              (flx     routine)
+   USE ocesbc          ! thermohaline fluxes              (oce_sbc routine)
+   USE flxrnf          ! runoffs                          (flx_rnf routine)
+   USE flxfwb          ! freshwater budget correction     (flx_fwb routine)
    USE ocfzpt          ! surface ocean freezing point    (oc_fz_pt routine)
 
@@ -70 +75 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
@@ -152 +157 @@
          CALL prt_ctl(tab2d_1=emp    , clinfo1=' emp  -   : ', mask1=tmask, ovlap=1)
          CALL prt_ctl(tab2d_1=emps   , clinfo1=' emps -   : ', mask1=tmask, ovlap=1)
-         CALL prt_ctl(tab2d_1=qns    , clinfo1=' qns  -   : ', mask1=tmask, ovlap=1)
+         CALL prt_ctl(tab2d_1=qt     , clinfo1=' qt   -   : ', mask1=tmask, ovlap=1)
          CALL prt_ctl(tab2d_1=qsr    , clinfo1=' qsr  -   : ', mask1=tmask, ovlap=1)
+         CALL prt_ctl(tab2d_1=runoff , clinfo1=' runoff   : ', mask1=tmask, ovlap=1)
          CALL prt_ctl(tab3d_1=tmask  , clinfo1=' tmask    : ', mask1=tmask, ovlap=1, kdim=jpk)
          CALL prt_ctl(tab3d_1=tn     , clinfo1=' sst  -   : ', mask1=tmask, ovlap=1, kdim=1)
          CALL prt_ctl(tab3d_1=sn     , clinfo1=' sss  -   : ', mask1=tmask, ovlap=1, kdim=1)
-         CALL prt_ctl(tab2d_1=utau   , clinfo1=' tau  - u : ', mask1=umask, &
-            &         tab2d_2=vtau   , clinfo2='      - v : ', mask2=vmask, ovlap=1)
+         CALL prt_ctl(tab2d_1=taux   , clinfo1=' tau  - x : ', mask1=umask, &
+            &         tab2d_2=tauy   , clinfo2='      - y : ', mask2=vmask, ovlap=1)
       ENDIF