Changeset 3838 for branches/2012/dev_MERGE_2012

Timestamp:

2013-03-14T13:06:40+01:00 (11 years ago)

Author:

gm

Message:

dev_MERGE_2012: #1054, LIM3: more simple and efficient correction of the reported bug

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90 (modified) (8 diffs)

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

@@ -76 +76 @@
       !! ** Action  : - 
       !!---------------------------------------------------------------------
-      INTEGER ::   ji, jj, jk, jl, jm    ! dummy loop indices
-      INTEGER ::   jbnd1, jbnd2
-      INTEGER ::   i_ice_switch
-      INTEGER ::   ind_im, layer      ! indices for internal melt
-      REAL(wp) ::   zweight, zesum, zhimax, z_da_i
-      REAL(wp) ::   zindb, zindsn, zindic, zacrith
-      REAL(wp) ::   zrtt, zindg, zh, zdvres, zviold
-      REAL(wp) ::   zbigvalue, zvsold, z_da_ex, zamax
-      REAL(wp) ::   z_prescr_hi, zat_i_old, ztmelts, ze_s
-
-      INTEGER , POINTER, DIMENSION(:,:,:) ::  internal_melt
-      REAL(wp), POINTER, DIMENSION(:) ::   zthick0, zqm0      ! thickness of the layers and heat contents for
+      INTEGER  ::   ji, jj, jk, jl, jm    ! dummy loop indices
+      INTEGER  ::   jbnd1, jbnd2
+      INTEGER  ::   i_ice_switch, ind_im, layer             ! local integers
+      REAL(wp) ::   zweight, zesum, zhimax                  ! local scalars
+      REAL(wp) ::   zindb, zindsn, zindic, zacrith          !   -      -
+      REAL(wp) ::   zrtt, zindg, zh, zdvres, zviold         !   -      - 
+      REAL(wp) ::   zbigvalue, zvsold                       !   -      -
+      REAL(wp) ::   z_prescr_hi, zat_i_old, ztmelts, ze_s   !   -      -
+      !
+      INTEGER , POINTER, DIMENSION(:,:,:) ::   internal_melt
+      REAL(wp), POINTER, DIMENSION(:)     ::   zthick0, zqm0   ! thickness of the layers and heat contents for
       !!-------------------------------------------------------------------
 
@@ -270 +269 @@
       ENDIF
 
-      at_i(:,:) = a_i(:,:,1)
+      at_i(:,:) = a_i(:,:,1)                   ! total ice concentration
       DO jl = 2, jpl
          at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
@@ -405 +404 @@
       ENDIF
 
-      at_i(:,:) = a_i(:,:,1)
+      at_i(:,:) = a_i(:,:,1)                   ! total ice concentration
       DO jl = 2, jpl
          at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
@@ -445 +444 @@
       ENDIF
 
-      at_i(:,:) = a_i(:,:,1)
+      at_i(:,:) = a_i(:,:,1)                   ! total ice concentration
       DO jl = 2, jpl
          at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
@@ -782 +781 @@
       ENDIF
 
-      !--- 2.13 Total ice concentration should not exceed 1
-      !-----------------------------------------------------
-      zamax = amax
-      ! 2.13.1) total (and thus individual) concentrations cannot exceed zamax
-      !-----------------------------------------------------------------------
-
-      at_i(:,:) = a_i(:,:,1)
+      ! Total ice concentration check : forced to be less than amax
+      !------------------------------
+      at_i(:,:) = a_i(:,:,1)                  ! total ice concentration
       DO jl = 2, jpl
          at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
       END DO
-
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-
-            ! 0) Excessive area ?
-            z_da_ex =  MAX( at_i(ji,jj) - zamax , 0._wp )        
-
-            ! 1) Count the number of existing categories
-            DO jl  = 1, jpl
-!!cr : comment the second line of zindb definition, and use epsi04 in the 1st one
-               zindb   =  MAX( rzero, SIGN( rone, v_i(ji,jj,jl) - epsi03 ) ) 
-               zindb   =  MAX( rzero, SIGN( rone, v_i(ji,jj,jl) ) ) 
-               z_da_i = a_i(ji,jj,jl) * z_da_ex / MAX( at_i(ji,jj), epsi06 ) * zindb
-               a_i(ji,jj,jl) = a_i(ji,jj,jl) - z_da_i
-            END DO
-
-         END DO !ji
-      END DO !jj
+      DO jl = 1, jpl                          ! if at_i > amax, set at_i=amax by a rescale of the area of each category
+         a_i(:,:,jl) = a_i(:,:,jl) * amax / MAX( at_i(:,:), amax )
+      END DO
+      at_i(:,:) = MIN( at_i(:,:), amax )      ! at_i becomes less than amax by construction no need to recompute it
 
       IF( ln_nicep ) THEN  
@@ -818 +799 @@
       ENDIF
 
-      at_i(:,:) = a_i(:,:,1)
-      DO jl = 2, jpl
-         at_i(:,:) = at_i(:,:) + a_i(:,:,jl)
-      END DO
 
       IF( ln_nicep ) THEN  
@@ -836 +813 @@
                      WRITE(numout,*) ' d_a_i_thd / trp ', d_a_i_thd(ji,jj,jl), d_a_i_trp(ji,jj,jl)
                   END DO
-                  !             WRITE(numout,*) ' CORRECTION BARBARE '
-                  !             z_da_ex =  MAX( at_i(ji,jj) - zamax , 0.0 )        
                ENDIF
             END DO
@@ -873 +848 @@
       ENDIF
 
-      at_i(:,:) = a_i(:,:,1)
+      at_i(:,:) = a_i(:,:,1)                   ! total ice concentration
       DO jl = 2, jpl
          at_i(:,:) = at_i(:,:) + a_i(:,:,jl)