Changeset 56 for trunk


Ignore:
Timestamp:
02/10/09 15:37:43 (15 years ago)
Author:
pinsard
Message:

replace ndmin by period1 and ndmax by period2

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/SIMULS_IRCAAM/carte_eof_df.m

    r53 r56  
    1 function carte_eof_df(ircaam_dataset,simulation,ndmin, ndmax) 
    2 % carte_eof_df ++explication between ndmin days and ndmax days 
     1function carte_eof_df(ircaam_dataset,simulation,period1, period2) 
     2% carte_eof_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    1111% =========== 
    1212% 
    13 % From eof_arpege_\ *simulation*\ _  \ *ndmin*\ -\ *ndmax*\ d.mat 
     13% From eof_arpege_\ *simulation*\ _  \ *period1*\ -\ *period2*\ d.mat 
    1414% and rlut_d.\ *simulation*\ .197106-09.nc, 
    1515% ``carte_eof_df`` compute ++. 
    … …  
    1818% 
    1919% 1 Postscript file 
    20 % carte_arpege_\ *simulation*\ _ \ *ndmin*\ -\ *ndmax*\ d.eps are 
     20% carte_arpege_\ *simulation*\ _ \ *period1*\ -\ *period2*\ d.eps are 
    2121% written. 
    2222% 
    … …  
    6363% $Id$ 
    6464% 
     65% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     66% 
     67%   * replace ndmin by period1 and ndmax by period2 
     68% 
    6569% - fplod 2009-02-02T13:45:57Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6670% 
    … …  
    7175%     carte_eof_ircaam_30100_ctl.m and carte_eof_ircaam_30100_tr.m 
    7276% 
    73 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     77%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    7478% 
    7579%     Dataset ``arpege`` will be forced in output file names. 
    … …  
    100104 end 
    101105 clear list_simulation; 
    102  % ndmin must be lower than ndmax 
    103  if (ndmin > ndmax) 
    104   disp(['ndmin = ', int2str(ndmin)]); 
    105   disp(['ndmax = ', int2str(ndmax)]); 
    106   error('eee : ndmin must be lower than ndmax'); 
     106 % period1 must be lower than period2 
     107 if (period1 > period2) 
     108  disp(['period1 = ', int2str(period1)]); 
     109  disp(['period2 = ', int2str(period2)]); 
     110  error('eee : period1 must be lower than period2'); 
    107111 end 
    108112else 
    109   usage='usage : carte_eof_df(ircaam_dataset,simulation,ndmin, ndmax)'; 
     113  usage='usage : carte_eof_df(ircaam_dataset,simulation,period1, period2)'; 
    110114  disp(usage); 
    111115  error('eee : wrong arguments numbers') 
    112116end 
    113117 
    114 % ndmin and ndmax will be used in xx-yyd form in filenames 
    115 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    116 clear ndmin; 
    117 clear ndmax; 
     118% period1 and period2 will be used in xx-yyd form in filenames 
     119df = [int2str(period1),'-',int2str(period2),'d']; 
     120clear period1; 
     121clear period2; 
    118122 
    119123close all; 

  • trunk/src/SIMULS_IRCAAM/eof_df.m

    r50 r56  
    1 function eof_df(ircaam_dataset,simulation,ndmin, ndmax) 
    2 % eof_df ++explication between ndmin days and ndmax days 
     1function eof_df(ircaam_dataset,simulation,period1, period2) 
     2% eof_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    1111% =========== 
    1212% 
    13 % From olrf_arpege_ \ *simulation*\ _  \ *ndmin*\ -\ *ndmax*\ d.80.dat, 
     13% From olrf_arpege_ \ *simulation*\ _  \ *period1*\ -\ *period2*\ d.80.dat, 
    1414% ``eof_df`` compute ++. 
    1515% 
    1616% 1 Postscript file 
    17 % eof_arpege_\ *simulation*\ _ \ *ndmin*\ -\ *ndmax*\ d.eps are 
     17% eof_arpege_\ *simulation*\ _ \ *period1*\ -\ *period2*\ d.eps are 
    1818% written. 
    1919% 
    … …  
    5353% $Id$ 
    5454% 
     55% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     56% 
     57%   * replace ndmin by period1 and ndmax by period2 
     58% 
    5559% - fplod 2009-02-02T13:45:57Z aedon.locean-ipsl.upmc.fr (Darwin) 
    5660% 
    … …  
    6165%     and eof_olr_ircaam_30100_tr.m 
    6266% 
    63 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     67%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    6468% 
    6569%     Dataset ``arpege`` will be forced in output file names. 
    … …  
    8993 end 
    9094 clear list_simulation; 
    91  % ndmin must be lower than ndmax 
    92  if (ndmin > ndmax) 
    93   disp(['ndmin = ', int2str(ndmin)]); 
    94   disp(['ndmax = ', int2str(ndmax)]); 
    95   error('eee : ndmin must be lower than ndmax'); 
     95 % period1 must be lower than period2 
     96 if (period1 > period2) 
     97  disp(['period1 = ', int2str(period1)]); 
     98  disp(['period2 = ', int2str(period2)]); 
     99  error('eee : period1 must be lower than period2'); 
    96100 end 
    97101else 
    98   usage='usage : eof_df(ircaam_dataset,simulation,ndmin, ndmax)'; 
     102  usage='usage : eof_df(ircaam_dataset,simulation,period1, period2)'; 
    99103  disp(usage); 
    100104  error('eee : wrong arguments numbers') 
    101105end 
    102106 
    103 % ndmin and ndmax will be used in xx-yyd form in filenames 
    104 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    105 clear ndmin; 
    106 clear ndmax; 
     107% period1 and period2 will be used in xx-yyd form in filenames 
     108df = [int2str(period1),'-',int2str(period2),'d']; 
     109clear period1; 
     110clear period2; 
    107111 
    108112close all; 

  • trunk/src/SIMULS_IRCAAM/time_serie_eof_df.m

    r52 r56  
    1 function time_serie_eof_df(ircaam_dataset,simulation,ndmin, ndmax) 
    2 % time_serie_eof_df ++explication between ndmin days and ndmax days 
     1function time_serie_eof_df(ircaam_dataset,simulation,period1, period2) 
     2% time_serie_eof_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    1111% =========== 
    1212% 
    13 % From eof_arpege_\ *simulation*\ _  \ *ndmin*\ -\ *ndmax*\ d.mat, 
     13% From eof_arpege_\ *simulation*\ _  \ *period1*\ -\ *period2*\ d.mat, 
    1414% ``time_serie_eof_df`` compute ++. 
    1515% 
    1616% ``time_serie_eof_df`` plot ++. 
    1717% 
    18 % ``time_serie_eof_df`` save eof[12]_arpege_\ *simulation*\ _  \ *ndmin*\ -\ *ndmax*\ d.txt. 
     18% ``time_serie_eof_df`` save eof[12]_arpege_\ *simulation*\ _  \ *period1*\ -\ *period2*\ d.txt. 
    1919% 
    2020% 2 Postscript files 
    21 % time_serie_arpege_\ *simulation*\ _ \ *ndmin*\ -\ *ndmax*\ d_part[12].eps are 
     21% time_serie_arpege_\ *simulation*\ _ \ *period1*\ -\ *period2*\ d_part[12].eps are 
    2222% written. 
    2323% 
    … …  
    5959% $Id$ 
    6060% 
     61% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     62% 
     63%   * replace ndmin by period1 and ndmax by period2 
     64% 
    6165% - fplod 2009-02-02T10:01:21Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6266% 
    … …  
    6670%     time_serie_tr_30100.m 
    6771% 
    68 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     72%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    6973% 
    7074%     Dataset ``arpege`` will be forced in output file names. 
    … …  
    97101 end 
    98102 clear list_simulation; 
    99  % ndmin must be lower than ndmax 
    100  if (ndmin > ndmax) 
    101   disp(['ndmin = ', int2str(ndmin)]); 
    102   disp(['ndmax = ', int2str(ndmax)]); 
    103   error('eee : ndmin must be lower than ndmax'); 
     103 % period1 must be lower than period2 
     104 if (period1 > period2) 
     105  disp(['period1 = ', int2str(period1)]); 
     106  disp(['period2 = ', int2str(period2)]); 
     107  error('eee : period1 must be lower than period2'); 
    104108 end 
    105109else 
    106   usage='usage : time_serie_jjas_df(ircaam_dataset,simulation,ndmin, ndmax)'; 
     110  usage='usage : time_serie_jjas_df(ircaam_dataset,simulation,period1, period2)'; 
    107111  disp(usage); 
    108112  error('eee : wrong arguments numbers') 
    109113end 
    110114 
    111 % ndmin and ndmax will be used in xx-yyd form in filenames 
    112 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    113 clear ndmin; 
    114 clear ndmax; 
     115% period1 and period2 will be used in xx-yyd form in filenames 
     116df = [int2str(period1),'-',int2str(period2),'d']; 
     117clear period1; 
     118clear period2; 
    115119 
    116120close all; 

  • trunk/src/mode_sahelien/carte_eof234_jjas_df.m

    r37 r56  
    1 function carte_eof234_jjas_df(ndmin, ndmax) 
    2 % carte_eof234_jjas_df ++explication between ndmin days and ndmax days 
     1function carte_eof234_jjas_df(period1, period2) 
     2% carte_eof234_jjas_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    6565% $Id$ 
    6666% 
     67% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     68% 
     69%   * replace ndmin by period1 and ndmax by period2 
     70% 
    6771% - fplod 2009-01-27T14:49:51Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6872% 
    … …  
    7074%     to replace both. 
    7175% 
    72 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     76%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    7377% 
    7478%   *  add sauvegrads on first EOF for homogenity 
    … …  
    8185 
    8286if nargin==2 
    83  % ndmin must be lower than ndmax 
    84  if (ndmin > ndmax) 
    85   disp(['ndmin = ', int2str(ndmin)]); 
    86   disp(['ndmax = ', int2str(ndmax)]); 
    87   error('eee : ndmin must be lower than ndmax'); 
     87 % period1 must be lower than period2 
     88 if (period1 > period2) 
     89  disp(['period1 = ', int2str(period1)]); 
     90  disp(['period2 = ', int2str(period2)]); 
     91  error('eee : period1 must be lower than period2'); 
    8892 end 
    8993else 
    90   usage='usage : carte_eof234_jjas_df(ndmin, ndmax)'; 
     94  usage='usage : carte_eof234_jjas_df(period1, period2)'; 
    9195  disp(usage); 
    9296  error('eee : wrong arguments numbers') 
    9397end 
    9498 
    95 % ndmin and ndmax will be used in xx-yyd form in filenames 
    96 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    97 clear ndmin; 
    98 clear ndmax; 
     99% period1 and period2 will be used in xx-yyd form in filenames 
     100df = [int2str(period1),'-',int2str(period2),'d']; 
     101clear period1; 
     102clear period2; 
    99103 
    100104 

  • trunk/src/mode_sahelien/carte_eof_ER_jjas_df.m

    r39 r56  
    1 function carte_eof_ER_jjas_df(ndmin, ndmax) 
    2 % carte_eof_ER_jjas_df ++explication between ndmin days and ndmax days 
     1function carte_eof_ER_jjas_df(period1, period2) 
     2% carte_eof_ER_jjas_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    6464% $Id$ 
    6565% 
     66% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     67% 
     68%   * replace ndmin by period1 and ndmax by period2 
     69% 
    6670% - fplod 2009-01-27T12:39:15Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6771% 
    … …  
    6973%     carte_eof_ER_jjas_30100.m 
    7074% 
    71 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     75%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    7276% 
    7377%- 
    … …  
    7781 
    7882if nargin==2 
    79  % ndmin must be lower than ndmax 
    80  if (ndmin > ndmax) 
    81   disp(['ndmin = ', int2str(ndmin)]); 
    82   disp(['ndmax = ', int2str(ndmax)]); 
    83   error('eee : ndmin must be lower than ndmax'); 
     83 % period1 must be lower than period2 
     84 if (period1 > period2) 
     85  disp(['period1 = ', int2str(period1)]); 
     86  disp(['period2 = ', int2str(period2)]); 
     87  error('eee : period1 must be lower than period2'); 
    8488 end 
    8589else 
    86   usage='usage : carte_eof_ER_jjas_df(ndmin, ndmax)'; 
     90  usage='usage : carte_eof_ER_jjas_df(period1, period2)'; 
    8791  disp(usage); 
    8892  error('eee : wrong arguments numbers') 
    8993end 
    9094 
    91 % ndmin and ndmax will be used in xx-yyd form in filenames 
    92 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    93 clear ndmin; 
    94 clear ndmax; 
     95% period1 and period2 will be used in xx-yyd form in filenames 
     96df = [int2str(period1),'-',int2str(period2),'d']; 
     97clear period1; 
     98clear period2; 
    9599 
    96100fullfilename=[IRCAAM_ID,'eof_rossby_jjas_2006_',df,'.mat']; 

  • trunk/src/mode_sahelien/composite_olr_eof_df.m

    r44 r56  
    1 function composite_olr_eof_df(eof_num, ndmin, ndmax) 
    2 % composite_olr_eof_df ++explication between ndmin days and ndmax days 
     1function composite_olr_eof_df(eof_num, period1, period2) 
     2% composite_olr_eof_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    1111% =========== 
    1212% 
    13 % From ``olr.day.mean.nc`` and and eof\ *eof_num*\ \ *ndmin*\ -\ *ndmax*\ d.txt, 
     13% From ``olr.day.mean.nc`` and and eof\ *eof_num*\ \ *period1*\ -\ *period2*\ d.txt, 
    1414% ``composite_olr_eof_df`` compute ++ 
    1515% 
    … …  
    1717% 
    1818% 2 Postscript files  
    19 % composite_olr_eof\ *eof_num*\ _\ *ndmin*\ -\ *ndmax*\ d_part[12].eps are  
     19% composite_olr_eof\ *eof_num*\ _\ *period1*\ -\ *period2*\ d_part[12].eps are  
    2020% written. 
    2121% 
    … …  
    6666% $Id$ 
    6767% 
     68% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     69% 
     70%   * replace ndmin by period1 and ndmax by period2 
     71% 
    6872% - fplod 2009-01-28T10:38:44Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6973% 
    … …  
    7175%     composite_olr_EOF1_30100.m 
    7276% 
    73 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     77%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    7478% 
    7579%   * introducing parametrization on EOF number 
    … …  
    9296  error('eee : eof_num must be between eof_num_min and eof_num_max'); 
    9397 end 
    94  % ndmin must be lower than ndmax 
    95  if (ndmin > ndmax) 
    96   disp(['ndmin = ', int2str(ndmin)]); 
    97   disp(['ndmax = ', int2str(ndmax)]); 
    98   error('eee : ndmin must be lower than ndmax'); 
     98 % period1 must be lower than period2 
     99 if (period1 > period2) 
     100  disp(['period1 = ', int2str(period1)]); 
     101  disp(['period2 = ', int2str(period2)]); 
     102  error('eee : period1 must be lower than period2'); 
    99103 end 
    100104else 
    101   usage='usage : composite_olr_eof_df(eof_num,ndmin, ndmax)'; 
     105  usage='usage : composite_olr_eof_df(eof_num,period1, period2)'; 
    102106  disp(usage); 
    103107  error('eee : wrong arguments numbers') 
    104108end 
    105109 
    106 % ndmin and ndmax will be used in xx-yyd form in filenames 
    107 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    108 clear ndmin; 
    109 clear ndmax; 
     110% period1 and period2 will be used in xx-yyd form in filenames 
     111df = [int2str(period1),'-',int2str(period2),'d']; 
     112clear period1; 
     113clear period2; 
    110114 
    111115fullfilename=[IRCAAM_ID,'olr.day.mean.nc']; 

  • trunk/src/mode_sahelien/olr_eof_jjas2006_rossby_df.m

    r36 r56  
    1 function olr_eof_jjas2006_rossby_df(ndmin, ndmax) 
    2 % olr_eof_jjas2006_rossby_df ++explication between ndmin days and ndmax days 
     1function olr_eof_jjas2006_rossby_df(period1, period2) 
     2% olr_eof_jjas2006_rossby_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    5858% $Id$ 
    5959% 
     60% 
     61% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     62% 
     63%   * replace ndmin by period1 and ndmax by period2 
     64% 
    6065% - fplod 2009-01-27T12:39:15Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6166% 
    … …  
    6469%     olr_eof_jjas2006_rossby_30100.m 
    6570% 
    66 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     71%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    6772% 
    6873%- 
    … …  
    7277 
    7378if nargin==2 
    74  % ndmin must be lower than ndmax 
    75  if (ndmin > ndmax) 
    76   disp(['ndmin = ', int2str(ndmin)]); 
    77   disp(['ndmax = ', int2str(ndmax)]); 
    78   error('eee : ndmin must be lower than ndmax'); 
     79 % period1 must be lower than period2 
     80 if (period1 > period2) 
     81  disp(['period1 = ', int2str(period1)]); 
     82  disp(['period2 = ', int2str(period2)]); 
     83  error('eee : period1 must be lower than period2'); 
    7984 end 
    8085else 
    81   usage='usage : olr_eof_jjas2006_rossby_df(ndmin, ndmax)'; 
     86  usage='usage : olr_eof_jjas2006_rossby_df(period1, period2)'; 
    8287  disp(usage); 
    8388  error('eee : wrong arguments numbers') 
    8489end 
    8590 
    86 % ndmin and ndmax will be used in xx-yyd form in filenames 
    87 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    88 clear ndmin; 
    89 clear ndmax; 
     91% period1 and period2 will be used in xx-yyd form in filenames 
     92df = [int2str(period1),'-',int2str(period2),'d']; 
     93clear period1; 
     94clear period2; 
    9095 
    9196close all; 

  • trunk/src/mode_sahelien/reconstitution_ER_rossby_df.m

    r39 r56  
    1 function reconstitution_ER_rossby_df(ndmin, ndmax) 
    2 % reconstitution_ER_rossby_df ++explication between ndmin days and ndmax days 
     1function reconstitution_ER_rossby_df(period1, period2) 
     2% reconstitution_ER_rossby_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    6060% $Id$ 
    6161% 
     62% 
     63% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     64% 
     65%   * replace ndmin by period1 and ndmax by period2 
     66% 
    6267% - fplod 2009-01-28T07:50:45Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6368% 
    … …  
    6570%     reconstitution_ER_rossby_30100.m 
    6671% 
    67 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     72%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    6873% 
    6974%- 
    … …  
    7378 
    7479if nargin==2 
    75  % ndmin must be lower than ndmax 
    76  if (ndmin > ndmax) 
    77   disp(['ndmin = ', int2str(ndmin)]); 
    78   disp(['ndmax = ', int2str(ndmax)]); 
    79   error('eee : ndmin must be lower than ndmax'); 
     80 % period1 must be lower than period2 
     81 if (period1 > period2) 
     82  disp(['period1 = ', int2str(period1)]); 
     83  disp(['period2 = ', int2str(period2)]); 
     84  error('eee : period1 must be lower than period2'); 
    8085 end 
    8186else 
    82   usage='usage : reconstitution_ER_rossby_df(ndmin, ndmax)'; 
     87  usage='usage : reconstitution_ER_rossby_df(period1, period2)'; 
    8388  disp(usage); 
    8489  error('eee : wrong arguments numbers') 
    8590end 
    86 % ndmin and ndmax will be used in xx-yyd form in filenames 
    87 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    88 clear ndmin; 
    89 clear ndmax; 
     91% period1 and period2 will be used in xx-yyd form in filenames 
     92df = [int2str(period1),'-',int2str(period2),'d']; 
     93clear period1; 
     94clear period2; 
    9095 
    9196close all; 

  • trunk/src/mode_sahelien/time_serie_ER_rossby_df.m

    r39 r56  
    1 function time_serie_ER_rossby_df(ndmin, ndmax) 
    2 % time_serie_ER_rossby_df ++explication between ndmin days and ndmax days 
     1function time_serie_ER_rossby_df(period1, period2) 
     2% time_serie_ER_rossby_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    6060% $Id$ 
    6161% 
     62% 
     63% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     64% 
     65%   * replace ndmin by period1 and ndmax by period2 
     66% 
    6267% - fplod 2009-01-27T10:07:29Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6368% 
    … …  
    6570%     time_serie_ER_rossby_30100.m 
    6671% 
    67 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     72%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    6873% 
    6974%- 
    … …  
    7378 
    7479if nargin==2 
    75  % ndmin must be lower than ndmax 
    76  if (ndmin > ndmax) 
    77   disp(['ndmin = ', int2str(ndmin)]); 
    78   disp(['ndmax = ', int2str(ndmax)]); 
    79   error('eee : ndmin must be lower than ndmax'); 
     80 % period1 must be lower than period2 
     81 if (period1 > period2) 
     82  disp(['period1 = ', int2str(period1)]); 
     83  disp(['period2 = ', int2str(period2)]); 
     84  error('eee : period1 must be lower than period2'); 
    8085 end 
    8186else 
    82   usage='usage : time_serie_ER_rossby_df(ndmin, ndmax)'; 
     87  usage='usage : time_serie_ER_rossby_df(period1, period2)'; 
    8388  disp(usage); 
    8489  error('eee : wrong arguments numbers') 
    8590end 
    8691 
    87 % ndmin and ndmax will be used in xx-yyd form in filenames 
    88 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    89 clear ndmin; 
    90 clear ndmax; 
     92% period1 and period2 will be used in xx-yyd form in filenames 
     93df = [int2str(period1),'-',int2str(period2),'d']; 
     94clear period1; 
     95clear period2; 
    9196 
    9297fullfilename=[IRCAAM_ID,'eof_rossby_jjas_2006_',df,'.mat']; 

  • trunk/src/mode_sahelien/time_serie_ER_rossby_df_complet.m

    r34 r56  
    1 function time_serie_ER_rossby_df_complet(ndmin, ndmax) 
    2 % time_serie_ER_rossby_df_complet ++explication between ndmin days and ndmax days 
     1function time_serie_ER_rossby_df_complet(period1, period2) 
     2% time_serie_ER_rossby_df_complet ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    5252% ========== 
    5353% 
     54% 
     55% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     56% 
     57%   * replace ndmin by period1 and ndmax by period2 
     58% 
    5459% - fplod 2009-01-27T11:51:31Z aedon.locean-ipsl.upmc.fr (Darwin) 
    5560% 
    … …  
    5762%     time_serie_ER_rossby_30100_complet.m 
    5863% 
    59 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     64%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    6065% 
    6166%- 
    … …  
    6570 
    6671if nargin==2 
    67  % ndmin must be lower than ndmax 
    68  if (ndmin > ndmax) 
    69   disp(['ndmin = ', int2str(ndmin)]); 
    70   disp(['ndmax = ', int2str(ndmax)]); 
    71   error('eee : ndmin must be lower than ndmax'); 
     72 % period1 must be lower than period2 
     73 if (period1 > period2) 
     74  disp(['period1 = ', int2str(period1)]); 
     75  disp(['period2 = ', int2str(period2)]); 
     76  error('eee : period1 must be lower than period2'); 
    7277 end 
    7378else 
    74   usage='usage : time_serie_ER_rossby_df(ndmin, ndmax)'; 
     79  usage='usage : time_serie_ER_rossby_df(period1, period2)'; 
    7580  disp(usage); 
    7681  error('eee : wrong arguments numbers') 
    7782end 
    7883 
    79 % ndmin and ndmax will be used in xx-yyd form in filenames 
    80 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    81 clear ndmin; 
    82 clear ndmax; 
     84% period1 and period2 will be used in xx-yyd form in filenames 
     85df = [int2str(period1),'-',int2str(period2),'d']; 
     86clear period1; 
     87clear period2; 
    8388 
    8489close all; 

  • trunk/src/mode_sahelien/time_serie_jjas_df.m

    r44 r56  
    1 function time_serie_jjas_df(ndmin, ndmax) 
    2 % time_serie_jjas_df ++explication between ndmin days and ndmax days 
     1function time_serie_jjas_df(period1, period2) 
     2% time_serie_jjas_df ++explication between period1 days and period2 days 
    33 
    44%+ 
    … …  
    1111% =========== 
    1212% 
    13 % From eof_\ *ndmin*\ -\ *ndmax*\ d_jjas.mat,  
     13% From eof_\ *period1*\ -\ *period2*\ d_jjas.mat,  
    1414% ``time_serie_jjas_df`` compute ++. 
    1515% 
    1616% ``time_serie_jjas_df`` plot ++. 
    1717% 
    18 % ``time_serie_jjas_df`` save eof[123]\ *ndmin*\ -\ *ndmax*\ d.txt. 
     18% ``time_serie_jjas_df`` save eof[123]\ *period1*\ -\ *period2*\ d.txt. 
    1919%  
    2020% 2 Postscript files 
    21 % time_serie_jjas_\ *ndmin*\ -\ *ndmax*\ d_part[12].eps are 
     21% time_serie_jjas_\ *period1*\ -\ *period2*\ d_part[12].eps are 
    2222% written. 
    2323% 
    … …  
    5959% $Id$ 
    6060% 
     61% - fplod 2009-02-10T14:28:00Z aedon.locean-ipsl.upmc.fr (Darwin) 
     62% 
     63%   * replace ndmin by period1 and ndmax by period2 
     64% 
    6165% - fplod 2009-01-28T15:28:54Z aedon.locean-ipsl.upmc.fr (Darwin) 
    6266% 
    … …  
    6468%     time_serie_jjas.m, time_serie_jjas_25_90.m and time_serie_jjas_10_25.m 
    6569% 
    66 %     Days will be now written ``ndmin``\-``ndmaxd`` (ex: 10-30d) in filenames. 
     70%     Days will be now written ``period1``\-``period2d`` (ex: 10-30d) in filenames. 
    6771% 
    6872%- 
    … …  
    7276 
    7377if nargin==2 
    74  % ndmin must be lower than ndmax 
    75  if (ndmin > ndmax) 
    76   disp(['ndmin = ', int2str(ndmin)]); 
    77   disp(['ndmax = ', int2str(ndmax)]); 
    78   error('eee : ndmin must be lower than ndmax'); 
     78 % period1 must be lower than period2 
     79 if (period1 > period2) 
     80  disp(['period1 = ', int2str(period1)]); 
     81  disp(['period2 = ', int2str(period2)]); 
     82  error('eee : period1 must be lower than period2'); 
    7983 end 
    8084else 
    81   usage='usage : time_serie_jjas_df(ndmin, ndmax)'; 
     85  usage='usage : time_serie_jjas_df(period1, period2)'; 
    8286  disp(usage); 
    8387  error('eee : wrong arguments numbers') 
    8488end 
    8589 
    86 % ndmin and ndmax will be used in xx-yyd form in filenames 
    87 df = [int2str(ndmin),'-',int2str(ndmax),'d']; 
    88 clear ndmin; 
    89 clear ndmax; 
     90% period1 and period2 will be used in xx-yyd form in filenames 
     91df = [int2str(period1),'-',int2str(period2),'d']; 
     92clear period1; 
     93clear period2; 
    9094 
    9195fullfilename=[IRCAAM_ID,'eof_', df, '_jjas.mat']; 
Note: See TracChangeset for help on using the changeset viewer.