Changeset 3003 for branches

Timestamp:

2011-10-26T22:03:22+02:00 (12 years ago)

Author:

cetlod

Message:

branch dev_LOCEAN_2011: use the glob_sum function to sum over the global domain

File:

• branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) (2 diffs)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90

@@ -124 +124 @@
       
          DO jn = jp_sms0, jp_sms1
-         !                                                        ! ===========
+            !                                                        ! ===========
             ztrcorb = 0.e0   ;   ztrmasb = 0.e0
             ztrcorn = 0.e0   ;   ztrmasn = 0.e0
 
-           IF( l_trdtrc ) THEN
-              ztrtrdb(:,:,:) = ptrb(:,:,:,jn)                        ! save input trb for trend computation
-              ztrtrdn(:,:,:) = ptrn(:,:,:,jn)                        ! save input trn for trend computation
-           ENDIF
-
-
-            DO jk = 1, jpkm1
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     ztrcorb = ztrcorb + MIN( 0., ptrb(ji,jj,jk,jn) ) * cvol(ji,jj,jk)
-                     ztrcorn = ztrcorn + MIN( 0., ptrn(ji,jj,jk,jn) ) * cvol(ji,jj,jk)
-
-                     ptrb(ji,jj,jk,jn) = MAX( 0., ptrb(ji,jj,jk,jn) )
-                     ptrn(ji,jj,jk,jn) = MAX( 0., ptrn(ji,jj,jk,jn) )
-
-                     ztrmasb = ztrmasb + ptrb(ji,jj,jk,jn) * cvol(ji,jj,jk)
-                     ztrmasn = ztrmasn + ptrn(ji,jj,jk,jn) * cvol(ji,jj,jk)
-                  END DO
-               END DO
-            END DO
-
-            IF( lk_mpp ) THEN
-               CALL mpp_sum( ztrcorb )      ! sum over the global domain
-               CALL mpp_sum( ztrcorn )      ! sum over the global domain
-               CALL mpp_sum( ztrmasb )      ! sum over the global domain
-               CALL mpp_sum( ztrmasn )      ! sum over the global domain
-            ENDIF
+            IF( l_trdtrc ) THEN
+               ztrtrdb(:,:,:) = ptrb(:,:,:,jn)                        ! save input trb for trend computation
+               ztrtrdn(:,:,:) = ptrn(:,:,:,jn)                        ! save input trn for trend computation
+            ENDIF
+            !                                                         ! sum over the global domain 
+            ztrcorb = glob_sum( MIN( 0., ptrb(:,:,:,jn) ) * cvol(:,:,:) )
+            ztrcorn = glob_sum( MIN( 0., ptrn(:,:,:,jn) ) * cvol(:,:,:) )
+
+            ztrmasb = glob_sum( MAX( 0., ptrb(:,:,:,jn) ) * cvol(:,:,:) )
+            ztrmasn = glob_sum( MAX( 0., ptrn(:,:,:,jn) ) * cvol(:,:,:) )
 
             IF( ztrcorb /= 0 ) THEN
                zcoef = 1. + ztrcorb / ztrmasb
                DO jk = 1, jpkm1
+                  ptrb(:,:,jk,jn) = MAX( 0., ptrb(:,:,jk,jn) )
                   ptrb(:,:,jk,jn) = ptrb(:,:,jk,jn) * zcoef * tmask(:,:,jk)
                END DO
@@ -166 +150 @@
                zcoef = 1. + ztrcorn / ztrmasn
                DO jk = 1, jpkm1
+                  ptrn(:,:,jk,jn) = MAX( 0., ptrn(:,:,jk,jn) )
                   ptrn(:,:,jk,jn) = ptrn(:,:,jk,jn) * zcoef * tmask(:,:,jk)
                END DO