Changeset 4293 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90

Timestamp:

2013-11-20T17:56:18+01:00 (10 years ago)

Author:

clem

Message:

small corrections for ice categories hi_max and for shifting ice between categories

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) (3 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90

@@ -321 +321 @@
       ! Tricky trick see limitd_me.F90
       ! will be soon removed, CT
-      ! hi_max(kubnd) = 999.99
+      ! hi_max(kubnd) = 99.
       zhbnew(:,:,:) = 0._wp
 
@@ -402 +402 @@
                zhbnew(ji,jj,kubnd) = 3._wp * ht_i(ji,jj,kubnd) - 2._wp * zhbnew(ji,jj,kubnd-1)
             ELSE
-               zhbnew(ji,jj,kubnd) = hi_max(kubnd)
+               zhbnew(ji,jj,kubnd) = hi_max(kubnd)  
+               !!? clem bug: since hi_max(jpl)=99, this limit is very high 
+               !!? but I think it is erased in fitline subroutine 
             ENDIF
 
@@ -1009 +1011 @@
                   !zdaice(ji,jj,jl)  = a_i(ji,jj,jl)
                   !zdvice(ji,jj,jl)  = v_i(ji,jj,jl)
-                  zdaice(ji,jj,jl)  = a_i(ji,jj,jl)/2
-                  zdvice(ji,jj,jl)  = v_i(ji,jj,jl)-zdaice(ji,jj,jl)*(hi_max(jl)+hi_max(jl-1))/2
+                  !zdaice(ji,jj,jl)  = a_i(ji,jj,jl) * 0.5_wp
+                  !zdvice(ji,jj,jl)  = v_i(ji,jj,jl)-zdaice(ji,jj,jl)*(hi_max(jl)+hi_max(jl-1)) * 0.5_wp
                   ! end TECLIM change 
+                  ! clem: how much of a_i you send in cat sup is somewhat arbitrary
+                  zdaice(ji,jj,jl)  = a_i(ji,jj,jl) * ( ht_i(ji,jj,jl) - hi_max(jl) ) / ht_i(ji,jj,jl)  
+                  zdvice(ji,jj,jl)  = v_i(ji,jj,jl) - ( a_i(ji,jj,jl) - zdaice(ji,jj,jl) ) * ( hi_max(jl) - epsi10 )
                ENDIF
             END DO                 ! ji