Changeset 2056 for LMDZ5/branches/testing/libf/phylmd/oasis.F90

Timestamp:

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

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/oasis.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/phylmd/oasis.F90

@@ -96 +96 @@
     USE surface_data, ONLY : version_ocean
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
+#ifdef CPP_XIOS
+    USE wxios, ONLY : wxios_context_init 
+#endif
+
 
     INCLUDE "dimensions.h"
@@ -128 +132 @@
 ! Define the model name
 !
-    clmodnam = 'lmdz.x'       ! as in $NBMODEL in Cpl/Nam/namcouple.tmp
+    clmodnam = 'LMDZ'       ! as in $NBMODEL in Cpl/Nam/namcouple.tmp
 
 
@@ -298 +302 @@
     ENDIF
 
+#ifdef CPP_XIOS
+    CALL wxios_context_init()
+#endif
+
 !$OMP END MASTER