Changeset 4332 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

Timestamp:

2013-12-11T15:38:42+01:00 (10 years ago)

Author:

clem

Message:

update LIM3 to fix remaining bugs. Now working in global and regional config.

File:

• branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) (4 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

@@ -36 +36 @@
    PUBLIC   lim_trp    ! called by ice_step
 
-   REAL(wp)  ::   epsi06 = 1.e-06_wp   ! constant values
-   REAL(wp)  ::   epsi03 = 1.e-03_wp  
    REAL(wp)  ::   epsi10 = 1.e-10_wp  
-   REAL(wp)  ::   epsi16 = 1.e-16_wp
-   REAL(wp)  ::   epsi20 = 1.e-20_wp
    REAL(wp)  ::   rzero  = 0._wp   
    REAL(wp)  ::   rone   = 1._wp
-
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:,:,:) ::   zs0e
 
    !! * Substitution
@@ -448 +442 @@
 
                   ! Switches and dummy variables
-                  zusvosn         = 1.0/MAX( v_s(ji,jj,jl) , epsi16 )
-                  zusvoic         = 1.0/MAX( v_i(ji,jj,jl) , epsi16 )
+                  zusvosn         = 1.0/MAX( v_s(ji,jj,jl) , epsi10 )
+                  zusvoic         = 1.0/MAX( v_i(ji,jj,jl) , epsi10 )
                   zindsn          = MAX( rzero, SIGN( rone, v_s(ji,jj,jl) - epsi10 ) )
                   zindic          = MAX( rzero, SIGN( rone, v_i(ji,jj,jl) - epsi10 ) )
@@ -460 +454 @@
                   ENDIF
 
-                  zage = MAX( MIN( zbigval, zs0oi(ji,jj,jl) / MAX( a_i(ji,jj,jl), epsi16 ) ), 0._wp  ) * a_i(ji,jj,jl)
+                  zage = MAX( MIN( zbigval, zs0oi(ji,jj,jl) / MAX( a_i(ji,jj,jl), epsi10 ) ), 0._wp  ) * a_i(ji,jj,jl)
                   oa_i (ji,jj,jl)  = zindic * zage 
 
@@ -500 +494 @@
                at_i(ji,jj) = at_i(ji,jj) + a_i(ji,jj,jl) ! ice concentration
                !
-               zinda = MAX( rzero , SIGN( rone , at_i(ji,jj) - epsi16 ) )
-               icethi(ji,jj) = vt_i(ji,jj) / MAX( at_i(ji,jj) , epsi16 ) * zinda  ! ice thickness
+               zinda = MAX( rzero , SIGN( rone , at_i(ji,jj) - epsi10 ) )
+               icethi(ji,jj) = vt_i(ji,jj) / MAX( at_i(ji,jj) , epsi10 ) * zinda  ! ice thickness
             END DO
          END DO