Scicos_blocks: clean PDE blocks interfaces 44/13244/2
Paul Bignier [Wed, 27 Nov 2013 08:46:27 +0000 (09:46 +0100)]
Removed unused 'job' and 'gr_i' values.

Change-Id: I94a39da1856cfb3a113c4b8d3d06a7b2b9b26ea5

17 files changed:
scilab/modules/scicos_blocks/macros/PDE/CFORTREDP.sci
scilab/modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.sci
scilab/modules/scicos_blocks/macros/PDE/IHM_EDP.sci
scilab/modules/scicos_blocks/macros/PDE/PDE.sci
scilab/modules/scicos_blocks/macros/PDE/assemblage_FE1D.sci
scilab/modules/scicos_blocks/macros/PDE/cformatlinedp.sci
scilab/modules/scicos_blocks/macros/PDE/coef_FEM1d.sci
scilab/modules/scicos_blocks/macros/PDE/extraction_infos.sci
scilab/modules/scicos_blocks/macros/PDE/formkf.sci
scilab/modules/scicos_blocks/macros/PDE/gen_code_FDM.sci
scilab/modules/scicos_blocks/macros/PDE/gen_code_FEM.sci
scilab/modules/scicos_blocks/macros/PDE/gen_code_FVM.sci
scilab/modules/scicos_blocks/macros/PDE/maillage_FE1D.sci
scilab/modules/scicos_blocks/macros/PDE/mulfstring.sci
scilab/modules/scicos_blocks/macros/PDE/nombre_etats.sci
scilab/modules/scicos_blocks/macros/PDE/setvalue_IHM-PDE.sci
scilab/modules/scicos_blocks/macros/PDE/setvalue_IHM_EDP.sci

index ddde2da..6619b42 100644 (file)
@@ -26,6 +26,7 @@ function [ok]=CFORTREDP(funam,tt)
     if tt<>[] then
         [ok]=scicos_block_link(funam,tt,"c");
     else
-        ok=%f;break;
+        ok=%f;
+        break;
     end
 endfunction
index 788367f..ad5f03b 100644 (file)
@@ -40,7 +40,10 @@ function [coef1,coef2,coef21,coef22]=Disc2_5_FVM1d(h,kbc,operi,N,xn,xw,a1)
     //      calculons l'int�grale.                                           //
     //-----------------------------------------------------------------------//
 
-    coef1=[]; coef2=[]; coef21=[]; coef22=[];
+    coef1=[];
+    coef2=[];
+    coef21=[];
+    coef22=[];
     coef1=spzeros(N,N);
     coef2=spzeros(N,1);
     x=xw;
