Changeset 918 for trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2008-05-09T12:00:09+02:00 (16 years ago)

Author:

rblod

Message:

Change ice_ocean stress computation, step II, see ticket #128

File:

• trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -72 +72 @@
 CONTAINS
 
-   SUBROUTINE sbc_ice_lim( kt, kblk )
+   SUBROUTINE sbc_ice_lim( kt, kblk, kico )
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE sbc_ice_lim  ***
@@ -94 +94 @@
       INTEGER, INTENT(in) ::   kt      ! ocean time step
       INTEGER, INTENT(in) ::   kblk    ! type of bulk (=3 CLIO, =4 CORE)
+      INTEGER, INTENT(in) ::   kico    ! type of ice-ocean stress
       !!
       INTEGER  ::   ji, jj, jk, jl     ! dummy loop indices
@@ -301 +302 @@
          ! Fluxes of mass and heat to the ocean |
          !--------------------------------------|
-                         CALL lim_sbc( kt )              ! Ice/Ocean Mass & Heat fluxes 
+                         CALL lim_sbc_flx( kt )           ! Ice/Ocean heat freshwater/salt fluxes
+         IF( ln_limdyn .AND. kico == 0 )   &              ! Ice/Ocean stresses (only in ice-dynamic case)
+            &            CALL lim_sbc_tau( kt, kico )     ! otherwise the atm.-ocean stresses are used everywhere
+
                          !+++++
                          WRITE(numout,*) ' - Final ice state after lim_flx    '