Changeset 888 for trunk/NEMO/LIM_SRC_3/limthd_sal.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/LIM_SRC_3/limthd_sal.F90 (modified) (7 diffs)

trunk/NEMO/LIM_SRC_3/limthd_sal.F90

@@ -1 +1 @@
 MODULE limthd_sal
-#if defined key_lim3
    !!----------------------------------------------------------------------
    !!   'key_lim3'                                      LIM3 sea-ice model
@@ -9 +8 @@
    !!                               the ice
    !!======================================================================
-
+#if defined key_lim3
    !!----------------------------------------------------------------------
    !!   lim_thd_sal : salinity variations in the ice
@@ -16 +15 @@
    USE phycst           ! physical constants (ocean directory)
    USE ice_oce          ! ice variables
+   USE sbc_oce          ! Surface boundary condition: ocean fields
    USE thd_ice
    USE iceini
@@ -40 +40 @@
    CONTAINS
 
-   SUBROUTINE lim_thd_sal(kideb,kiut,jl)
+   SUBROUTINE lim_thd_sal(kideb,kiut)
       !!-------------------------------------------------------------------
       !!                ***  ROUTINE lim_thd_sal  ***       
@@ -76 +76 @@
       !! * Local variables
       INTEGER, INTENT(in) :: &
-         kideb, kiut, jl         !: thickness category index
+         kideb, kiut             !: thickness category index
 
       INTEGER ::             &
@@ -318 +318 @@
             zjj                 = ( npb(ji) - 1 ) / jpi + 1
             fseqv_1d(ji) = fseqv_1d(ji)              + & 
-                           ( sss_io(zji,zjj) - bulk_sal    ) * & 
+                           ( sss_m(zji,zjj) - bulk_sal    ) * & 
                            rhoic * a_i_b(ji) * &
                            MAX( dh_i_bott(ji) , 0.0 ) / rdt_ice
@@ -327 +327 @@
             zjj                 = ( npb(ji) - 1 ) / jpi + 1
             fseqv_1d(ji) = fseqv_1d(ji)              + & 
-                           ( sss_io(zji,zjj) - s_i_new(ji) ) * & 
+                           ( sss_m(zji,zjj) - s_i_new(ji) ) * & 
                              rhoic * a_i_b(ji) * &
                              MAX( dh_i_bott(ji) , 0.0 ) / rdt_ice