index a99672c..625eab2 100644 (file)
@@ -352,12 +352,42 @@ function [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,
     b4 = uicontrol(f, "Position"  , [610 90 50 20],"Style", "pushbutton","String", _("Cancel"),...
     "callback"  , "do_quitter()","BackgroundColor",[1 0 0] );
     f.visible = "on";
-    while fin,end
+    while fin,
+    end
     if ok then
         close(f)
-        a_domaine=[];b_domaine=[];discr=[];signe=[];choix=[];type_meth=[];degre=[];Nbr_maillage=[];
-        CI=[];CI1=[];CLa_type=[];CLa_exp=[];CLb_type=[];CLb_exp=[];oper=[];a1=[];b1=[];a2=[];b2=[];
-        a3=[];b3=[];a4=[];b4=[];a5=[];b5=[];a6=[];b6=[];a7=[];b7=[];k=[];mesures=[];params_pde=[];
+        a_domaine=[];
+        b_domaine=[];
+        discr=[];
+        signe=[];
+        choix=[];
+        type_meth=[];
+        degre=[];
+        Nbr_maillage=[];
+        CI=[];
+        CI1=[];
+        CLa_type=[];
+        CLa_exp=[];
+        CLb_type=[];
+        CLb_exp=[];
+        oper=[];
+        a1=[];
+        b1=[];
+        a2=[];
+        b2=[];
+        a3=[];
+        b3=[];
+        a4=[];
+        b4=[];
+        a5=[];
+        b5=[];
+        a6=[];
+        b6=[];
+        a7=[];
+        b7=[];
+        k=[];
+        mesures=[];
+        params_pde=[];
         return;
     end
     ok=fin;
@@ -371,21 +401,49 @@ function [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,
     editb7,list_points);
 
     // sauvegarde de l'IHM dans params_pde
-    params_pde.a=string(a_domaine);params_pde.b=string(b_domaine);
-    params_pde.check_op1=string(get(check_op1,"Value"));params_pde.a1=get(edita1,"String");params_pde.b1=get(editb1,"String");
-    params_pde.check_op2=string(get(check_op2,"Value"));params_pde.a2=get(edita2,"String");params_pde.b2=get(editb2,"String");
-    params_pde.check_op3=string(get(check_op3,"Value"));params_pde.a3=get(edita3,"String");params_pde.b3=get(editb3,"String");
-    params_pde.check_op4=string(get(check_op4,"Value"));params_pde.a4=get(edita4,"String");params_pde.b4=get(editb4,"String");
-    params_pde.check_op5=string(get(check_op5,"Value"));params_pde.a5=get(edita5,"String");params_pde.b5=get(editb5,"String");
-    params_pde.check_op6=string(get(check_op6,"Value"));params_pde.a6=get(edita6,"String");params_pde.b6=get(editb6,"String");
-    params_pde.check_op7=string(get(check_op7,"Value"));params_pde.a7=get(edita7,"String");params_pde.b7=get(editb7,"String");
-    params_pde.discr_cst=string(get(check1,"Value"));params_pde.discr_non_cst=string(get(check2,"Value"));
-    params_pde.signe=string(signe);params_pde.rad_automatique=string(get(rad_automatique,"Value"));
-    params_pde.rad_manuel=string(get(rad_manuel,"Value"));params_pde.methode=string(type_meth);params_pde.txt_pas=get(txt_pas,"String");
-    params_pde.ord1=get(editordre1,"String");params_pde.ord2=get(editordre2,"String");params_pde.ord3=get(editordre3,"String");
-    params_pde.degre=string(degre);params_pde.nnode=string(Nbr_maillage);params_pde.txt_exp=get(txt_exp,"String");
-    params_pde.CI=CI;params_pde.dCI=CI1;params_pde.CLa=string(CLa_type);params_pde.CLa_exp=get(editCLa,"String");
-    params_pde.CLb=string(CLb_type);params_pde.CLb_exp=get(editCLb,"String");params_pde.points=list_points;
+    params_pde.a=string(a_domaine);
+    params_pde.b=string(b_domaine);
+    params_pde.check_op1=string(get(check_op1,"Value"));
+    params_pde.a1=get(edita1,"String");
+    params_pde.b1=get(editb1,"String");
+    params_pde.check_op2=string(get(check_op2,"Value"));
+    params_pde.a2=get(edita2,"String");
+    params_pde.b2=get(editb2,"String");
+    params_pde.check_op3=string(get(check_op3,"Value"));
+    params_pde.a3=get(edita3,"String");
+    params_pde.b3=get(editb3,"String");
+    params_pde.check_op4=string(get(check_op4,"Value"));
+    params_pde.a4=get(edita4,"String");
+    params_pde.b4=get(editb4,"String");
+    params_pde.check_op5=string(get(check_op5,"Value"));
+    params_pde.a5=get(edita5,"String");
+    params_pde.b5=get(editb5,"String");
+    params_pde.check_op6=string(get(check_op6,"Value"));
+    params_pde.a6=get(edita6,"String");
+    params_pde.b6=get(editb6,"String");
+    params_pde.check_op7=string(get(check_op7,"Value"));
+    params_pde.a7=get(edita7,"String");
+    params_pde.b7=get(editb7,"String");
+    params_pde.discr_cst=string(get(check1,"Value"));
+    params_pde.discr_non_cst=string(get(check2,"Value"));
+    params_pde.signe=string(signe);
+    params_pde.rad_automatique=string(get(rad_automatique,"Value"));
+    params_pde.rad_manuel=string(get(rad_manuel,"Value"));
+    params_pde.methode=string(type_meth);
+    params_pde.txt_pas=get(txt_pas,"String");
+    params_pde.ord1=get(editordre1,"String");
+    params_pde.ord2=get(editordre2,"String");
+    params_pde.ord3=get(editordre3,"String");
+    params_pde.degre=string(degre);
+    params_pde.nnode=string(Nbr_maillage);
+    params_pde.txt_exp=get(txt_exp,"String");
+    params_pde.CI=CI;
+    params_pde.dCI=CI1;
+    params_pde.CLa=string(CLa_type);
+    params_pde.CLa_exp=get(editCLa,"String");
+    params_pde.CLb=string(CLb_type);
+    params_pde.CLb_exp=get(editCLb,"String");
+    params_pde.points=list_points;
     // fermeure du gui
     close(f)
 
index 341b38e..a168edc 100644 (file)
@@ -25,27 +25,15 @@ function [x,y,typ]=PDE(job,arg1,arg2)
     // Reference: "Scicos user guid", http://www.scicos.org                                       //
     //--------------------------------------------------------------------------------------------//
 
-    x=[];y=[];typ=[];
+    x=[];
+    y=[];
+    typ=[];
 
     select job
-    case "plot" then
-        if arg1.model.sim(2)==2004 then
-            CCC=[strsubst(arg1.model.sim(1),"_explicite","");"Explicite"]
-        elseif arg1.model.sim(2)==12004
-            CCC=[strsubst(arg1.model.sim(1),"_implicite","");"implicite"]
-        else
-            CCC="  PDE"
-        end
-        standard_draw(arg1)
-    case "getinputs" then
-        [x,y,typ]=standard_inputs(arg1)
-    case "getoutputs" then
-        [x,y,typ]=standard_outputs(arg1)
-    case "getorigin" then
-        [x,y]=standard_origin(arg1)
     case "set" then
         x=arg1;
-        graphics=arg1.graphics;label=graphics.exprs
+        graphics=arg1.graphics;
+        label=graphics.exprs
         model=arg1.model;
         params_pde=label(1);
 
@@ -70,18 +58,25 @@ function [x,y,typ]=PDE(job,arg1,arg2)
             //**********************************
             // Get the name of the file
             //***********************************
-            okk=%f;rdnom="PDE";ok1=%t;
+            okk=%f;
+            rdnom="PDE";
+            ok1=%t;
             while %t do
                 [okk,rdnom,lab]=scicos_getvalue("PLEASE, GIVE US THE BLOCK''s NAME. ",..
                 "New block''s name :",list("str",1),label(3));
 
-                if okk==%f then ok1=%f;return; end
+                if okk==%f then
+                    ok1=%f;
+                    return;
+                end
                 label(3)=lab;
                 rdnom=stripblanks(rdnom);
                 if rdnom==emptystr() then
                     ok1=%f;x_message("sorry C file name not defined");
                 end
-                if ok1 then break,end
+                if ok1 then
+                    break,
+                end
             end
 
             // arbre de decision
@@ -104,7 +99,9 @@ function [x,y,typ]=PDE(job,arg1,arg2)
                 else
                     delta=evstr(a4)^2-4*evstr(a1)*evstr(a2);
                 end
-                if (delta==[]) then, delta=0; end
+                if (delta==[]) then,
+                    delta=0;
+                end
                 type_meth=arbre_decision(delta);
             end
             // a voir si c'est à rajouter pour ne pas regenerer dans le cas d'eval
@@ -159,7 +156,9 @@ function [x,y,typ]=PDE(job,arg1,arg2)
             // if (fun(3) == "clickin") then
             // always ulink and link
             [ok1]=CFORTREDP(rdnom,tt);
-            if ~ok1 then break,end
+            if ~ok1 then
+                break,
+            end
             //end
 
             if ~ok then
@@ -192,8 +191,7 @@ function [x,y,typ]=PDE(job,arg1,arg2)
         "0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)","");
         // dans label on mis infos de scicos_getvalue, infos ihm et le code C
         label=list(params_pde,[],"");
