Changeset 4034

Timestamp:

2013-09-25T14:02:06+02:00 (11 years ago)

Author:

clem

Message:

bug fix on the max ice concentration resulting from limitd_me (1 instead of amax),see ticket:#1116

File:

• branches/2013/dev_r3406_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (modified) (9 diffs)

branches/2013/dev_r3406_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90

@@ -63 +63 @@
    REAL(wp), PARAMETER ::   krdgmin = 1.1_wp    ! min ridge thickness multiplier
    REAL(wp), PARAMETER ::   kraft   = 2.0_wp    ! rafting multipliyer
+   REAL(wp), PARAMETER ::   kamax   = 1.0
 
    REAL(wp) ::   Cp                             ! 
@@ -227 +228 @@
             ! to give asum = 1.0 after ridging.
 
-            divu_adv(ji,jj) = ( amax - asum(ji,jj) ) / rdt_ice  ! asum found in ridgeprep
+            divu_adv(ji,jj) = ( kamax - asum(ji,jj) ) / rdt_ice  ! asum found in ridgeprep
 
             IF( divu_adv(ji,jj) < 0._wp )   closing_net(ji,jj) = MAX( closing_net(ji,jj), -divu_adv(ji,jj) )
@@ -312 +313 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               IF (ABS(asum(ji,jj) - amax ) .LT. epsi11) THEN
+               IF (ABS(asum(ji,jj) - kamax ) .LT. epsi11) THEN
                   closing_net(ji,jj) = 0._wp
                   opning     (ji,jj) = 0._wp
                ELSE
                   iterate_ridging    = 1
-                  divu_adv   (ji,jj) = ( amax - asum(ji,jj) ) / rdt_ice
+                  divu_adv   (ji,jj) = ( kamax - asum(ji,jj) ) / rdt_ice
                   closing_net(ji,jj) = MAX( 0._wp, -divu_adv(ji,jj) )
                   opning     (ji,jj) = MAX( 0._wp,  divu_adv(ji,jj) )
@@ -356 +357 @@
          DO ji = 1, jpi
 
-            IF (ABS(asum(ji,jj) - amax) .GT. epsi11) asum_error = .true.
+            IF (ABS(asum(ji,jj) - kamax) .GT. epsi11) asum_error = .true.
 
             dardg1dt(ji,jj) = dardg1dt(ji,jj) * dti
@@ -375 +376 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            IF (ABS(asum(ji,jj) - amax) .GT. epsi11) THEN ! there is a bug
+            IF (ABS(asum(ji,jj) - kamax) .GT. epsi11) THEN ! there is a bug
                WRITE(numout,*) ' '
                WRITE(numout,*) ' ALERTE : Ridging error: total area = ', asum(ji,jj)
@@ -482 +483 @@
             IF ( ABS( zchk_smv   ) >  1.e-4 ) WRITE(numout,*) 'violation saline [psu*m3/day] (limitd_me) = ',(zchk_smv * 86400.)
             IF ( zchk_vmin <  0.            ) WRITE(numout,*) 'violation v_i<0  [mm]         (limitd_me) = ',(zchk_vmin * 1.e-3)
-            IF ( zchk_amax >  amax+epsi10   ) WRITE(numout,*) 'violation a_i>amax            (limitd_me) = ',zchk_amax
+            IF ( zchk_amax >  kamax+epsi10   ) WRITE(numout,*) 'violation a_i>amax            (limitd_me) = ',zchk_amax
             IF ( zchk_amin <  0.            ) WRITE(numout,*) 'violation a_i<0               (limitd_me) = ',zchk_amin
          ENDIF
@@ -1153 +1154 @@
             afrft(ji,jj) = arft1(ji,jj) / aicen_init(ji,jj,jl1) !rafting
 
-            IF (afrac(ji,jj) > amax + epsi11) THEN  !riging
+            IF (afrac(ji,jj) > kamax + epsi11) THEN  !riging
                large_afrac = .true.
-            ELSEIF (afrac(ji,jj) > amax) THEN  ! roundoff error
-               afrac(ji,jj) = amax
+            ELSEIF (afrac(ji,jj) > kamax) THEN  ! roundoff error
+               afrac(ji,jj) = kamax
             ENDIF
-            IF (afrft(ji,jj) > amax + epsi11) THEN !rafting
+            IF (afrft(ji,jj) > kamax + epsi11) THEN !rafting
                large_afrft = .true.
-            ELSEIF (afrft(ji,jj) > amax) THEN  ! roundoff error
-               afrft(ji,jj) = amax
+            ELSEIF (afrft(ji,jj) > kamax) THEN  ! roundoff error
+               afrft(ji,jj) = kamax
             ENDIF
 
@@ -1309 +1310 @@
                ji = indxi(ij)
                jj = indxj(ij)
-               IF( afrac(ji,jj) > amax + epsi11 ) THEN 
+               IF( afrac(ji,jj) > kamax + epsi11 ) THEN 
                   WRITE(numout,*) ''
                   WRITE(numout,*) ' ardg > a_i'
@@ -1321 +1322 @@
                ji = indxi(ij)
                jj = indxj(ij)
-               IF( afrft(ji,jj) > amax + epsi11 ) THEN 
+               IF( afrft(ji,jj) > kamax + epsi11 ) THEN 
                   WRITE(numout,*) ''
                   WRITE(numout,*) ' arft > a_i'