Changeset 4293 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.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/limupdate2.F90 (modified) (5 diffs)

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

@@ -194 +194 @@
 !      !ENDIF
 
-      zhimax = .3_wp
+      zhimax = 5._wp
       ! first category
       DO jj = 1, jpj
@@ -201 +201 @@
             !--- thus we recompute a new area while conserving ice volume
             zat_i_old = SUM( old_a_i(ji,jj,:) )
-            zindb     = MAX( 0._wp, SIGN( 1._wp, ABS( d_a_i_thd(ji,jj,1)) - epsi10 ) ) 
-            IF ( ( ABS(d_v_i_thd(ji,jj,1))/MAX(ABS(d_a_i_thd(ji,jj,1)),epsi10)*zindb .GT. zhimax) &
-                 .AND.( ( v_i(ji,jj,1)/MAX(a_i(ji,jj,1),epsi10)*zindb) .GT. zhimax ) &
-                 .AND.( zat_i_old .LT. 1.e-6 ) )  THEN ! new line
-               ht_i(ji,jj,1) = hi_max(1) / 2.0
+            zindb     = MAX( 0._wp, SIGN( 1._wp, ABS( d_a_i_thd(ji,jj,1) ) - epsi10 ) ) 
+            IF ( ( ABS( d_v_i_thd(ji,jj,1) ) / MAX( ABS( d_a_i_thd(ji,jj,1) ),epsi10 ) * zindb .GT. zhimax ) &
+               &  .AND. ( ( v_i(ji,jj,1) / MAX( a_i(ji,jj,1), epsi10 ) * zindb ) .GT. zhimax ) &
+               &  .AND. ( zat_i_old .LT. 1.e-6 ) )  THEN ! new line
+               ht_i(ji,jj,1) = hi_max(1) * 0.5_wp
                a_i (ji,jj,1) = v_i(ji,jj,1) / ht_i(ji,jj,1)
             ENDIF
@@ -223 +223 @@
 !      !ENDIF
 ! 
-      zhimax = 1._wp
+      zhimax = 20._wp
       ! other categories
       DO jl = 2, jpl
@@ -229 +229 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zindb =  MAX( rzero, SIGN( rone, ABS(d_a_i_thd(ji,jj,jl)) - epsi10 ) ) 
+               zindb =  MAX( rzero, SIGN( rone, ABS( d_a_i_thd(ji,jj,jl)) - epsi10 ) ) 
               ! this correction is very tricky... sometimes, advection gets wrong i don't know why
                ! it makes problems when the advected volume and concentration do not seem to be 
@@ -237 +237 @@
                ! which of course is plausible
                ! but fuck! it fucks everything up :)
-               IF ( (ABS(d_v_i_thd(ji,jj,jl))/MAX(ABS(d_a_i_thd(ji,jj,jl)),epsi10)*zindb .GT. zhimax) &
-                    .AND.(v_i(ji,jj,jl)/MAX(a_i(ji,jj,jl),epsi10)*zindb) .GT. zhimax ) THEN
-                  ht_i(ji,jj,jl) = ( hi_max_typ(jl-ice_cat_bounds(jm,1),jm) + hi_max_typ(jl-ice_cat_bounds(jm,1)+1,jm) ) / 2.0
+               IF ( ( ABS( d_v_i_thd(ji,jj,jl) ) / MAX( ABS( d_a_i_thd(ji,jj,jl) ), epsi10 ) * zindb .GT. zhimax ) &
+                  &  .AND. ( v_i(ji,jj,jl) / MAX( a_i(ji,jj,jl), epsi10 ) * zindb ) .GT. zhimax ) THEN
+                  ht_i(ji,jj,jl) = ( hi_max_typ(jl-ice_cat_bounds(jm,1),jm) + hi_max_typ(jl-ice_cat_bounds(jm,1)+1,jm) ) * 0.5_wp
                   a_i (ji,jj,jl) = v_i(ji,jj,jl) / ht_i(ji,jj,jl)
                ENDIF