-        gr_i=["txt=CCC;";
-        "xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'');"]
+        gr_i=[]
         x=standard_define([3 3],model,label,gr_i)
 
     end
index ec3de11..84f7de2 100644 (file)
@@ -92,7 +92,8 @@ function [gk,gf]=formkf(nelem,kind,nint,nodes,x,xi,w,nnode,a6,operi,kbc,vbc)
 
         //  Prendre le i3-�me ordre de la quadrature Gaussienne: 1, ordre 1; 2, ordre 2, ...
 
-        xic = xi(:,i3);      wc = w(:,i3);
+        xic = xi(:,i3);
+        wc = w(:,i3);
         [ek,ef] = elemoper(x(i1),x(i2),n,i3,xic,wc,operi,a6);
         // assemblage
         [gk,gf]=assemb(gk,gf,ek,ef,nel,n,nodes);
index b08af6b..5c42a1f 100644 (file)
@@ -42,15 +42,27 @@ function t1=cformatlinedp(t ,l,sep)
     bl=part(" ",ones(1,nw))
     l1=l-nw;first=%t
     while %t
-        if length(t)<=l then t1=[t1;bl+t],return,end
+        if length(t)<=l then
+            t1=[t1;bl+t],
+            return,
+        end
         k=strindex(t,sep);
