summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorJerome PICARD <jerome.picard@scilab.org>2010-01-20 14:46:29 +0100
committerJerome PICARD <jerome.picard@scilab.org>2010-01-20 14:46:29 +0100
commit4c0ab179b8912723d1509e7f0915e6c7e01f2810 (patch)
tree452e066c739b0080b14b2cadeb30b4e4b504810d /scilab/modules/scicos_blocks
parent46c0102fc10f5d187dd1c7ec0cd05d35187495d1 (diff)
downloadscilab-4c0ab179b8912723d1509e7f0915e6c7e01f2810.zip
scilab-4c0ab179b8912723d1509e7f0915e6c7e01f2810.tar.gz
same name Rx was used by 2 parameters in a Modelica class
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/macros/Electrical/Electrical.mo8
1 files changed, 4 insertions, 4 deletions
diff --git a/scilab/modules/scicos_blocks/macros/Electrical/Electrical.mo b/scilab/modules/scicos_blocks/macros/Electrical/Electrical.mo
index cb60402..e271190 100644
--- a/scilab/modules/scicos_blocks/macros/Electrical/Electrical.mo
+++ b/scilab/modules/scicos_blocks/macros/Electrical/Electrical.mo
@@ -476,8 +476,9 @@ model Resistorx
476 Pin p, n; 476 Pin p, n;
477 parameter Real R (fixed=false)=1 "Re{si}s >< ance"; 477 parameter Real R (fixed=false)=1 "Re{si}s >< ance";
478 //parameter Integer n = 3; 478 //parameter Integer n = 3;
479 // Real Z[3] (start={ 1.0 for i in 1 : 3 }); 479 // Real Z[3] (start={ 1.0 for i in 1 : 3 });
480 parameter Real Rx[3] (fixed = {false, false, true})={1,3,40000} "Resistance"; 480
481 parameter Real Rx1[3] (fixed = {false, false, true})={1,3,40000} "Resistance";
481 Real Z[3](fixed = {false, true, false},start={222,333,444}) "Resistance"; 482 Real Z[3](fixed = {false, true, false},start={222,333,444}) "Resistance";
482 parameter Real Ry[3] (fixed = {false, false, true})={1,3,40000} "Resistance"; 483 parameter Real Ry[3] (fixed = {false, false, true})={1,3,40000} "Resistance";
483 Real T (start=3.4) "fff ggg hhh"; 484 Real T (start=3.4) "fff ggg hhh";
@@ -497,7 +498,7 @@ end for ;
497 mytr=2.3; 498 mytr=2.3;
498 mytr2=2.3; 499 mytr2=2.3;
499 T=R; 500 T=R;
500 Z[1]=3; Z[2]=0; Z[3]=Rx[3]; 501 Z[1]=3; Z[2]=0; Z[3]=Rx1[3];
501 502
502 Rx[1]*p.i = p.v - n.v; 503 Rx[1]*p.i = p.v - n.v;
503 p.i = -n.i; 504 p.i = -n.i;
@@ -522,4 +523,3 @@ end Resistorx;
522 523
523/* parameter Integer n = 400; 524/* parameter Integer n = 400;
524 Real x[n](start={ 1.0 for i in 1 : n });*/ 525 Real x[n](start={ 1.0 for i in 1 : n });*/
525