Ignore:
Timestamp:
06/24/14 10:00:25 (10 years ago)
Author:
kodalazian
Message:

conflicts solved

File:
1 edited

Legend:

Unmodified
Added
Removed
  • altifloat/src/floater.h

    r122 r123  
    3232//YREAL c2,c3,c4,c5; 
    3333//YREAL dtfil=26042000; 
    34 YREAL dtfil=25000000; 
     34YREAL dtfil=2.604166666666667e+07; 
    3535 
    3636#endif 
    3737 
    3838//Options du run incr士ental 
    39 int nb_extiter=22; 
     39int nb_extiter=16; 
    4040short inc_save=1; 
    4141char dirsave[50]="../obs_float/"; 
Note: See TracChangeset for help on using the changeset viewer.