Changeset 2204 for branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/opa.F90

Timestamp:

2010-10-11T17:59:35+02:00 (14 years ago)

Author:

rblod

Message:

Merge FCM branch with the trunk

File:

• branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/opa.F90 (modified) (1 diff)

branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/opa.F90

@@ -194 +194 @@
       !                             !--------------------------------------------!
 #if defined key_iomput
+      IF( Agrif_Root() ) THEN
 # 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
-# else
-      IF( Agrif_Root() ) THEN
-         CALL init_ioclient( ilocal_comm )       ! nemo local communicator (used or not) given by the io_server
-      ENDIF
 # endif
+         CALL  init_ioclient( ilocal_comm )      ! exchange io_server nemo local communicator with the io_server
+      ENDIF
       narea = mynode( cltxt, ilocal_comm )    ! Nodes selection
-
 #else
 # if defined key_oasis3 || defined key_oasis4