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

trunk/NEMO/LIM_SRC_3/limvar.F90

@@ -1 +1 @@
 MODULE limvar
-#if defined key_lim3
    !!----------------------------------------------------------------------
    !!   'key_lim3'                                      LIM3 sea-ice model
@@ -33 +32 @@
    !!                        - ot_i(jpi,jpj)  !average ice age
    !!======================================================================
-
+#if defined key_lim3
    !!----------------------------------------------------------------------
    !! * Modules used
@@ -40 +39 @@
    USE phycst           ! physical constants (ocean directory) 
    USE ice_oce          ! ice variables
+   USE sbc_oce          ! Surface boundary condition: ocean fields
    USE thd_ice
    USE in_out_manager
@@ -428 +428 @@
            zind0         ,     & !: switch, = 1 if sm_i lt s_i_0
            zind01        ,     & !: switch, = 1 if sm_i between s_i_0 and s_i_1
-           zindbal       ,     & !: switch, = 1, if 2*sm_i gt sss_io
+           zindbal       ,     & !: switch, = 1, if 2*sm_i gt sss_m
            zargtemp              !: dummy factor
 
@@ -491 +491 @@
                   zind01 = ( 1.0 - zind0 ) *                                  &
                            MAX( 0.0   , SIGN( 1.0  , s_i_1 - sm_i(ji,jj,jl) ) ) 
-                  ! If 2.sm_i GE sss_io then zindbal = 1
+                  ! If 2.sm_i GE sss_m then zindbal = 1
                   zindbal = MAX( 0.0 , SIGN( 1.0 , 2. * sm_i(ji,jj,jl) -      &
-                  sss_io(ji,jj) ) )
+                  sss_m(ji,jj) ) )
                   zalpha(ji,jj,jl) = zind0  * 1.0                             &
                                    + zind01 * ( sm_i(ji,jj,jl) * dummy_fac0 + &
@@ -692 +692 @@
                zind01 = ( 1.0 - zind0 ) *                                  &
                         MAX( 0.0   , SIGN( 1.0  , s_i_1 - sm_i_b(ji) ) ) 
-               ! if 2.sm_i GE sss_io then zindbal = 1
+               ! if 2.sm_i GE sss_m then zindbal = 1
                zindbal = MAX( 0.0 , SIGN( 1.0 , 2. * sm_i_b(ji) -      &
-               sss_io(zji,zjj) ) )
+               sss_m(zji,zjj) ) )
 
                zalpha = zind0  * 1.0                                       &