Changeset 2056 for LMDZ5/branches/testing/libf/dyn3dpar/parallel_lmdz.F90

Timestamp:

Jun 11, 2014, 3:46:46 PM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/parallel_lmdz.F90 (modified) (2 diffs)

LMDZ5/branches/testing/libf/dyn3dpar/parallel_lmdz.F90

@@ -255 +255 @@
 
       if (type_ocean == 'couple') then
+#ifdef CPP_XIOS
+    !Fermeture propre de XIOS
+      CALL wxios_close()
+#else
 #ifdef CPP_COUPLE
          call prism_terminate_proto(ierr)
@@ -261 +265 @@
          endif
 #endif 
+#endif
       else
 #ifdef CPP_XIOS