Changeset 52


Ignore:
Timestamp:
02/02/09 16:09:12 (15 years ago)
Author:
pinsard
Message:

dataset is a reserved word in matlab

Location:
trunk/src/SIMULS_IRCAAM
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/SIMULS_IRCAAM/carte_eof_df.m

    r50 r52  
    1 function carte_eof_df(dataset,simulation,ndmin, ndmax) 
     1function carte_eof_df(ircaam_dataset,simulation,ndmin, ndmax) 
    22% carte_eof_df ++explication between ndmin days and ndmax days 
    33 
    … …  
    8383 
    8484if nargin==4 
    85  % dataset must be equal to arpege 
    86  if ~strcmp(dataset,'arpege') 
    87   disp(['dataset = ', dataset]); 
    88   error('eee : dataset must be equal to arpege'); 
    89  end 
    90  if strcmp(dataset,'arpege') 
     85 % ircaam_dataset must be equal to arpege 
     86 if ~strcmp(ircaam_dataset,'arpege') 
     87  disp(['ircaam_dataset = ', ircaam_dataset]); 
     88  error('eee : ircaam_dataset must be equal to arpege'); 
     89 end 
     90 if strcmp(ircaam_dataset,'arpege') 
    9191  list_simulation={'AfNQIVIV','TrNQIVIV','AsNQIVIV','CtIV','CtCl'}; 
    9292 end 
    … …  
    107107 end 
    108108else 
    109   usage='usage : carte_eof_df(dataset,simulation,ndmin, ndmax)'; 
     109  usage='usage : carte_eof_df(ircaam_dataset,simulation,ndmin, ndmax)'; 
    110110  disp(usage); 
    111111  error('eee : wrong arguments numbers') 
    … …  
    119119close all; 
    120120 
    121 fullfilename=[IRCAAM_ID,'eof_',dataset,'_', simulation, '_', df, '.mat']; 
     121fullfilename=[IRCAAM_ID,'eof_',ircaam_dataset,'_', simulation, '_', df, '.mat']; 
    122122status=load(fullfilename,'C','L'); 
    123123clear fullfilename; 
    … …  
    273273set (gca,'tickDir','out'); 
    274274 
    275 fullfilename=[IRCAAM_OD,'carte_eof_', dataset, '_', simulation, '_', df, '.eps']; 
     275fullfilename=[IRCAAM_OD,'carte_eof_', ircaam_dataset, '_', simulation, '_', df, '.eps']; 
    276276print('-depsc2',fullfilename); 
    277277clear fullfilename; 
    278278 
    279 clear dataset; 
     279clear ircaam_dataset; 
    280280clear simulation; 
    281281clear df; 

  • trunk/src/SIMULS_IRCAAM/time_serie_eof_df.m

    r50 r52  
    1 function time_serie_eof_df(dataset,simulation,ndmin, ndmax) 
     1function time_serie_eof_df(ircaam_dataset,simulation,ndmin, ndmax) 
    22% time_serie_eof_df ++explication between ndmin days and ndmax days 
    33 
    … …  
    8080 
    8181if nargin==4 
    82  % dataset must be equal to arpege 
    83  if ~strcmp(dataset,'arpege') 
    84   disp(['dataset = ', dataset]); 
    85   error('eee : dataset must be equal to arpege'); 
    86  end 
    87  if strcmp(dataset,'arpege') 
     82 % ircaam_dataset must be equal to arpege 
     83 if ~strcmp(ircaam_dataset,'arpege') 
     84  disp(['ircaam_dataset = ', ircaam_dataset]); 
     85  error('eee : ircaam_dataset must be equal to arpege'); 
     86 end 
     87 if strcmp(ircaam_dataset,'arpege') 
    8888  list_simulation={'AfNQIVIV','TrNQIVIV','AsNQIVIV','CtIV','CtCl'}; 
    8989 end 
    … …  
    104104 end 
    105105else 
    106   usage='usage : time_serie_jjas_df(dataset,simulation,ndmin, ndmax)'; 
     106  usage='usage : time_serie_jjas_df(ircaam_dataset,simulation,ndmin, ndmax)'; 
    107107  disp(usage); 
    108108  error('eee : wrong arguments numbers') 
    … …  
    116116close all; 
    117117 
    118 fullfilename=[IRCAAM_ID,'eof_',dataset,'_', simulation, '_', df, '.mat']; 
     118fullfilename=[IRCAAM_ID,'eof_',ircaam_dataset,'_', simulation, '_', df, '.mat']; 
    119119status=load(fullfilename,'C','olr'); 
    120120clear fullfilename; 
    … …  
    139139end; 
    140140 
    141 fullfilename=[IRCAAM_OD,'eof1_',dataset,'_', simulation, '_', df,'.txt']; 
     141fullfilename=[IRCAAM_OD,'eof1_',ircaam_dataset,'_', simulation, '_', df,'.txt']; 
    142142save(fullfilename,'time_serie_olr1','-ASCII'); 
    143143clear fullfilename; 
    144144 
    145 fullfilename=[IRCAAM_OD,'eof2_',dataset,'_', simulation, '_', df,'.txt']; 
     145fullfilename=[IRCAAM_OD,'eof2_',ircaam_dataset,'_', simulation, '_', df,'.txt']; 
    146146save(fullfilename','time_serie_olr2','-ASCII'); 
    147147clear fullfilename; 
    … …  
    172172   plot(x,y,'k:'); 
    173173   title(a+1970,'FontSize',8); 
    174    my_title=['serie temporelle eof ', dataset, ' ' , simulation, ' ' , df]; 
     174   my_title=['serie temporelle eof ', ircaam_dataset, ' ' , simulation, ' ' , df]; 
    175175   if a==2; 
    176176       text(0,5.5,my_title); 
    … …  
    189189 
    190190figure(1); 
    191 fullfilename=[IRCAAM_OD,'time_serie_eof_', dataset, '_', simulation, '_', df, '_part1.eps']; 
     191fullfilename=[IRCAAM_OD,'time_serie_eof_', ircaam_dataset, '_', simulation, '_', df, '_part1.eps']; 
    192192print('-depsc2',fullfilename); 
    193193clear fullfilename; 
    194194 
    195195figure(2); 
    196 fullfilename=[IRCAAM_OD,'time_serie_eof_', dataset, '_', simulation, '_', df, '_part2.eps']; 
     196fullfilename=[IRCAAM_OD,'time_serie_eof_', ircaam_dataset, '_', simulation, '_', df, '_part2.eps']; 
    197197print('-depsc2',fullfilename); 
    198198clear fullfilename; 
    199199 
    200200figure(3); 
    201 fullfilename=[IRCAAM_OD,'time_serie_eof_', dataset, '_', simulation, '_', df, '_part3.eps']; 
     201fullfilename=[IRCAAM_OD,'time_serie_eof_', ircaam_dataset, '_', simulation, '_', df, '_part3.eps']; 
    202202print('-depsc2',fullfilename); 
    203203clear fullfilename; 
    204204 
    205 clear dataset; 
     205clear ircaam_dataset; 
    206206clear simulation; 
    207207clear df; 
Note: See TracChangeset for help on using the changeset viewer.