Changeset 2054 for LMDZ5/trunk/libf/phylmd

Timestamp:

Jun 3, 2014, 5:07:16 PM (10 years ago)

Author:

acaubel

Message:

Modifications to run LMDZ in coupled mode with both OASIS-MCT and XIOS.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• oasis.F90 (modified) (3 diffs)
• phyetat0.F90 (modified) (2 diffs)

LMDZ5/trunk/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
     

LMDZ5/trunk/libf/phylmd/phyetat0.F90

@@ -1048 +1048 @@
   CALL close_startphy
 
-  CALL init_iophy_new(rlat, rlon)
-
   ! Initialize module pbl_surface_mod 
 
@@ -1060 +1058 @@
   ENDIF
 
+  CALL init_iophy_new(rlat, rlon)
+
   ! Initilialize module fonte_neige_mod      
-
   CALL fonte_neige_init(run_off_lic_0)