Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2435 r2669  
    2525#ifdef CPP_XIOS
    2626      USE xios, ONLY: xios_update_calendar
    27       USE wxios, only: wxios_add_vaxis, wxios_set_timestep, wxios_closedef, &
    28                       histwrite_phy
     27      USE wxios, only: wxios_add_vaxis, wxios_set_cal, wxios_closedef
     28      USE iophy, ONLY: histwrite_phy
    2929#endif
    3030
     
    129129!XIOS
    130130    ! Declare available vertical axes to be used in output files:   
    131     !CALL wxios_add_vaxis("presnivs", "dummy-not-used", klev, presnivs)
    132131    CALL wxios_add_vaxis("presnivs", klev, presnivs)
    133132
    134     ! Declare time step length (in s):
    135     CALL wxios_set_timestep(dtime)
    136 
     133    ! Declare calendar and time step
     134    CALL wxios_set_cal(dtime,"earth_360d",1,1,1,0.0,1,1,1,0.0)
     135   
    137136    !Finalize the context:
    138137    CALL wxios_closedef()
    139138#endif
    140139!$OMP END MASTER
     140!$OMP BARRIER
    141141endif ! of if (debut)
    142142
Note: See TracChangeset for help on using the changeset viewer.