Changeset 16 for trunk/src/mode_sahelien/composite_hgt500_eof1_1030.m

Timestamp:

01/06/09 10:53:18 (16 years ago)

Author:

pinsard

Message:

remove trailing blanks, split lines with multiple statements

File:

• trunk/src/mode_sahelien/composite_hgt500_eof1_1030.m (modified) (12 diffs)

trunk/src/mode_sahelien/composite_hgt500_eof1_1030.m

@@ +1 @@
+%
 % initialisation
-clear; close all;
-
+clear;
+close all;
 
 % etape 1 :on selectionne les mois d ete (attention aux annees bixestiles!)
@@ -8 +9 @@
 hgt500=zeros(122,49,144,28);
 
-siz=31+28+31+30+31+1; sizbis=31+28+31+30+31+30+31+31+30;
+siz=31+28+31+30+31+1;
+sizbis=31+28+31+30+31+30+31+31+30;
 ncload('hgt500.1979.nc'); hgt500(:,:,:,1)=hgt(siz:sizbis,1,:,:); clear hgt;
 ncload('hgt500.1980.nc'); hgt500(:,:,:,2)=hgt(siz+1:sizbis+1,1,:,:); clear hgt;
@@ -54 +56 @@
     end
 end
-                    
 
 hgt1=zeros(122,28,49,144);
 hgt1(:,:,:,1:72)=hgt500(:,:,:,73:144);
 hgt1(:,:,:,73:144)=hgt500(:,:,:,1:72);
-clear hgt500; hgt500=hgt1; clear hgt1;
+clear hgt500;
+hgt500=hgt1;
+clear hgt1;
 
 hgt1=permute(hgt500,[2 1 3 4]);
-hgt2(:,:,:)=nanmean(hgt1); clear hgt1;
+hgt2(:,:,:)=nanmean(hgt1);
+clear hgt1;
 hgt3=reshape(hgt500, 3416,49,144);
-hgt4(:,:)=nanmean(hgt3); clear hgt3;
+hgt4(:,:)=nanmean(hgt3);
+clear hgt3;
 
 for a=1:122;
    for b=1:28;
       for c=1:37;
-         for d=1:144; 
-             hgt500(a,b,c,d)=hgt500(a,b,c,d)-(hgt2(a,c,d)-hgt4(c,d));                
+         for d=1:144;
+             hgt500(a,b,c,d)=hgt500(a,b,c,d)-(hgt2(a,c,d)-hgt4(c,d));
          end;
       end;
@@ -86 +91 @@
 % on calcule l ecart type sur la serie entiere de l OLR
 ind_olr1=reshape(ind_olr, k,1);
-ind_olr2=1.5*std(ind_olr1); clear ind_olr1;
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ind_olr2=1.5*std(ind_olr1);
+clear ind_olr1;
+
 % GEOPOTENTIEL
 % intialisation des tableaux
-hgt500_filtre_compomax=NaN*ones(60,31,49,144); 
+hgt500_filtre_compomax=NaN*ones(60,31,49,144);
 hgt500_filtre_compomin=NaN*ones(60,31,49,144);
 
-compteurmax=0; 
+compteurmax=0;
 compteurmin=0;
 hgt=hgt500;
-clear hgt500
-for a=1:28; % boucle sur les annees
-   clear delta; 
+clear hgt500;
+% boucle sur les annees
+for a=1:28;
+   clear delta;
    delta=zeros(122,1);
-   for b=1:122; % boucle sur les jours : on prepare avant   
+   % boucle sur les jours : on prepare avant
+   for b=1:122;
         if b>1;
             delta(b)=ind_olr(b,a)-ind_olr(b-1,a);
         end;
    end;
-   for b=1:122; % boucle sur les jours
-      if (b>20 && b<112); % 1ere condition (laisser une marge de 10) 
-% cas 1 : max deltas apres negetifs et deltas avant postifs   
-         if (delta(b+1)<0 && delta(b)<0 && delta(b-1)>0 && delta(b-2)>0 && ind_olr(b,a)>ind_olr2); 
+   % boucle sur les jours
+   for b=1:122;
+      % 1ere condition (laisser une marge de 10)
+      if (b>20 && b<112);
+% cas 1 : max deltas apres negetifs et deltas avant postifs
+         if (delta(b+1)<0 && delta(b)<0 && delta(b-1)>0 && delta(b-2)>0 && ind_olr(b,a)>ind_olr2);
             compteurmax=compteurmax+1;
             hgt500_filtre_compomax(compteurmax,1,:,:)=hgt(b-20,a,:,:);
