Changeset 2219 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN

Timestamp:

2010-10-12T15:06:30+02:00 (14 years ago)

Author:

rblod

Message:

Merge branch DEV_1879_mpp_rep into DEV_r2191_3partymerge2010

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (4 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -46 +46 @@
    USE iom
    USE restart         ! only for lrst_oce
+   USE lib_fortran
 #if defined key_agrif
    USE agrif_opa_interp
@@ -188 +189 @@
 
 #if defined key_obc
-      IF( lk_obc )   CALL obc_dyn( kt )   ! Update velocities on each open boundary with the radiation algorithm
-      IF( lk_obc )   CALL obc_vol( kt )   ! Correction of the barotropic componant velocity to control the volume of the system
+      CALL obc_dyn( kt )      ! Update velocities on each open boundary with the radiation algorithm
+      CALL obc_vol( kt )      ! Correction of the barotropic componant velocity to control the volume of the system
 #endif
 #if defined key_bdy
@@ -283 +284 @@
       ! ------------------
       rnorme =0.e0
-      rnorme = SUM( gcb(1:jpi,1:jpj) * gcdmat(1:jpi,1:jpj) * gcb(1:jpi,1:jpj) * bmask(:,:) )
-      IF( lk_mpp )   CALL mpp_sum( rnorme )   ! sum over the global domain
+      rnorme = GLOB_SUM( gcb(1:jpi,1:jpj) * gcdmat(1:jpi,1:jpj) * gcb(1:jpi,1:jpj) * bmask(:,:) )
 
       epsr = eps * eps * rnorme
@@ -317 +317 @@
 #if defined key_obc
             ! caution : grad D = 0 along open boundaries
-            IF( Agrif_Root() ) THEN
-               spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj)
-               spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj)
-            ELSE
-               spgu(ji,jj) = z2dt * ztdgu
-               spgv(ji,jj) = z2dt * ztdgv
-            ENDIF
+            spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj)
+            spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj)
 #elif defined key_bdy
             ! caution : grad D = 0 along open boundaries