Xcos tests: separate ODE and DAE and rename diagrams 72/12272/2
Paul BIGNIER [Tue, 13 Aug 2013 14:53:31 +0000 (16:53 +0200)]
Change-Id: Ida27d40f3a814e3d90ada8baca0f2aa64f8622b0

65 files changed:
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Bouncing.tst with 96% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Bouncing.unix.dia.ref with 89% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Bouncing.win.dia.ref with 89% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Hydraulics.tst with 96% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Hydraulics.unix.dia.ref with 79% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Hydraulics.win.dia.ref with 79% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Platform.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Platform.unix.dia.ref with 89% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Platform.win.dia.ref with 89% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_RLC.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_RLC.unix.dia.ref with 74% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_RLC.win.dia.ref with 74% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Bouncing.tst with 96% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Bouncing.unix.dia.ref with 88% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Bouncing.win.dia.ref with 88% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Hydraulics.tst with 96% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Hydraulics.unix.dia.ref with 79% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Hydraulics.win.dia.ref with 79% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Platform.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Platform.unix.dia.ref with 91% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Platform.win.dia.ref with 91% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_RLC.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_RLC.unix.dia.ref with 74% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_RLC.win.dia.ref with 74% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Bouncing.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Bouncing.unix.dia.ref with 89% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Bouncing.win.dia.ref with 89% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Hydraulics.tst with 98% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Hydraulics.unix.dia.ref with 93% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Hydraulics.win.dia.ref with 93% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Platform.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Platform.unix.dia.ref with 91% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_Platform.win.dia.ref with 91% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_RLC.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.unix.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_RLC.unix.dia.ref with 88% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.win.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/IDA_RLC.win.dia.ref with 88% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Cont-Disc.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Cont-Disc.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Cont-Disc.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Cont-Disc.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Controller.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Controller.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Controller.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Controller.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Kalman.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Kalman.dia.ref with 98% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Kalman.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Kalman.tst with 98% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Temperature_Controller.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Temperature_Controller.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Temperature_Controller.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Temperature_Controller.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Watertank.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Watertank.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/CVode_Watertank.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/CVode_Watertank.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/DAE_ODE.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DAE_ODE.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/DAE_ODE.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DAE_ODE.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/DoPri.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DoPri.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/DoPri.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/DoPri.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/ExpRK.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/ExpRK.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/ExpRK.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/ExpRK.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/ImpRK.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/ImpRK.dia.ref with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/ImpRK.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/ImpRK.tst with 97% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/LSodar.dia.ref [moved from scilab/modules/scicos/tests/unit_tests/Solvers/LSodar.dia.ref with 98% similarity]
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/LSodar.tst [moved from scilab/modules/scicos/tests/unit_tests/Solvers/LSodar.tst with 98% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/ODE/Cont-Disc.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/Cont-Disc.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/ODE/Controller.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/Controller.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/ODE/Temperature_Controller.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/Temperature_Controller.zcos with 100% similarity]
scilab/modules/xcos/tests/unit_tests/Solvers/ODE/Watertank.zcos [moved from scilab/modules/xcos/tests/unit_tests/Solvers/Watertank.zcos with 100% similarity]

@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -20,10 +20,10 @@ endfunction
 funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Bouncing_test_im.mo
+ Main Modelica : TMPDIR/Bouncing_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Bouncing_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Bouncing_test_im.c
+ Flat Modelica : TMPDIR/Bouncing_imf.mo
+ Simulation C code :TMPDIR/Bouncing_im.c
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m, Info);   // DDaskr
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -20,10 +20,10 @@ endfunction
 funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Bouncing_test_im.mo
+ Main Modelica : TMPDIR\Bouncing_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Bouncing_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Bouncing_test_im.c
+ Flat Modelica : TMPDIR\Bouncing_imf.mo
+ Simulation C code :TMPDIR\Bouncing_im.c
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m, Info);   // DDaskr
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -22,19 +22,19 @@ funcprot(prot);
 scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m);   // DDaskr
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR/Hydraulics_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR/Hydraulics_imf.mo
+ Simulation C code :TMPDIR/Hydraulics_im.c
 ddaskrval = res.values;         // Results
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;      // Solver
 scicos_simulate(scs_m);  // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR/Hydraulics_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR/Hydraulics_imf.mo
