Ignore:
Timestamp:
Nov 5, 2018, 3:24:59 PM (6 years ago)
Author:
Laurent Fairhead
Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/DefLists/cosp_output_nl.txt

    r3356 r3411  
    2828&COSP_OUTPUT
    2929  ! Simulator flags
    30   Lradar_sim=.true.,
     30  Lradar_sim=.false.,
    3131  Llidar_sim=.true.,
    3232  Lisccp_sim=.true.,
    33   Lmisr_sim=.true.,
    34   Lmodis_sim=.true.,
     33  Lmisr_sim=.false.,
     34  Lmodis_sim=.false.,
    3535  Lrttov_sim=.false.,
    3636  ! Output variables
    … …  
    3939  !- CloudSat
    4040  Lcfaddbze94=.false.,
    41   Ldbze94=.false.,
     41  Ldbze94=.true.,
    4242  !- CALIPSO
    4343  Latb532=.false.,
    … …  
    5353  Lclcalipsoice=.true.,
    5454  Lclcalipsoun=.true.,
    55   Lclcalipsotmp=.false.,
    56   Lclcalipsotmpliq=.false.,
    57   Lclcalipsotmpice=.false.,
    58   Lclcalipsotmpun=.false.,
     55  Lclcalipsotmp=.true.,
     56  Lclcalipsotmpliq=.true.,
     57  Lclcalipsotmpice=.true.,
     58  Lclcalipsotmpun=.true.,
    5959  Lclhcalipsoliq=.true.,
    6060  Lcllcalipsoliq=.true.,
    … …  
    7070  Lcltcalipsoun=.true.,
    7171  ! OPAQ variables
    72   Lclopaquecalipso=.false.,
    73   Lclthincalipso=.false.,
    74   Lclzopaquecalipso=.false.,
    75   Lclcalipsoopaque=.false.,
    76   Lclcalipsothin=.false.,
    77   Lclcalipsozopaque=.false.,
    78   Lclcalipsoopacity=.false.,
     72  Lclopaquecalipso=.true.,
     73  Lclthincalipso=.true.,
     74  Lclzopaquecalipso=.true.,
     75  Lclcalipsoopaque=.true.,
     76  Lclcalipsothin=.true.,
     77  Lclcalipsozopaque=.true.,
     78  Lclcalipsoopacity=.true.,
    7979  ! TIBO variables
    80   Lproftemp=.false.,
    81   LprofSR=.false.,
     80  Lproftemp=.true.,
     81  LprofSR=.true.,
    8282  !- ISCCP
    8383  Lalbisccp=.true.,
    … …  
    9191  Lmeantbclrisccp=.true.,
    9292  !- MISR
    93   LclMISR=.true.,
     93  LclMISR=.false.,
    9494  !- Use lidar and radar
    95   Lclcalipso2=.true.,
    96   Lcltlidarradar=.true.,
     95  Lclcalipso2=.false.,
     96  Lcltlidarradar=.false.,
    9797  !- These are provided for debugging or special purposes
    9898  Lfracout=.false.,
    99   LlidarBetaMol532=.false., 
     99  LlidarBetaMol532=.true., 
    100100  !- MODIS
    101   Lcltmodis=.true.,
    102   Lclwmodis=.true.,
    103   Lclimodis=.true.,
    104   Lclhmodis=.true.,
    105   Lclmmodis=.true.,
    106   Lcllmodis=.true.,
    107   Ltautmodis=.true.,
    108   Ltauwmodis=.true.,
    109   Ltauimodis=.true.,
     101  Lcltmodis=.false.,
     102  Lclwmodis=.false.,
     103  Lclimodis=.false.,
     104  Lclhmodis=.false.,
     105  Lclmmodis=.false.,
     106  Lcllmodis=.false.,
     107  Ltautmodis=.false.,
     108  Ltauwmodis=.false.,
     109  Ltauimodis=.false.,
    110110  Ltautlogmodis=.false.,
    111111  Ltauwlogmodis=.false.,
    … …  
    113113  Lreffclwmodis=.false.,
    114114  Lreffclimodis=.false.,
    115   Lpctmodis=.true.,
    116   Llwpmodis=.true.,
    117   Liwpmodis=.true.,
    118   Lclmodis=.true.,
    119   Lcrimodis=.true.,
    120   Lcrlmodis=.true.,
     115  Lpctmodis=.false.,
     116  Llwpmodis=.false.,
     117  Liwpmodis=.false.,
     118  Lclmodis=.false.,
     119  Lcrimodis=.false.,
     120  Lcrlmodis=.false.,
    121121  !- RTTOV
    122122  Ltbrttov=.false.,
Note: See TracChangeset for help on using the changeset viewer.