-        if k==[] then t1=[t1;bl+t],return,end
+        if k==[] then
+            t1=[t1;bl+t],
+            return,
+        end
         k($+1)=length(t)+1 // positions of the commas
         i=find(k(1:$-1)<=l&k(2:$)>l) //nearest left comma (reltively to l)
-        if i==[] then i=1,end
+        if i==[] then
+            i=1,
+        end
         t1=[t1;bl+part(t,1:k(i))]
         t=part(t,k(i)+1:length(t))
-        if first then l1=l1-2;bl=bl+"  ";first=%f;end
+        if first then
+            l1=l1-2;
+            bl=bl+"  ";
+            first=%f;
+        end
     end
 endfunction
 
index c2cacf3..8bcbb88 100644 (file)
@@ -47,7 +47,13 @@ function [A,B1,B2,C1,C2,C3,F3]=coef_FEM1d(oper,nelem,kind,nint,nodes,x,xi,w,..
     //    - vbc (String) : vecteur des conditions aux limites en a et b       //
     //------------------------------------------------------------------------//
 
-    A=[];B1=[];B2=[];C1=[];C2=[];C3=[];F3=[];
+    A=[];
+    B1=[];
+    B2=[];
+    C1=[];
+    C2=[];
+    C3=[];
+    F3=[];
 
     for i=1:size(oper,"*")
         select oper(i)
index 2699f2b..d7b820d 100644 (file)
@@ -62,8 +62,28 @@ function [a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,CI,
     //--------------------------------------------------------------------------------------------------------//
 
     // domaine
-    choix=0;signe=1;discr=0;type_meth=1;degre=1;Nbr_maillage = 10; oper=[];
-    a1=[];b1=[];a2=[];b2=[];a3=[];b3=[];a4=[];b4=[];a5=[];b5=[];a6=[];b6=[];a7=[];b7=[];mesures=[];
+    choix=0;
+    signe=1;
+    discr=0;
+    type_meth=1;
+    degre=1;
+    Nbr_maillage = 10;
+    oper=[];
+    a1=[];
+    b1=[];
+    a2=[];
+    b2=[];
+    a3=[];
+    b3=[];
+    a4=[];
+    b4=[];
+    a5=[];
+    b5=[];
+    a6=[];
+    b6=[];
+    a7=[];
+    b7=[];
+    mesures=[];
     a_domaine=evstr(get(edita,"String"));
     b_domaine=evstr(get(editb,"String"));
     //discriminant (O: discriminant constant, 1: discriminant non constant )
index 9feba64..74fe816 100644 (file)
@@ -54,7 +54,8 @@ function [gk,gf]=formkf(nelem,kind,nint,nodes,x,xi,w,nnode,a6,operi,kbc,vbc)
 
         //  Prendre le i3-�me ordre de la quadrature Gaussienne: 1, ordre 1; 2, ordre 2, ...
 
-        xic = xi(:,i3);      wc = w(:,i3);
+        xic = xi(:,i3);
+        wc = w(:,i3);
         [ek,ef] = elemoper(x(i1),x(i2),n,i3,xic,wc,operi,a6);
         // assemblage
         [gk,gf]=assemb(gk,gf,ek,ef,nel,n,nodes);
index 90615e3..869aea9 100644 (file)
@@ -42,7 +42,9 @@ function [equations,impl_type,Nfictif]=gen_code_FDM(a1,b1,a2,b2,a3,b3,a4,b4,..
     //    - h (Double) : le pas de discretisation h=(b-a)/N (i.e x(i)= i* h)  //
     //------------------------------------------------------------------------//
 
-    coef4=[];coef2=[];coef5=[];
+    coef4=[];
+    coef2=[];
+    coef5=[];
     impl_type=1; // 1 pour l'�tat diff�rentiel, -1 pour l'�tat alg�brique
     sep=[",","*","/"];
 
index eeca252..f560de6 100644 (file)
@@ -39,7 +39,11 @@ function [equations,impl_type]=gen_code_FEM(A,B1,B2,C1,C2,C3,F3,oper,N,..
     //    - vbc (String) : vecteur des conditions aux limites en a et b       //
     //    - kbc (Entier) : vecteur types des conditions au limites            //
     //------------------------------------------------------------------------//
-    Cla2=[];Clb2=[];Cla4=[];Clb4=[];lambda=spzeros(N,N);
+    Cla2=[];
+    Clb2=[];
+    Cla4=[];
+    Clb4=[];
+    lambda=spzeros(N,N);
     impl_type=1; // 1 pour syst�me d'�tat, -1 pour le syst�me alg�brique
     sep=[",","*","/"];
 
index 05dc5e8..803ee19 100644 (file)
@@ -42,12 +42,23 @@ function [equations,flag_type,impl_type]=gen_code_FVM(a1,b1,a2,b2,a3,b3,a4,b4,..
     flag_type=1; // 1 : explicie, 2 : implicite
     impl_type=1; // 1 pour syst�me d'�tat, -1 pour le syst�me alg�brique
     sep=[",","*","/"];
-    coef51=[];coef52=[];coef1=[];coef2=[];cla=[];clb=[];clua=[];club=[];
+    coef51=[];
+    coef52=[];
+    coef1=[];
+    coef2=[];
+    cla=[];
+    clb=[];
+    clua=[];
+    club=[];
 
     for i=1:size(xn,1)
         x=xn(i);
-        a1_ev(i)=evstr(a1); a2_ev(i)=evstr(a2); a3_ev(i)=evstr(a3);
-        a4_ev(i)=evstr(a4); a5_ev(i)=evstr(a5); a6_ev(i)=evstr(a6);
+        a1_ev(i)=evstr(a1);
+        a2_ev(i)=evstr(a2);
+        a3_ev(i)=evstr(a3);
+        a4_ev(i)=evstr(a4);
+        a5_ev(i)=evstr(a5);
+        a6_ev(i)=evstr(a6);
         a7_ev(i)=evstr(a7);
     end
     if ((find(oper == 2) ==[]) & (find(oper == 4) ==[]) ) then
index b1da05a..113d760 100644 (file)
@@ -53,7 +53,10 @@ function [xvec,nelem,nodes,kind,nint]=maillage_FE1D(a,b,inf_ele,nnode,CLa_type,.
     [nrec,junk]=size(data);
 
     for nr=1:nrec
-        n1=data(nr,1); n2=data(nr,2); x1=data(nr,3);x2=data(nr,4);
+        n1=data(nr,1);
+        n2=data(nr,2);
+        x1=data(nr,3);
+        x2=data(nr,4);
         if (n2 == 0) then
             xvec(n1) = x1;
         else
index 4a84d74..a7bb434 100644 (file)
@@ -24,7 +24,9 @@ function x=mulfstring(a,b)
         x=[];
         return;
     end
-    [l,m]=size(a);[m,n]=size(b);x=[];
+    [l,m]=size(a);
+    [m,n]=size(b);
+    x=[];
     for j=1:n,
         y=[];
         for i=1:l,
index acb1cf0..23a3871 100644 (file)
@@ -40,34 +40,81 @@ function [N,a1_ev,a2_ev,a3_ev,a4_ev,a5_ev,a6_ev,a7_ev]=nombre_etats(N,...
     //------------------------------------------------------------------------//
     x=a;
     for i=1:N
-        a1_ev(i)=evstr(a1); a2_ev(i)=evstr(a2); a3_ev(i)=evstr(a3); a4_ev(i)=evstr(a4);
-        a5_ev(i)=evstr(a5); a7_ev(i)=evstr(a7); a6_ev(i)=evstr(a6);
+        a1_ev(i)=evstr(a1);
+        a2_ev(i)=evstr(a2);
+        a3_ev(i)=evstr(a3);
+        a4_ev(i)=evstr(a4);
+        a5_ev(i)=evstr(a5);
+        a7_ev(i)=evstr(a7);
+        a6_ev(i)=evstr(a6);
         x=x+h;
     end
 
     if (kbc(1) == 1) then
         // Neumann en a
         if (DF_type == 0 | DF_type == 1) then
-            if a1_ev ~= [] then, x=a-h; a1_ev=[evstr(a1);a1_ev]; end
-            if a2_ev ~= [] then, x=a-h; a2_ev=[evstr(a2);a2_ev]; end
-            if a3_ev ~= [] then, x=a-h; a3_ev=[evstr(a3);a3_ev]; end
-            if a4_ev ~= [] then, x=a-h; a4_ev=[evstr(a4);a4_ev]; end
-            if a5_ev ~= [] then, x=a-h; a5_ev=[evstr(a5);a5_ev]; end
-            if a6_ev ~= [] then, x=a-h; a6_ev=[evstr(a6);a6_ev]; end
-            if a7_ev ~= [] then, x=a-h; a7_ev=[evstr(a7);a7_ev]; end
+            if a1_ev ~= [] then,
+                x=a-h;
+                a1_ev=[evstr(a1);a1_ev];
+            end
+            if a2_ev ~= [] then,
+                x=a-h;
+                a2_ev=[evstr(a2);a2_ev];
+            end
+            if a3_ev ~= [] then,
+                x=a-h;
+                a3_ev=[evstr(a3);a3_ev];
+            end
+            if a4_ev ~= [] then,
+                x=a-h;
+                a4_ev=[evstr(a4);a4_ev];
+            end
+            if a5_ev ~= [] then,
+                x=a-h;
+                a5_ev=[evstr(a5);a5_ev];
+            end
+            if a6_ev ~= [] then,
+                x=a-h;
+                a6_ev=[evstr(a6);a6_ev];
+            end
+            if a7_ev ~= [] then,
+                x=a-h;
+                a7_ev=[evstr(a7);a7_ev];
+            end
             N=N+1;
         end
     end
     if (kbc(2) == 1) then
         // Neumann en b
         if (DF_type == 0 | DF_type == 2) then
-            if a1_ev ~= [] then, x=b+h; a1_ev=[a1_ev;evstr(a1)]; end
-            if a2_ev ~= [] then, x=b+h; a2_ev=[a2_ev;evstr(a2)]; end
-            if a3_ev ~= [] then, x=b+h; a3_ev=[a3_ev;evstr(a3)]; end
-            if a4_ev ~= [] then, x=b+h; a4_ev=[a4_ev;evstr(a4)]; end
-            if a5_ev ~= [] then, x=b+h; a5_ev=[a5_ev;evstr(a5)]; end
-            if a6_ev ~= [] then, x=b+h; a6_ev=[a6_ev;evstr(a6)]; end
-            if a7_ev ~= [] then, x=b+h; a7_ev=[a7_ev;evstr(a7)]; end
+            if a1_ev ~= [] then,
+                x=b+h;
+                a1_ev=[a1_ev;evstr(a1)];
+            end
+            if a2_ev ~= [] then,
+                x=b+h;
+                a2_ev=[a2_ev;evstr(a2)];
+            end
+            if a3_ev ~= [] then,
+                x=b+h;
+                a3_ev=[a3_ev;evstr(a3)];
+            end
+            if a4_ev ~= [] then,
+                x=b+h;
+                a4_ev=[a4_ev;evstr(a4)];
+            end
+            if a5_ev ~= [] then,
+                x=b+h;
+                a5_ev=[a5_ev;evstr(a5)];
+            end
+            if a6_ev ~= [] then,
+                x=b+h;
+                a6_ev=[a6_ev;evstr(a6)];
+            end
+            if a7_ev ~= [] then,
+                x=b+h;
+                a7_ev=[a7_ev;evstr(a7)];
+            end
             N=N+1;
         end
     end
index 170f9db..e78b8c6 100644 (file)
@@ -50,9 +50,38 @@ function [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,
     //    - mesures (Vecteur d'entiers) : renvoie la liste des points de mesures                         //
     //----------------------------------------------------------------------------------------------------//
 
-    ok=%f;a_domaine=[];b_domaine=[];choix=0;signe=1;discr=0;type_meth=1;degre=1;Nbr_maillage=10;
-    a1=[];b1=[];a2=[];b2=[];a3=[];b3=[];a4=[];b4=[];a5=[];b5=[];a6=[];b6=[];a7=[];b7=[];mesures=[];
-    CI=[];CI1=[];CLa_type=[];CLa_exp=[];CLb_type=[];CLb_exp=[];oper=[];k=[];
+    ok=%f;
+    a_domaine=[];
+    b_domaine=[];
+    choix=0;
+    signe=1;
+    discr=0;
+    type_meth=1;
+    degre=1;
+    Nbr_maillage=10;
+    a1=[];
+    b1=[];
+    a2=[];
+    b2=[];
+    a3=[];
+    b3=[];
+    a4=[];
+    b4=[];
+    a5=[];
+    b5=[];
+    a6=[];
+    b6=[];
+    a7=[];
+    b7=[];
+    mesures=[];
+    CI=[];
+    CI1=[];
+    CLa_type=[];
+    CLa_exp=[];
+    CLb_type=[];
+    CLb_exp=[];
+    oper=[];
+    k=[];
     // evaluation du context
     %mm=getfield(1,%scicos_context)
     for %mi=%mm(3:$)
@@ -77,17 +106,27 @@ function [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,
     type_meth=evstr(params_pde.methode);
     degre = evstr(params_pde.degre);
     Nbr_maillage=evstr(params_pde.nnode);
-    execstr("a1=params_pde.a1"); execstr("b1=params_pde.b1");
-    execstr("a2=params_pde.a2"); execstr("b2=params_pde.b2");
-    execstr("a3=params_pde.a3"); execstr("b3=params_pde.b3");
-    execstr("a4=params_pde.a4"); execstr("b4=params_pde.b4");
-    execstr("a5=params_pde.a5"); execstr("b5=params_pde.b5");
-    execstr("a6=params_pde.a6"); execstr("b6=params_pde.b6");
-    execstr("a7=params_pde.a7"); execstr("b7=params_pde.b7");
+    execstr("a1=params_pde.a1");
+    execstr("b1=params_pde.b1");
+    execstr("a2=params_pde.a2");
+    execstr("b2=params_pde.b2");
+    execstr("a3=params_pde.a3");
+    execstr("b3=params_pde.b3");
+    execstr("a4=params_pde.a4");
+    execstr("b4=params_pde.b4");
+    execstr("a5=params_pde.a5");
+    execstr("b5=params_pde.b5");
+    execstr("a6=params_pde.a6");
+    execstr("b6=params_pde.b6");
+    execstr("a7=params_pde.a7");
+    execstr("b7=params_pde.b7");
     mesures = evstr(params_pde.points);
-    execstr("CI=params_pde.CI"); execstr("CI1=params_pde.dCI");
-    CLa_type=evstr(params_pde.CLa); execstr("CLa_exp=params_pde.CLa_exp");
-    CLb_type=evstr(params_pde.CLb); execstr("CLb_exp=params_pde.CLb_exp");
+    execstr("CI=params_pde.CI");
+    execstr("CI1=params_pde.dCI");
+    CLa_type=evstr(params_pde.CLa);
+    execstr("CLa_exp=params_pde.CLa_exp");
+    CLb_type=evstr(params_pde.CLb);
+    execstr("CLb_exp=params_pde.CLb_exp");
     k=0;
     if (params_pde.check_op1 == "1") then
         oper=[oper;1];
index 7d1dde0..1f38f10 100644 (file)
@@ -52,9 +52,38 @@ function [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,
     //    - mesures (Vecteur d'entiers) : renvoie la liste des points de mesures                         //
     //----------------------------------------------------------------------------------------------------//
 
-    ok=%f;a_domaine=[];b_domaine=[];choix=0;signe=1;discr=0;type_meth=1;degre=1;Nbr_maillage=10;
-    a1=[];b1=[];a2=[];b2=[];a3=[];b3=[];a4=[];b4=[];a5=[];b5=[];a6=[];b6=[];a7=[];b7=[];mesures=[];
-    CI=[];CI1=[];CLa_type=[];CLa_exp=[];CLb_type=[];CLb_exp=[];oper=[];k=[];
+    ok=%f;
+    a_domaine=[];
+    b_domaine=[];
+    choix=0;
+    signe=1;
+    discr=0;
+    type_meth=1;
+    degre=1;
+    Nbr_maillage=10;
+    a1=[];
+    b1=[];
+    a2=[];
+    b2=[];
+    a3=[];
+    b3=[];
+    a4=[];
+    b4=[];
+    a5=[];
+    b5=[];
+    a6=[];
+    b6=[];
+    a7=[];
+    b7=[];
+    mesures=[];
+    CI=[];
+    CI1=[];
+    CLa_type=[];
+    CLa_exp=[];
+    CLb_type=[];
+    CLb_exp=[];
+    oper=[];
+    k=[];
     // evaluation du context
     %mm=getfield(1,%scicos_context)
     for %mi=%mm(3:$)
@@ -79,17 +108,27 @@ function [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,
     type_meth=evstr(params_pde.methode);
     degre = evstr(params_pde.degre);
     Nbr_maillage=evstr(params_pde.nnode);
-    execstr("a1=params_pde.a1"); execstr("b1=params_pde.b1");
-    execstr("a2=params_pde.a2"); execstr("b2=params_pde.b2");
-    execstr("a3=params_pde.a3"); execstr("b3=params_pde.b3");
-    execstr("a4=params_pde.a4"); execstr("b4=params_pde.b4");
-    execstr("a5=params_pde.a5"); execstr("b5=params_pde.b5");
-    execstr("a6=params_pde.a6"); execstr("b6=params_pde.b6");
-    execstr("a7=params_pde.a7"); execstr("b7=params_pde.b7");
+    execstr("a1=params_pde.a1");
+    execstr("b1=params_pde.b1");
+    execstr("a2=params_pde.a2");
+    execstr("b2=params_pde.b2");
+    execstr("a3=params_pde.a3");
+    execstr("b3=params_pde.b3");
+    execstr("a4=params_pde.a4");
+    execstr("b4=params_pde.b4");
+    execstr("a5=params_pde.a5");
+    execstr("b5=params_pde.b5");
+    execstr("a6=params_pde.a6");
+    execstr("b6=params_pde.b6");
+    execstr("a7=params_pde.a7");
+    execstr("b7=params_pde.b7");
     mesures = evstr(params_pde.points);
-    execstr("CI=params_pde.CI"); execstr("CI1=params_pde.dCI");
-    CLa_type=evstr(params_pde.CLa); execstr("CLa_exp=params_pde.CLa_exp");
-    CLb_type=evstr(params_pde.CLb); execstr("CLb_exp=params_pde.CLb_exp");
+    execstr("CI=params_pde.CI");
+    execstr("CI1=params_pde.dCI");
+    CLa_type=evstr(params_pde.CLa);
+    execstr("CLa_exp=params_pde.CLa_exp");
+    CLb_type=evstr(params_pde.CLb);
+    execstr("CLb_exp=params_pde.CLb_exp");
     k=0;
     if (params_pde.check_op1 == "1") then
         oper=[oper;1];