Ignore:
Timestamp:
Mar 20, 2014, 10:57:19 AM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r1920:1997 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/tools/install_1d_src.sh

    r1910 r1999  
    2020
    2121cd ../phy1d
    22 rm wrgradsfi.F # already in 1DUTILS.h
    23 
    24 sed -i -e "/add_phys_tend.*_vdf/s/add_phys_tend/add_pbl_tend/" physiq.F90
    25 
    26 sed -i -e "/SUBROUTINE *convers_timesteps/,/END SUBROUTINE convers_timesteps/{
    27  /USE *phys_cal_mod/d
    28  /use *ioipsl/a\\
    29     USE phys_cal_mod
    30  s/ioget_mon_len(annee_ref,day_ref)/mth_len/
    31 };/SUBROUTINE *phys_output_open/,/end *subroutine *phys_output_open/{
    32  /USE *ioipsl/a\\
    33   USE phys_cal_mod, only : hour
    34  /ymds2ju.*annee_ref.*zjulian/c\\
    35 !!!      CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)       !jyg \\
    36 ! correction pour l heure initiale                               !jyg \\
    37 !                                                                !jyg \\
    38       CALL ymds2ju(annee_ref, 1, idayref, hour, zjulian)         !jyg
    39 }" phys_output_mod.F90
    4022
    4123 ln -s ../dyn3d/mod_const_mpi.F90 .
    42  ln -s ../dyn3d/infotrac.F90 .
     24 ln -sf ../dyn3d_common/infotrac.F90 .
    4325 ln -s ../dyn3d/conf_gcm.F .
    44  ln -s ../dyn3d/pres2lev* .
    45  ln -s ../dyn3d/control_mod.F90 .
    46  ln -s ../dyn3d/q_sat.F .
    47  ln -s ../dyn3d/disvert.F90 .
     26 ln -s ../dyn3d_common/control_mod.F90 .
     27 ln -sf ../dyn3d_common/q_sat.F .
     28 ln -s ../dyn3d_common/disvert.F90 .
Note: See TracChangeset for help on using the changeset viewer.