+ Simulation C code :TMPDIR/Hydraulics_im.c
 idaval = res.values;           // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -22,19 +22,19 @@ funcprot(prot);
 scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m);   // DDaskr
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR\Hydraulics_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR\Hydraulics_imf.mo
+ Simulation C code :TMPDIR\Hydraulics_im.c
 ddaskrval = res.values;         // Results
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;      // Solver
 scicos_simulate(scs_m);  // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR\Hydraulics_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR\Hydraulics_imf.mo
+ Simulation C code :TMPDIR\Hydraulics_im.c
 idaval = res.values;           // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -19,10 +19,10 @@ function messagebox(msg, msg_title)
 endfunction
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+ Main Modelica : TMPDIR/Platform_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
+ Flat Modelica : TMPDIR/Platform_imf.mo
+ Simulation C code :TMPDIR/Platform_im.c
 for i=1:2  // 'max step size' = 10^-i, precision
     // Start by updating the clock block period (sampling)
     Context.per = 5*10^-i;
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -19,10 +19,10 @@ function messagebox(msg, msg_title)
 endfunction
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Platform_test_im.mo
+ Main Modelica : TMPDIR\Platform_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Platform_test_im.c
+ Flat Modelica : TMPDIR\Platform_imf.mo
+ Simulation C code :TMPDIR\Platform_im.c
 for i=1:2  // 'max step size' = 10^-i, precision
     // Start by updating the clock block period (sampling)
     Context.per = 5*10^-i;
@@ -12,7 +12,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -40,22 +40,22 @@ for i=2:3
     assert_checktrue(stdeviation <= 10^-(i+4));
 end
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -40,22 +40,22 @@ for i=2:3
     assert_checktrue(stdeviation <= 10^-(i+4));
 end
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -20,10 +20,10 @@ endfunction
 funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Bouncing_test_im.mo
+ Main Modelica : TMPDIR/Bouncing_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Bouncing_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Bouncing_test_im.c
+ Flat Modelica : TMPDIR/Bouncing_imf.mo
+ Simulation C code :TMPDIR/Bouncing_im.c
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 101;      // Solver
 scicos_simulate(scs_m, Info);  // DDaskr
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -20,10 +20,10 @@ endfunction
 funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Bouncing_test_im.mo
+ Main Modelica : TMPDIR\Bouncing_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Bouncing_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Bouncing_test_im.c
+ Flat Modelica : TMPDIR\Bouncing_imf.mo
+ Simulation C code :TMPDIR\Bouncing_im.c
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 101;      // Solver
 scicos_simulate(scs_m, Info);  // DDaskr
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -22,19 +22,19 @@ funcprot(prot);
 scs_m.props.tol(6) = 101;       // Solver
 scicos_simulate(scs_m);   // DDaskr
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR/Hydraulics_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR/Hydraulics_imf.mo
+ Simulation C code :TMPDIR/Hydraulics_im.c
 ddaskrval = res.values;         // Results
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;       // Solver
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR/Hydraulics_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR/Hydraulics_imf.mo
+ Simulation C code :TMPDIR/Hydraulics_im.c
 idaval = res.values;            // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -22,19 +22,19 @@ funcprot(prot);
 scs_m.props.tol(6) = 101;       // Solver
 scicos_simulate(scs_m);   // DDaskr
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR\Hydraulics_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR\Hydraulics_imf.mo
+ Simulation C code :TMPDIR\Hydraulics_im.c
 ddaskrval = res.values;         // Results
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;       // Solver
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR\Hydraulics_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR\Hydraulics_imf.mo
+ Simulation C code :TMPDIR\Hydraulics_im.c
 idaval = res.values;            // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -20,10 +20,10 @@ endfunction
 funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+ Main Modelica : TMPDIR/Platform_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
