Ignore:
Timestamp:
Sep 11, 2013, 11:45:01 AM (11 years ago)
Author:
Laurent Fairhead
Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860


New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phy1d/lmdz1d.F

    r1795 r1864  
    632632        zval=0.
    633633        zthe=0.
    634         ema_work1=0.
    635         ema_work2=0.
     634        sig1=0.
     635        w01=0.
     636        u_ancien(1,:)=u(:)
     637        v_ancien(1,:)=v(:)
    636638 
    637639!------------------------------------------------------------------------
     
    645647! agesno(:,nsrf),zmea,zstd,zsig,zgam,zthe,zpic,zval,rugoro
    646648! t_ancien,q_ancien,frugs(:,is_oce),clwcon(:,1),rnebcon(:,1),ratqs(:,1)
    647 ! run_off_lic_0,pbl_tke(:,1:klev,nsrf),zmax0,f0,ema_work1,ema_work2
     649! run_off_lic_0,pbl_tke(:,1:klev,nsrf),zmax0,f0,sig1,w01
    648650! wake_deltat,wake_deltaq,wake_s,wake_cstar,wake_fip
    649651!------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.