Changeset 1920 for branches/DEV_1879_mpp_rep/NEMO/OPA_SRC/opa.F90

Timestamp:

2010-06-07T13:45:58+02:00 (14 years ago)

Author:

rblod

Message:

Add modifications for mpp reproducibility, see ticket #677

File:

• branches/DEV_1879_mpp_rep/NEMO/OPA_SRC/opa.F90 (modified) (7 diffs)

branches/DEV_1879_mpp_rep/NEMO/OPA_SRC/opa.F90

@@ -156 +156 @@
       CALL opa_closefile
 #if defined key_oasis3 || defined key_oasis4
-      IF( Agrif_Root() ) THEN
-         CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
-     ENDIF 
+      CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
 #else
       IF( lk_mpp )   CALL mppstop       ! end mpp communications
@@ -180 +178 @@
       !!
       NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   &
-         &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle, nn_bench, nn_bit_cmp
+         &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle, nn_bench
       !!----------------------------------------------------------------------
       !
@@ -193 +191 @@
 #if defined key_iomput
 # if defined key_oasis3 || defined key_oasis4
-      IF( Agrif_Root() ) THEN
-         CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
-         CALL init_ioclient()                    ! io_server will get its communicators (if needed) from oasis (we don't see it)
-      ENDIF
+      CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
+      CALL init_ioclient()                    ! io_server will get its communicators (if needed) from oasis (we don't see it)
 # else
-      IF( Agrif_Root() ) THEN
-         CALL init_ioclient( ilocal_comm )       ! nemo local communicator (used or not) given by the io_server
-      ENDIF
+      CALL init_ioclient( ilocal_comm )       ! nemo local communicator (used or not) given by the io_server
 # endif
       narea = mynode( cltxt, ilocal_comm )    ! Nodes selection
@@ -206 +200 @@
 #else
 # if defined key_oasis3 || defined key_oasis4
-      IF( Agrif_Root() ) THEN
-         CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
-      ENDIF
+      CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
       narea = mynode( cltxt, ilocal_comm )    ! Nodes selection (control print return in cltxt)
 # else
@@ -312 +304 @@
          WRITE(numout,*) '      number of proc. following j     nn_jsplt   = ', nn_jsplt
          WRITE(numout,*) '      benchmark parameter (0/1)       nn_bench   = ', nn_bench
-         WRITE(numout,*) '      bit comparison mode (0/1)       nn_bit_cmp = ', nn_bit_cmp
       ENDIF
 
@@ -323 +314 @@
       jsplt     = nn_jsplt
       nbench    = nn_bench
-      nbit_cmp  = nn_bit_cmp
 
       !                           ! Parameter control
@@ -372 +362 @@
       ENDIF
 
-      IF( nbit_cmp == 1 )   THEN          ! Bit compare
-         CALL ctl_warn( ' Bit comparison enabled. Single and multiple processor results must bit compare', &
-              &         ' WARNING: RESULTS ARE NOT PHYSICAL.' )
-      ENDIF
-
       REWIND( numnam )              ! Read Namelist namdyn_hpg : ln_dynhpg_imp must be read at the initialisation phase
       READ  ( numnam, namdyn_hpg )