+ Flat Modelica : TMPDIR/Platform_imf.mo
+ Simulation C code :TMPDIR/Platform_im.c
 for i=1:3  // 'max step size' = 10^-i, precision
     // Start by updating the clock block period (sampling)
     Context.per = 5*10^-i;
@@ -57,4 +57,3 @@ Warning : redefining function: dst                     . Use funcprot(0) to avoi
 Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
 Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
-
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -20,10 +20,10 @@ endfunction
 funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Platform_test_im.mo
+ Main Modelica : TMPDIR\Platform_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Platform_test_im.c
+ Flat Modelica : TMPDIR\Platform_imf.mo
+ Simulation C code :TMPDIR\Platform_im.c
 for i=1:3  // 'max step size' = 10^-i, precision
     // Start by updating the clock block period (sampling)
     Context.per = 5*10^-i;
@@ -12,7 +12,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -40,22 +40,22 @@ for i=2:3
     assert_checktrue(stdeviation <= 10^-(i+4));
 end
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -40,22 +40,22 @@ for i=2:3
     assert_checktrue(stdeviation <= 10^-(i+4));
 end
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -49,9 +49,9 @@ scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.5"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Bouncing_test_im.mo
+ Main Modelica : TMPDIR/Bouncing_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Bouncing_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Bouncing_test_im.c
+ Flat Modelica : TMPDIR/Bouncing_imf.mo
+ Simulation C code :TMPDIR/Bouncing_im.c
 assert_checkalmostequal(res.values(1:26), IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Bouncing_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -49,9 +49,9 @@ scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.5"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Bouncing_test_im.mo
+ Main Modelica : TMPDIR\Bouncing_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Bouncing_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Bouncing_test_im.c
+ Flat Modelica : TMPDIR\Bouncing_imf.mo
+ Simulation C code :TMPDIR\Bouncing_im.c
 assert_checkalmostequal(res.values(1:26), IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -91,9 +91,9 @@ scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.05"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR/Hydraulics_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR/Hydraulics_imf.mo
+ Simulation C code :TMPDIR/Hydraulics_im.c
 assert_checkalmostequal(res.values($-67:$, :), IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Hydraulics_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -91,9 +91,9 @@ scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.05"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Hydraulics_test_im.mo
+ Main Modelica : TMPDIR\Hydraulics_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Hydraulics_test_im.c
+ Flat Modelica : TMPDIR\Hydraulics_imf.mo
+ Simulation C code :TMPDIR\Hydraulics_im.c
 assert_checkalmostequal(res.values($-67:$, :), IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -63,9 +63,9 @@ scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.5"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+ Main Modelica : TMPDIR/Platform_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
+ Flat Modelica : TMPDIR/Platform_imf.mo
+ Simulation C code :TMPDIR/Platform_im.c
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_Platform_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -63,9 +63,9 @@ scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.5"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_Platform_test_im.mo
+ Main Modelica : TMPDIR\Platform_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_Platform_test_im.c
+ Flat Modelica : TMPDIR\Platform_imf.mo
+ Simulation C code :TMPDIR\Platform_im.c
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -13,7 +13,7 @@
 ilib_verbose(0); //to remove ilib_* traces
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -54,9 +54,9 @@ scs_m.props.tol(6) = 101; // Solver
 scs_m.props.context = "L = .0001; per = 0.01;"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR/RLC_im.mo
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR/RLC_imf.mo
+ Simulation C code :TMPDIR/RLC_im.c
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -11,7 +11,7 @@
 //
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DDaskr_RLC_test.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -54,9 +54,9 @@ scs_m.props.tol(6) = 101; // Solver
 scs_m.props.context = "L = .0001; per = 0.01;"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
- Main Modelica : TMPDIR\DDaskr_RLC_test_im.mo
+ Main Modelica : TMPDIR\RLC_im.mo
 
- Flat Modelica : TMPDIR\DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR\DDaskr_RLC_test_im.c
+ Flat Modelica : TMPDIR\RLC_imf.mo
+ Simulation C code :TMPDIR\RLC_im.c
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
@@ -9,7 +9,7 @@
 //
 // <-- XCOS TEST -->
 //
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Cont-Disc.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Cont-Disc.zcos"));
 CVode_val_ref = [
     0.0526307    0.0281557  -0.0448704
     0.0532495    0.0310114  -0.0395186
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Cont-Disc.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Cont-Disc.zcos"));
 
 CVode_val_ref = [
     0.0526307    0.0281557  -0.0448704
@@ -9,7 +9,7 @@
 //
 // <-- XCOS TEST -->
 //
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Controller.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Controller.zcos"));
 CVode_val_ref = [
   -0.3044468   -0.0529063   -0.1556339
   -0.3152667   -0.0434950   -0.1412728
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Controller.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Controller.zcos"));
 
 CVode_val_ref = [
   -0.3044468   -0.0529063   -0.1556339
@@ -9,7 +9,7 @@
 //
 // <-- XCOS TEST -->
 //
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 CVode_val_ref = [ -0.0124518   0.0057263   0.0202561
                   -0.0056589   0.0003643   0.0040543
                    0.0139675   0.0010424  -0.0068178
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 
 CVode_val_ref = [ -0.0124518   0.0057263   0.0202561
                   -0.0056589   0.0003643   0.0040543
@@ -9,7 +9,7 @@
 //
 // <-- XCOS TEST -->
 //
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Temperature_Controller.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Temperature_Controller.zcos"));
 CVode_val_ref = [
   -3.6548088    0.0000044    16.066667    19.721476
   -3.6499578    0.0000040    16.066667    19.716625
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Temperature_Controller.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Temperature_Controller.zcos"));
 
 CVode_val_ref = [
   -3.6548088    0.0000044    16.066667    19.721476
@@ -9,7 +9,7 @@
 //
 // <-- XCOS TEST -->
 //
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Watertank.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Watertank.zcos"));
 CVode_val_ref = [
     7.8198758    9.6795397
     7.8460626    9.6628927
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Watertank.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Watertank.zcos"));
 
 CVode_val_ref = [
     7.8198758    9.6795397
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 // Redefining messagebox() to avoid popup
 prot = funcprot();
 funcprot(0);
@@ -11,7 +11,7 @@
 //
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 
 // Redefining messagebox() to avoid popup
 prot = funcprot();
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 Info = scicos_simulate(scs_m, list());
 for i=2:4  // 'max step size' = 5*10^-i, precision
  // Start by updating the clock block period (sampling)
@@ -11,7 +11,7 @@
 //
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 Info = scicos_simulate(scs_m, list());
 
 for i=2:4  // 'max step size' = 5*10^-i, precision
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 Info = scicos_simulate(scs_m, list());
 for i=2:4  // 'max step size' = 5*10^-i, precision
  // Start by updating the clock block period (sampling)
@@ -11,7 +11,7 @@
 //
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 Info = scicos_simulate(scs_m, list());
 
 for i=2:4  // 'max step size' = 5*10^-i, precision
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 Info = scicos_simulate(scs_m, list());
 for i=2:4  // 'max step size' = 10^-i, precision
  // Start by updating the clock block period (sampling)
@@ -11,7 +11,7 @@
 //
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 Info = scicos_simulate(scs_m, list());
 
 for i=2:4  // 'max step size' = 10^-i, precision
@@ -10,7 +10,7 @@
 // <-- XCOS TEST -->
 //
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 // Set solver to LSodar + run LSodar + save results
 scs_m.props.tol(6) = 0;                                    // Set solver to LSodar
 try scicos_simulate(scs_m); catch disp(lasterror()); end; // Run LSodar
@@ -11,7 +11,7 @@
 //
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Kalman.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 
 // Set solver to LSodar + run LSodar + save results
 scs_m.props.tol(6) = 0;                                    // Set solver to LSodar