Changeset 2669 for LMDZ5/branches/testing/libf/phydev

Timestamp:

Oct 14, 2016, 2:57:28 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2640:2664 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phydev/physiq_mod.F90 (modified) (2 diffs)

LMDZ5/branches/testing/libf/phydev/physiq_mod.F90

@@ -25 +25 @@
 #ifdef CPP_XIOS
       USE xios, ONLY: xios_update_calendar
-      USE wxios, only: wxios_add_vaxis, wxios_set_timestep, wxios_closedef, &
-                       histwrite_phy
+      USE wxios, only: wxios_add_vaxis, wxios_set_cal, wxios_closedef
+      USE iophy, ONLY: histwrite_phy
 #endif
 
@@ -129 +129 @@
 !XIOS
     ! Declare available vertical axes to be used in output files:    
-    !CALL wxios_add_vaxis("presnivs", "dummy-not-used", klev, presnivs)
     CALL wxios_add_vaxis("presnivs", klev, presnivs)
 
-    ! Declare time step length (in s):
-    CALL wxios_set_timestep(dtime)
-
+    ! Declare calendar and time step
+    CALL wxios_set_cal(dtime,"earth_360d",1,1,1,0.0,1,1,1,0.0)
+    
     !Finalize the context:
     CALL wxios_closedef()
 #endif
 !$OMP END MASTER
+!$OMP BARRIER
 endif ! of if (debut)