Changeset 1882


Ignore:
Timestamp:
Oct 3, 2013, 11:58:39 AM (11 years ago)
Author:
Ehouarn Millour
Message:

Updating/adapting iophy in phydev (part 1).
EM

Location:
LMDZ5/trunk/libf/phydev
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/phydev/physiq.F90

    r1852 r1882  
    104104  call ymds2ju(1979, 1, 1, 0.0, zjulian)
    105105  dtime=pdtphys
     106#ifndef CPP_NO_IOIPSL
     107  ! Initialize IOIPSL output file
    106108  call histbeg_phy("histins.nc",itau0,zjulian,dtime,nhori,nid_hist)
    107 
    108 
     109#endif
    109110
    110111!$OMP MASTER
    111112
    112 
    113 
     113#ifndef CPP_NO_IOIPSL
     114! IOIPSL
    114115  ! define vertical coordinate
    115116  call histvert(nid_hist,"presnivs","Vertical levels","Pa",klev, &
     
    130131  ! end definition sequence
    131132  call histend(nid_hist)
    132 
     133#endif
     134
     135#ifdef CPP_XIOS
    133136!XIOS
    134 #ifdef CPP_XIOS
    135137    ! Déclaration de l'axe vertical du fichier:   
    136     !CALL wxios_add_vaxis("presnivs", "histins", klev, presnivs)
     138    CALL wxios_add_vaxis("presnivs", "histins", klev, presnivs)
    137139
    138140    !Déclaration du pas de temps:
    139     !CALL wxios_set_timestep(dtime)
     141    CALL wxios_set_timestep(dtime)
    140142
    141143    !Finalisation du contexte:
    142     !CALL wxios_closedef()
     144    CALL wxios_closedef()
    143145#endif
    144146!$OMP END MASTER
    145147endif ! of if (debut)
    146148
    147 ! increment counter itau
     149! increment local time counter itau
    148150itau=itau+1
    149151
     
    169171
    170172! write some outputs:
     173! IOIPSL
     174#ifndef CPP_NO_IOIPSL
    171175if (modulo(itau,iwrite_phys)==0) then
    172176  call histwrite_phy(nid_hist,.false.,"temperature",itau,t)
     
    175179  call histwrite_phy(nid_hist,.false.,"ps",itau,paprs(:,1))
    176180endif
     181#endif
    177182
    178183!XIOS
    179184#ifdef CPP_XIOS
    180185!$OMP MASTER
    181     !On incrémente le pas de temps XIOS
    182     !CALL wxios_update_calendar(itau)
    183 
    184     !Et on écrit, avec la routine histwrite dédiée:
    185     !CALL histwrite_phy("temperature",t)
    186     !CALL histwrite_phy("u",u)
    187     !CALL histwrite_phy("v",v)
    188     !CALL histwrite_phy("ps",paprs(:,1))
     186    !Increment XIOS time
     187    CALL wxios_update_calendar(itau)
     188
     189    !Send fields to XIOS:
     190    CALL histwrite_phy("temperature",t)
     191    CALL histwrite_phy("u",u)
     192    CALL histwrite_phy("v",v)
     193    CALL histwrite_phy("ps",paprs(:,1))
    189194!$OMP END MASTER
    190195#endif
Note: See TracChangeset for help on using the changeset viewer.