Changeset 1302 for trunk/LMDZ.COMMON/libf/dyn3dpar/parallel_lmdz.F90

Timestamp:

Jun 26, 2014, 6:07:05 PM (11 years ago)

Author:

emillour

Message:

Common dynamics:
Some updates to keep up with LMDZ5 Earth model evolution
(up to LMDZ5 rev 2070). See file "DOC/chantiers/commit_importants.log"
for detailed list of changes.
Note that the updates of exner* routines change (as expected) results
at numerical roundoff level.
EM

File:

• trunk/LMDZ.COMMON/libf/dyn3dpar/parallel_lmdz.F90 (modified) (3 diffs)

trunk/LMDZ.COMMON/libf/dyn3dpar/parallel_lmdz.F90

@@ -225 +225 @@
 #endif
 #ifdef CPP_COUPLE
+! Use of Oasis-MCT coupler 
+#if defined CPP_OMCT
+    use mod_prism
+#else
     use mod_prism_proto
 #endif
-#ifdef CPP_EARTH
 ! Ehouarn: surface_data module is in 'phylmd' ...
       use surface_data, only : type_ocean
@@ -252 +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)
@@ -258 +265 @@
          endif
 #endif 
+#endif
       else
 #ifdef CPP_XIOS