Changeset 719 for trunk/NEMO/C1D_SRC/icestp1d.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/icestp1d.F90 (modified) (6 diffs, 1 prop)

trunk/NEMO/C1D_SRC/icestp1d.F90

@@ -18 +18 @@
    USE in_out_manager  ! I/O manager
    USE ice_oce         ! ice variables
+   USE flx_oce         ! forcings variables
    USE dom_ice         ! LIM sea-ice domain
-   USE sbc_oce         ! surface boundary condition: ocean
-   USE sbc_ice         ! surface boundary condition: ice
+   USE cpl_oce         ! coupled ocean-atmosphere variables
+   USE blk_oce         ! bulk variables
    USE daymod          ! calendar
    USE phycst          ! Define parameters for the routines
+   USE taumod          ! surface stress forcing
    USE ice             ! ice variables
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE limthd
+   USE limflx
    USE limwri
    USE limrst
 
+   USE ocesbc          ! thermohaline fluxes
+   USE flxmod          ! thermohaline forcing
+   USE flxrnf          ! runoffs forcing
    USE tradmp          ! damping salinity trend
    USE dtatem          ! ocean temperature data
@@ -46 +52 @@
    !!----------------------------------------------------------------------
    !!   LIM 2.0 , UCL-LOCEAN-IPSL (2006) 
-   !! $Id$
+   !! $Header$ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -103 +109 @@
          u_io  (:,:) = u_io  (:,:) / FLOAT( nfice )
          v_io  (:,:) = v_io  (:,:) / FLOAT( nfice )
-         gtaux (:,:) = utau  (:,:)
-         gtauy (:,:) = vtau  (:,:)
+         gtaux (:,:) = taux  (:,:)
+         gtauy (:,:) = tauy  (:,:)
 
          zsss_io (:,:) = SQRT( sss_io(:,:) ) 
@@ -214 +220 @@
       IF( kt == nit000 ) THEN     
          qsr    (:,:) = 0.e0
-         qns    (:,:) = 0.e0
+         qt     (:,:) = 0.e0
          qrp    (:,:) = 0.e0
          emp    (:,:) = 0.e0
@@ -232 +238 @@
       ! -----------------
       
-      qns (:,:) = fnsolar(:,:)                    ! non solar heat flux
+      qt  (:,:) = fnsolar(:,:) + fsolar(:,:)     ! non solar heat flux + solar flux
       qsr (:,:) = fsolar(:,:)                     ! solar flux
       
@@ -255 +261 @@
          DO ji = 1, fs_jpim1   ! vertor opt.
             ztxy        = freezn(ji,jj)             ! ice/ocean indicator at T-points
-            utau(ji,jj) = (1.-ztxy) * utau(ji,jj) + ztxy * ftaux(ji,jj)    ! stress at the ocean surface
-            vtau(ji,jj) = (1.-ztxy) * vtau(ji,jj) + ztxy * ftauy(ji,jj)
-         END DO
-      END DO
-      
-      ! boundary condition on the stress (utau,vtau)
-      CALL lbc_lnk( utau, 'U', -1. )
-      CALL lbc_lnk( vtau, 'V', -1. )
+            taux(ji,jj) = (1.-ztxy) * taux(ji,jj) + ztxy * ftaux(ji,jj)    ! stress at the ocean surface
+            tauy(ji,jj) = (1.-ztxy) * tauy(ji,jj) + ztxy * ftauy(ji,jj)
+         END DO
+      END DO
+      
+      ! boundary condition on the stress (taux,tauy)
+      CALL lbc_lnk( taux, 'U', -1. )
+      CALL lbc_lnk( tauy, 'V', -1. )
       
       ! Re-initialization of fluxes