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

Timestamp:

2013-02-01T15:56:10+01:00 (11 years ago)

Author:

smasson

Message:

dev_MERGE_2012: xios+agrif+oasis compliant

File:

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

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

@@ -194 +194 @@
       !
       CALL nemo_closefile
-#if defined key_oasis3 || defined key_oasis4
+#if defined key_iomput
+      CALL xios_finalize                ! end mpp communications with xios
+# if defined key_oasis3 || defined key_oasis4
       CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
+# endif
 #else
-# if defined key_iomput
-      IF( Agrif_Root() ) THEN
-         CALL xios_finalize             ! end mpp communications
-      ENDIF
+# if defined key_oasis3 || defined key_oasis4
+      CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
 # else
       IF( lk_mpp )   CALL mppstop       ! end mpp communications
@@ -390 +391 @@
       !                                     ! Diagnostics
       IF( lk_floats     )   CALL     flo_init   ! drifting Floats
-                            CALL     iom_init   ! iom_put initialization
       IF( lk_diaar5     )   CALL dia_ar5_init   ! ar5 diag
                             CALL dia_ptr_init   ! Poleward TRansports initialization