Changeset 869 for trunk/NEMO/LIM_SRC_3/limdia.F90

Timestamp:

2008-03-26T10:21:54+01:00 (16 years ago)

Author:

rblod

Message:

Parallelisation of LIM3. This commit seems to ensure the reproducibility mono/mpp. See ticket #77.

File:

• trunk/NEMO/LIM_SRC_3/limdia.F90 (modified) (6 diffs)

trunk/NEMO/LIM_SRC_3/limdia.F90

@@ -163 +163 @@
           DO jj = njeq, jpjm1
              DO ji = fs_2, fs_jpim1   ! vector opt.
-                vinfor(11) = vinfor(11) + v_i(ji,jj,jl)*aire(ji,jj) / 1.0e12 !undef def ice volume
+                IF( tms(ji,jj) == 1 ) THEN
+                   vinfor(11) = vinfor(11) + v_i(ji,jj,jl)*aire(ji,jj) / 1.0e12 !undef def ice volume
+                ENDIF
              END DO
           END DO
@@ -170 +172 @@
        vinfor(13) = 0.0
 
-       vinfor(15) = vinfor(15) / vinfor(7) ! these have to be divided by total ice volume to have the
-       vinfor(29) = vinfor(29) / vinfor(7) ! right value
+       vinfor(15) = vinfor(15) / MAX(vinfor(7),epsi06) ! these have to be divided by total ice volume to have the
+       vinfor(29) = vinfor(29) / MAX(vinfor(7),epsi06) ! right value
        vinfor(31) = SQRT( vinfor(31) / MAX( vinfor(7) , epsi06 ) )
-       vinfor(67) = vinfor(67) / vinfor(7)
-
-       vinfor(53) = vinfor(53) / vinfor(5) ! these have to be divided by total ice extent to have the
-       vinfor(55) = vinfor(55) / vinfor(5) ! right value 
-       vinfor(57) = vinfor(57) / vinfor(5) ! 
-       vinfor(79) = vinfor(79) / vinfor(5) !
+       vinfor(67) = vinfor(67) / MAX(vinfor(7),epsi06)
+
+       vinfor(53) = vinfor(53) / MAX(vinfor(5),epsi06) ! these have to be divided by total ice extent to have the
+       vinfor(55) = vinfor(55) / MAX(vinfor(5),epsi06) ! right value 
+       vinfor(57) = vinfor(57) / MAX(vinfor(5),epsi06) ! 
+       vinfor(79) = vinfor(79) / MAX(vinfor(5),epsi06) !
 
        zindb      = 1.0 - MAX(0.0,SIGN(1.0,-vinfor(3))) !
@@ -191 +193 @@
           DO jj = njeq, jpjm1
              DO ji = fs_2, fs_jpim1   ! vector opt.
-                vinfor(33) = vinfor(33) + d_v_i_trp(ji,jj,jl)*aire(ji,jj) / 1.0e12 !ice volume
-                vinfor(35) = vinfor(35) + d_v_i_thd(ji,jj,jl)*aire(ji,jj) / 1.0e12 !ice volume
+                IF( tms(ji,jj) == 1 ) THEN
+                   vinfor(33) = vinfor(33) + d_v_i_trp(ji,jj,jl)*aire(ji,jj) / 1.0e12 !ice volume
+                   vinfor(35) = vinfor(35) + d_v_i_thd(ji,jj,jl)*aire(ji,jj) / 1.0e12 !ice volume
+                ENDIF
              END DO
           END DO
@@ -199 +203 @@
        DO jj = njeq, jpjm1
           DO ji = fs_2, fs_jpim1   ! vector opt.
-             vinfor(37) = vinfor(37) + diag_sni_gr(ji,jj)*aire(ji,jj) / 1.0e12 !th growth rates
-             vinfor(39) = vinfor(39) + diag_lat_gr(ji,jj)*aire(ji,jj) / 1.0e12 
-             vinfor(41) = vinfor(41) + diag_bot_gr(ji,jj)*aire(ji,jj) / 1.0e12
-             vinfor(43) = vinfor(43) + diag_dyn_gr(ji,jj)*aire(ji,jj) / 1.0e12 
-             vinfor(45) = vinfor(45) + dv_dt_thd(ji,jj,5)*aire(ji,jj) / 1.0e12
-             vinfor(47) = vinfor(47) + v_newice(ji,jj) *aire(ji,jj) / 1.0e12 / rdt_ice ! volume acc in OW
+                IF( tms(ji,jj) == 1 ) THEN
+                   vinfor(37) = vinfor(37) + diag_sni_gr(ji,jj)*aire(ji,jj) / 1.0e12 !th growth rates
+                   vinfor(39) = vinfor(39) + diag_lat_gr(ji,jj)*aire(ji,jj) / 1.0e12 
+                   vinfor(41) = vinfor(41) + diag_bot_gr(ji,jj)*aire(ji,jj) / 1.0e12
+                   vinfor(43) = vinfor(43) + diag_dyn_gr(ji,jj)*aire(ji,jj) / 1.0e12 
+                   vinfor(45) = vinfor(45) + dv_dt_thd(ji,jj,5)*aire(ji,jj) / 1.0e12
+                   vinfor(47) = vinfor(47) + v_newice(ji,jj) *aire(ji,jj) / 1.0e12 / rdt_ice ! volume acc in OW
+                ENDIF
           END DO
        END DO
@@ -217 +223 @@
           END DO
        END DO
-       vinfor(63) = vinfor(63) / vinfor(3) ! these have to be divided by total ice area
+       vinfor(63) = vinfor(63) / MAX(vinfor(3),epsi06) ! these have to be divided by total ice area
 
        !! 1.2) Diagnostics dependent on age
@@ -348 +354 @@
        DO jj = 2, njeqm1
           DO ji = fs_2, fs_jpim1   ! vector opt.
-             vinfor(38) = vinfor(38) + diag_sni_gr(ji,jj)*aire(ji,jj) / 1.0e12 !th growth rates
-             vinfor(40) = vinfor(40) + diag_lat_gr(ji,jj)*aire(ji,jj) / 1.0e12 
-             vinfor(42) = vinfor(42) + diag_bot_gr(ji,jj)*aire(ji,jj) / 1.0e12
-             vinfor(44) = vinfor(44) + diag_dyn_gr(ji,jj)*aire(ji,jj) / 1.0e12 
-             vinfor(46) = vinfor(46) + dv_dt_thd(ji,jj,5)*aire(ji,jj) / 1.0e12
-             vinfor(48) = vinfor(48) + v_newice(ji,jj) *aire(ji,jj) / 1.0e12 / rdt_ice ! volume acc in OW
+                IF( tms(ji,jj) == 1 ) THEN
+                   vinfor(38) = vinfor(38) + diag_sni_gr(ji,jj)*aire(ji,jj) / 1.0e12 !th growth rates
+                   vinfor(40) = vinfor(40) + diag_lat_gr(ji,jj)*aire(ji,jj) / 1.0e12 
+                   vinfor(42) = vinfor(42) + diag_bot_gr(ji,jj)*aire(ji,jj) / 1.0e12
+                   vinfor(44) = vinfor(44) + diag_dyn_gr(ji,jj)*aire(ji,jj) / 1.0e12 
+                   vinfor(46) = vinfor(46) + dv_dt_thd(ji,jj,5)*aire(ji,jj) / 1.0e12
+                   vinfor(48) = vinfor(48) + v_newice(ji,jj) *aire(ji,jj) / 1.0e12 / rdt_ice ! volume acc in OW
+                ENDIF
           END DO
        END DO