Changeset 888 for trunk/NEMO/C1D_SRC/icestp1d.F90

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/C1D_SRC/icestp1d.F90 (modified) (7 diffs)

trunk/NEMO/C1D_SRC/icestp1d.F90

@@ -6 +6 @@
    !! History :   9.0  !  04-10  (C. Ethe)  from icestp, 1D configuration
    !!----------------------------------------------------------------------
-#if defined key_cfg_1d && defined key_lim3
+#if defined key_cfg_1d && ( defined key_lim3 || defined key_lim2 )
    !!----------------------------------------------------------------------
    !!   'key_cfg_1d'  .AND.                                1D Configuration
-   !!   'key_lim3'                                     Lim sea-ice model
+   !!   'key_lim2' OR 'key_lim3' :             LIM 2.0 or 3.0 sea-ice model
    !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
@@ -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 cpl_oce         ! coupled ocean-atmosphere variables
-   USE blk_oce         ! bulk variables
+   USE dom_ice_2       ! LIM sea-ice domain
+   USE sbc_oce         ! surface boundary condition: ocean
+   USE sbc_ice         ! surface boundary condition: ice
    USE daymod          ! calendar
    USE phycst          ! Define parameters for the routines
-   USE taumod          ! surface stress forcing
-   USE ice             ! ice variables
+   USE ice_2           ! 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 limthd_2
+   USE limwri_2
+   USE limrst_2
+
    USE tradmp          ! damping salinity trend
    USE dtatem          ! ocean temperature data
@@ -52 +46 @@
    !!----------------------------------------------------------------------
    !!   LIM 2.0 , UCL-LOCEAN-IPSL (2006) 
-   !! $Header$ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -109 +103 @@
          u_io  (:,:) = u_io  (:,:) / FLOAT( nfice )
          v_io  (:,:) = v_io  (:,:) / FLOAT( nfice )
-         gtaux (:,:) = taux  (:,:)
-         gtauy (:,:) = tauy  (:,:)
+         gtaux (:,:) = utau  (:,:)
+         gtauy (:,:) = vtau  (:,:)
 
          zsss_io (:,:) = SQRT( sss_io(:,:) ) 
@@ -220 +214 @@
       IF( kt == nit000 ) THEN     
          qsr    (:,:) = 0.e0
-         qt     (:,:) = 0.e0
+         qns    (:,:) = 0.e0
          qrp    (:,:) = 0.e0
          emp    (:,:) = 0.e0
@@ -238 +232 @@
       ! -----------------
       
-      qt  (:,:) = fnsolar(:,:) + fsolar(:,:)     ! non solar heat flux + solar flux
+      qns (:,:) = fnsolar(:,:)                    ! non solar heat flux
       qsr (:,:) = fsolar(:,:)                     ! solar flux
       
@@ -261 +255 @@
          DO ji = 1, fs_jpim1   ! vertor opt.
             ztxy        = freezn(ji,jj)             ! ice/ocean indicator at T-points
-            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. )
+            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. )
       
       ! Re-initialization of fluxes