Changeset 1434 for branches/dev_004_VVL/NEMO/OPA_SRC/opa.F90

Timestamp:

2009-05-11T15:44:36+02:00 (15 years ago)

Author:

rblod

Message:

dev_004_VVL:sync: synchro with trunk (r1420), see ticket #412

File:

• branches/dev_004_VVL/NEMO/OPA_SRC/opa.F90 (modified) (3 diffs)

branches/dev_004_VVL/NEMO/OPA_SRC/opa.F90

@@ -80 +80 @@
    USE trcini          ! Initialization of the passive tracers
    USE iom
-#if defined key_ioserver
-   USE io_interface
+#if defined key_iomput
+   USE mod_ioclient
 #endif
 
@@ -176 +176 @@
       !!
       !!----------------------------------------------------------------------
-#if defined key_oasis3 || defined key_oasis4 || defined key_ioserver
+#if defined key_oasis3 || defined key_oasis4 || defined key_iomput
       INTEGER :: localComm
 #endif
@@ -210 +210 @@
       READ  ( numnam, namctl )
 
-#if defined key_oasis3 || defined key_oasis4
-      call cpl_prism_init(localComm)
+#if defined key_iomput
+# if defined key_oasis3 || defined key_oasis4
+      ! nemo local communicator given by oasis
+      CALL cpl_prism_init( localComm )
+      ! io_server will get its communicators (if needed) from oasis (we don't see it)
+      CALL init_ioclient()
+# else
+      ! nemo local communicator (used or not) given by the io_server
+      CALL init_ioclient( localcomm )
+# endif
       ! Nodes selection
-      narea = mynode(localComm)
-#elif key_ioserver
-      CALL init_ioserver(localcomm, .FALSE.)
-      narea = mynode(localComm)
+      narea = mynode( localComm )
 #else
+# if defined key_oasis3 || defined key_oasis4
+      ! nemo local communicator given by oasis
+      CALL cpl_prism_init( localComm )
+      ! Nodes selection
+      narea = mynode( localComm )
+# else
       ! Nodes selection
       narea = mynode()
+# endif
 #endif
       narea = narea + 1    ! mynode return the rank of proc (0 --> jpnij -1 )