@@ -143 +153 @@
             hgt500_filtre_compomax(compteurmax,30,:,:)=hgt(b+9,a,:,:);
             hgt500_filtre_compomax(compteurmax,31,:,:)=hgt(b+10,a,:,:);
-% cas 2 : min deltas apres positifs et deltas avant negatifs   
+% cas 2 : min deltas apres positifs et deltas avant negatifs
          elseif (delta(b+1)>0 && delta(b)>0 && delta(b-1)<0 && delta(b-2)<0 && ind_olr(b,a)<(-ind_olr2));
             compteurmin=compteurmin+1;
@@ -182 +192 @@
          end;
       end;
-   end;         
+   end;
 end;
 disp(['iii : compteurmin =', int2str(compteurmin)]);
@@ -204 +214 @@
 % on fait la somme des valeurs de hgt500_filtreentiel sur le nbre d occurences
 % on obtent un tableau de la forme (jours-avant-apres,lon,lat)
-hgt500_filtre_compomin1(:,:,:)=nanmean(hgt500_filtre_compomin); clear hgt500_filtre_compomin;
-hgt500_filtre_compomax1(:,:,:)=nanmean(hgt500_filtre_compomax); clear hgt500_filtre_compomax;
-
-x=[-10:1:10]'; %'
-
-figure(1); 
+hgt500_filtre_compomin1(:,:,:)=nanmean(hgt500_filtre_compomin);
+clear hgt500_filtre_compomin;
+hgt500_filtre_compomax1(:,:,:)=nanmean(hgt500_filtre_compomax);
+clear hgt500_filtre_compomax;
+
+x=[-10:1:10]';
+
+figure(1);
 orient('landscape');
 lat=lat';
@@ -248 +260 @@
        else
          set (gca,'XTick',[-60:30:60],'XTickLabel',[' ';' ';' ';' ';' ']);
-       end;       
+       end;
        set (gca,'YTick',[20:10:70],'YTickLabel',['   ';'30N';'40N';'50N';'60N';'   '],'fontname','Arial','fontsize',6);
        if e==4;
-          co=colorbar;            
+          co=colorbar;
           set (co,'ytick',[-40:20:40],'yticklabel',[-40:20:40],'fontname','Arial','fontsize',6);
        end;
-       hold on; cartemonde1;
+       hold on;
+       cartemonde1;
        set (gca,'tickDir','out');
        axis equal;
@@ -263 +276 @@
        text(-270,50,['day = ',num2str(f-21)],'fontname','Arial','fontsize',10);
        pos_vert=e/10;
-       set (gca,'position',[0.2 pos_vert 0.5 0.1]); 
+       set (gca,'position',[0.2 pos_vert 0.5 0.1]);
 end;
 
 print -depsc2 compo_hgt500_eof1_1030a.eps;
 
-figure(2); 
+figure(2);
 orient('landscape');
 
@@ -297 +310 @@
        subplot(7,1,8-e);
        palettejerome30;
-      colormap(palette);
- 
+       colormap(palette);
+
        delta_hgt500_filtre_min(1,1)=-50.001;
        delta_hgt500_filtre_min(1,2)=50.001;
- 
+
        aa=contourf(lon-180,lat,delta_hgt500_filtre_min,[-50:2.5:50],'LineStyle','none');
        if e==1;
@@ -307 +320 @@
        else
          set (gca,'XTick',[-60:30:60],'XTickLabel',[' ';' ';' ';' ';' ']);
-       end;       
+       end;
        set (gca,'YTick',[20:10:70],'YTickLabel',['   ';'30N';'40N';'50N';'60N';'   '],'fontname','Arial','fontsize',6);
        if e==4;
-          co=colorbar;            
+          co=colorbar;
           set (co,'ytick',[-40:20:40],'yticklabel',[-40:20:40],'fontname','Arial','fontsize',6);
        end;
-       hold on; cartemonde1;
+       hold on;
+       cartemonde1;
        set (gca,'tickDir','out');
        axis equal;
@@ -322 +336 @@
        text(-270,50,['day = ',num2str(f-21)],'fontname','Arial','fontsize',10);
        pos_vert=e/10;
-       set (gca,'position',[0.2 pos_vert 0.5 0.1]); 
+       set (gca,'position',[0.2 pos_vert 0.5 0.1]);
 end;
 print -depsc2 compo_hgt500_eof1_1030b.eps;