Changeset 3523 for branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90

Timestamp:

2012-11-01T08:58:07+01:00 (11 years ago)

Author:

gm

Message:

Branch: dev_r3385_NOCS04_HAMF; #665. LIM3 update: bug correction in limtrp and mass flux added in limthd_lac

File:

• branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90 (modified) (10 diffs)

branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90

@@ -272 +272 @@
       ENDIF
 
-      at_i(:,:) = 0._wp
-      DO jl = 1, jpl
-         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
+      at_i(:,:) = a_i(:,:,1)
+      DO jl = 2, jpl
+         at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
       END DO
 
@@ -347 +347 @@
                .AND.( ( v_i(ji,jj,1)/MAX(a_i(ji,jj,1),epsi10)*zindb).GT.zhimax ) &
                .AND.( zat_i_old.LT.zacrith ) )  THEN ! new line
-               z_prescr_hi      = hi_max(1) / 2.0
-               a_i(ji,jj,1)     = v_i(ji,jj,1) / z_prescr_hi
+               z_prescr_hi  = hi_max(1) * 0.5_wp
+               a_i(ji,jj,1) = v_i(ji,jj,1) / z_prescr_hi
             ENDIF
          END DO
@@ -407 +407 @@
       ENDIF
 
-      at_i(:,:) = 0._wp
-      DO jl = 1, jpl
-         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
+      at_i(:,:) = a_i(:,:,1)
+      DO jl = 2, jpl
+         at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
       END DO
 
@@ -447 +447 @@
       ENDIF
 
-      at_i(:,:) = 0._wp
-      DO jl = 1, jpl
-         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
+      at_i(:,:) = a_i(:,:,1)
+      DO jl = 2, jpl
+         at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
       END DO
 
@@ -787 +787 @@
       !-----------------------------------------------------
       zamax = amax
-      ! 2.13.1) individual concentrations cannot exceed zamax
-      !------------------------------------------------------
-
-      at_i(:,:) = 0.0
-      DO jl = 1, jpl
-         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
-      END DO
-
-      ! 2.13.2) Total ice concentration cannot exceed zamax
-      !----------------------------------------------------
+      ! 2.13.1) total (and thus individual) concentrations cannot exceed zamax
+      !-----------------------------------------------------------------------
+
       at_i(:,:) = a_i(:,:,1)
       DO jl = 2, jpl
-         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
+         at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
       END DO
 
@@ -806 +799 @@
 
             ! 0) Excessive area ?
-            z_da_ex =  MAX( at_i(ji,jj) - zamax , 0.0 )        
+            z_da_ex =  MAX( at_i(ji,jj) - zamax , 0._wp )        
 
             ! 1) Count the number of existing categories
@@ -831 +824 @@
       at_i(:,:) = a_i(:,:,1)
       DO jl = 2, jpl
-         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
+         at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
       END DO
 
@@ -886 +879 @@
       at_i(:,:) = a_i(:,:,1)
       DO jl = 2, jpl
-         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
+         at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
       END DO
 
@@ -894 +887 @@
       ! Ice drift
       !------------
+!!gm  BUG ? I don't understand this : it may have a wrong impact on the ice edge advection
+!!gm  and any way there is much faster way to code that...
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1
@@ -905 +900 @@
       END DO
       !mask velocities
+!!gm BUG ?  here the mask are the one of the beginning of the time step, no? 
+!!gm        whereas at this level they should have been updated... To be checked 
       u_ice(:,:) = u_ice(:,:) * tmu(:,:)
       v_ice(:,:) = v_ice(:,:) * tmv(:,:)