Changeset 3701 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2012-11-28T10:57:47+01:00 (12 years ago)

Author:

smasson

Message:

dev_MERGE_2012: add missing modifications for xios

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (3 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -79 +79 @@
    USE lib_mpp         ! distributed memory computing
 #if defined key_iomput
-   USE mod_ioclient
+   USE xios
 #endif
    USE sbctide, ONLY: lk_tide
@@ -199 +199 @@
       CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
 #else
+# if defined key_iomput
+      IF( Agrif_Root() ) THEN
+         CALL xios_finalize             ! end mpp communications
+      ENDIF
+# else
       IF( lk_mpp )   CALL mppstop       ! end mpp communications
+# endif
 #endif
       !
@@ -233 +239 @@
       IF( Agrif_Root() ) THEN
 # if defined key_oasis3 || defined key_oasis4
-         CALL cpl_prism_init( ilocal_comm )                 ! nemo local communicator given by oasis
+         CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
+         CALL xios_initialize( "oceanx",local_comm=ilocal_comm )
+# else
+         CALL  xios_initialize( "nemo",return_comm=ilocal_comm )
 # endif
-         CALL  init_ioclient( ilocal_comm )                 ! exchange io_server nemo local communicator with the io_server
       ENDIF
       narea = mynode( cltxt, numnam, nstop, ilocal_comm )   ! Nodes selection