Xcos demos & tests: RLC demo fixed 91/13391/1
Paul Bignier [Fri, 3 Jan 2014 09:28:55 +0000 (10:28 +0100)]
Wiring problem reported here:
 http://mailinglists.scilab.org/Re-Xcos-RLC-Modelica-electrical-circuit-demo-td4028130.html

Change-Id: I823f3554d5d2ba422957625ec4439113999ad231

scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.win.dia.ref
scilab/modules/xcos/demos/ModelicaBlocks/RLC_Modelica.zcos
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos

index a320f01..25a59b7 100644 (file)
@@ -23,36 +23,36 @@ endfunction
 funcprot(prot);
 
 IDA_val_ref = [
-   0.0019611
-   0.0015823
-   0.0011972
-   0.0008074
-   0.0004144
-   0.0000198
-  -0.0003750
-  -0.0007682
-  -0.0011584
-  -0.0015440
-  -0.0019236
-  -0.0022955
-  -0.0026584
-  -0.0030108
-  -0.0033513
-  -0.0036786
-  -0.0039914
-  -0.0042884
-  -0.0045685
-  -0.0048305
-  -0.0050736
-  -0.0052965
-  -0.0054986
-  -0.0056790
-  -0.0058369
-  -0.0059719
-  -0.0060832
-  -0.0061706
-  -0.0062336
-  -0.0062720 ];
+-0.0019611
+-0.0015823
+-0.0011972
+-0.0008074
+-0.0004144
+-0.0000198
+0.0003750
+0.0007682
+0.0011584
+0.0015440
+0.0019236
+0.0022955
+0.0026584
+0.0030108
+0.0033513
+0.0036786
+0.0039914
+0.0042884
+0.0045685
+0.0048305
+0.0050736
+0.0052965
+0.0054986
+0.0056790
+0.0058369
+0.0059719
+0.0060832
+0.0061706
+0.0062336
+0.0062720 ];
 IDA_time_ref = (1.7:.01:1.99)';
 
 scs_m.props.tol(6) = 101; // Solver
index 8272036..1a82145 100644 (file)
@@ -19,36 +19,36 @@ function messagebox(msg, msg_title)
 endfunction
 funcprot(prot);
 IDA_val_ref = [
-   0.0019611
-   0.0015823
-   0.0011972
-   0.0008074
-   0.0004144
-   0.0000198
-  -0.0003750
-  -0.0007682
-  -0.0011584
-  -0.0015440
-  -0.0019236
-  -0.0022955
-  -0.0026584
-  -0.0030108
-  -0.0033513
-  -0.0036786
-  -0.0039914
-  -0.0042884
-  -0.0045685
-  -0.0048305
-  -0.0050736
-  -0.0052965
-  -0.0054986
-  -0.0056790
-  -0.0058369
-  -0.0059719
-  -0.0060832
-  -0.0061706
-  -0.0062336
-  -0.0062720 ];
+  -0.0019611
+  -0.0015823
+  -0.0011972
+  -0.0008074
+  -0.0004144
+  -0.0000198
+   0.0003750
+   0.0007682
+   0.0011584
+   0.0015440
+   0.0019236
+   0.0022955
+   0.0026584
+   0.0030108
+   0.0033513
+   0.0036786
+   0.0039914
+   0.0042884
+   0.0045685
+   0.0048305
+   0.0050736
+   0.0052965
+   0.0054986
+   0.0056790
+   0.0058369
+   0.0059719
+   0.0060832
+   0.0061706
+   0.0062336
+   0.0062720 ];
 IDA_time_ref = (1.7:.01:1.99)';
 scs_m.props.tol(6) = 101; // Solver
 scs_m.props.context = "L = .0001; per = 0.01;"; // Period, to get more varied results
index 38a99b7..8c48e28 100644 (file)
@@ -19,36 +19,36 @@ function messagebox(msg, msg_title)
 endfunction
 funcprot(prot);
 IDA_val_ref = [
-   0.0019611
-   0.0015823
-   0.0011972
-   0.0008074
-   0.0004144
-   0.0000198
-  -0.0003750
-  -0.0007682
-  -0.0011584
-  -0.0015440
-  -0.0019236
-  -0.0022955
-  -0.0026584
-  -0.0030108
-  -0.0033513
-  -0.0036786
-  -0.0039914
-  -0.0042884
-  -0.0045685
-  -0.0048305
-  -0.0050736
-  -0.0052965
-  -0.0054986
-  -0.0056790
-  -0.0058369
-  -0.0059719
-  -0.0060832
-  -0.0061706
-  -0.0062336
-  -0.0062720 ];
+  -0.0019611
+  -0.0015823
+  -0.0011972
+  -0.0008074
+  -0.0004144
+  -0.0000198
+   0.0003750
+   0.0007682
+   0.0011584
+   0.0015440
+   0.0019236
+   0.0022955
+   0.0026584
+   0.0030108
+   0.0033513
+   0.0036786
+   0.0039914
+   0.0042884
+   0.0045685
+   0.0048305
+   0.0050736
+   0.0052965
+   0.0054986
+   0.0056790
+   0.0058369
+   0.0059719
+   0.0060832
+   0.0061706
+   0.0062336
+   0.0062720 ];
 IDA_time_ref = (1.7:.01:1.99)';
 scs_m.props.tol(6) = 101; // Solver
 scs_m.props.context = "L = .0001; per = 0.01;"; // Period, to get more varied results
index 22dcb49..be08a74 100644 (file)
Binary files a/scilab/modules/xcos/demos/ModelicaBlocks/RLC_Modelica.zcos and b/scilab/modules/xcos/demos/ModelicaBlocks/RLC_Modelica.zcos differ
index dc3a86e..5da34cd 100644 (file)
Binary files a/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos and b/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos differ