Changeset 44 for vendor/nemo/current/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

08/31/12 15:41:37 (12 years ago)

Author:

cholod

Message:

Load NEMO_TMP into vendor/nemo/current.

File:

• vendor/nemo/current/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (5 diffs)

vendor/nemo/current/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -73 +73 @@
    USE lib_mpp         ! distributed memory computing
 #if defined key_iomput
-   USE mod_ioclient
+   USE xios
 #endif
 
@@ -86 +86 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO Consortium (2011)
-   !! $Id: nemogcm.F90 3294 2012-01-28 16:44:18Z rblod $
+   !! $Id: nemogcm.F90 3415 2012-06-15 13:29:37Z rblod $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -185 +185 @@
       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
       !
@@ -219 +225 @@
       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
@@ -407 +415 @@
          WRITE(numout,*) '      number of proc. following j     nn_jsplt   = ', nn_jsplt
          WRITE(numout,*) '      benchmark parameter (0/1)       nn_bench   = ', nn_bench
+         WRITE(numout,*) '      timing activated    (0/1)       nn_timing  = ', nn_timing
       ENDIF
       !