Changeset 531 for trunk/NEMO/OPA_SRC/SBC

Timestamp:

2006-10-19T14:55:25+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_75 : CT : enables bit comparison between single and multiple processor runs adding nbit_cmp namelist parameter

Location:

trunk/NEMO/OPA_SRC/SBC

Files:

• flxfwb.F90 (modified) (1 diff)
• ocesbc.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/SBC/flxfwb.F90

@@ -280 +280 @@
          IF(lwp) WRITE(numout,*) '               ln_fwb = .FALSE. is recommanded'
       ENDIF
+
+      IF( nbit_cmp == 1 .AND. ln_fwb ) THEN
+         CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require ln_fwb = .false.' )
+      END IF
 
       !                                        ! ==============================

trunk/NEMO/OPA_SRC/SBC/ocesbc.F90

@@ -673 +673 @@
              END DO
           END DO
-          
-          ! compute the emp flux such as its integration on the whole domain and at each time be zero
-          zsumemp = 0.e0
-          zsurf = 0.e0
-          DO jj = 1, jpj
-             DO ji = 1, jpi
-                zsumemp = zsumemp + emp(ji,jj) * tmask(ji,jj,1) * tmask_i(ji,jj)
-                zsurf =  zsurf + tmask(ji,jj,1) * tmask_i(ji,jj)
+
+          ! Compute the emp flux such as its integration on the whole domain at each time is zero
+          IF( nbench /= 1 .AND. nbit_cmp /= 1 ) THEN
+             zsumemp = 0.e0   ;   zsurf = 0.e0
+             DO jj = 1, jpj
+                DO ji = 1, jpi
+                   zsumemp = zsumemp + emp(ji,jj) * tmask(ji,jj,1) * tmask_i(ji,jj)
+                   zsurf =  zsurf + tmask(ji,jj,1) * tmask_i(ji,jj)
+                END DO
              END DO
-          END DO
-
-          IF( lk_mpp )   CALL mpp_sum( zsumemp  )       ! sum over the global domain
-          IF( lk_mpp )   CALL mpp_sum( zsurf    )       ! sum over the global domain
-
-          IF( nbench /= 0 ) THEN
-             ! Benchmark GYRE configuration (to allow the bit to bit comparison between Mpp/Mono case)
-             zsumemp = 0.e0
-          ELSE
+
+             IF( lk_mpp )   CALL mpp_sum( zsumemp  )       ! sum over the global domain
+             IF( lk_mpp )   CALL mpp_sum( zsurf    )       ! sum over the global domain
+
              ! Default GYRE configuration
              zsumemp = zsumemp / zsurf
+          ELSE
+             ! Benchmark GYRE configuration (to allow the bit to bit comparison between Mpp/Mono case)
+             zsumemp = 0.e0   ;    zsurf = 0.e0
           ENDIF
 
@@ -857 +856 @@
       aplus  = 0.e0
       aminus = 0.e0
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            zwei   = e1t(ji,jj) * e2t(ji,jj) * tmask_i(ji,jj)
-            aplus  = aplus  + zerpplus (ji,jj) * zwei
-            aminus = aminus - zerpminus(ji,jj) * zwei
+      
+      IF( nbit_cmp == 1) THEN
+         
+         IF(ln_ctl)   THEN
+            WRITE(charout,FMT="('oce_sbc_dmp : a+ = ',D23.16, ' a- = ',D23.16)") aplus, aminus
+            CALL prt_ctl_info(charout)
+         ENDIF
+         erp(:,:) = 0.e0
+
+      ELSE
+
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zwei   = e1t(ji,jj) * e2t(ji,jj) * tmask_i(ji,jj)
+               aplus  = aplus  + zerpplus (ji,jj) * zwei
+               aminus = aminus - zerpminus(ji,jj) * zwei
+            END DO
          END DO
-      END DO
-      IF( lk_mpp )   CALL mpp_sum( aplus  )   ! sums over the global domain
-      IF( lk_mpp )   CALL mpp_sum( aminus )
-
-      IF(ln_ctl)   THEN
-         WRITE(charout,FMT="('oce_sbc_dmp : a+ = ',D23.16, ' a- = ',D23.16)") aplus, aminus
-         CALL prt_ctl_info(charout)
-      ENDIF
-
-      zadefi = MIN( aplus, aminus )
-      IF( zadefi == 0.e0 ) THEN 
-         erp(:,:) = 0.e0
-      ELSE
-         erp(:,:) = zadefi * ( zerpplus(:,:) / aplus + zerpminus(:,:) / aminus )
-      ENDIF
+         IF( lk_mpp )   CALL mpp_sum( aplus  )   ! sums over the global domain
+         IF( lk_mpp )   CALL mpp_sum( aminus )
+
+         IF(ln_ctl)   THEN
+            WRITE(charout,FMT="('oce_sbc_dmp : a+ = ',D23.16, ' a- = ',D23.16)") aplus, aminus
+            CALL prt_ctl_info(charout)
+         ENDIF
+
+         zadefi = MIN( aplus, aminus )
+         IF( zadefi == 0.e0 ) THEN 
+            erp(:,:) = 0.e0
+         ELSE
+            erp(:,:) = zadefi * ( zerpplus(:,:) / aplus + zerpminus(:,:) / aminus )
+         ENDIF
+
+      END IF
 #else
       ! Rigid-lid (emp=emps=E-P-R+Erp)