Scicos tests: relieving compilation 86/11986/2
Paul BIGNIER [Tue, 9 Jul 2013 09:59:55 +0000 (11:59 +0200)]
Avoiding unnecessary recompilation of the diagram

Change-Id: I7cf5603207d5689086b2fee053112ca3d8a28f89

20 files changed:
scilab/modules/scicos/tests/unit_tests/DDaskrK_Bouncing.dia.ref
scilab/modules/scicos/tests/unit_tests/DDaskrK_Bouncing.tst
scilab/modules/scicos/tests/unit_tests/DDaskrK_Platform.dia.ref
scilab/modules/scicos/tests/unit_tests/DDaskrK_Platform.tst
scilab/modules/scicos/tests/unit_tests/DDaskrK_RLC.dia.ref
scilab/modules/scicos/tests/unit_tests/DDaskrK_RLC.tst
scilab/modules/scicos/tests/unit_tests/DDaskrN_Bouncing.dia.ref
scilab/modules/scicos/tests/unit_tests/DDaskrN_Bouncing.tst
scilab/modules/scicos/tests/unit_tests/DDaskrN_Platform.dia.ref
scilab/modules/scicos/tests/unit_tests/DDaskrN_Platform.tst
scilab/modules/scicos/tests/unit_tests/DDaskrN_RLC.dia.ref
scilab/modules/scicos/tests/unit_tests/DDaskrN_RLC.tst
scilab/modules/scicos/tests/unit_tests/DDaskr_Hydraulics.dia.ref
scilab/modules/scicos/tests/unit_tests/DDaskr_Hydraulics.tst
scilab/modules/scicos/tests/unit_tests/DoPri.dia.ref
scilab/modules/scicos/tests/unit_tests/DoPri.tst
scilab/modules/scicos/tests/unit_tests/ExpRK.dia.ref
scilab/modules/scicos/tests/unit_tests/ExpRK.tst
scilab/modules/scicos/tests/unit_tests/ImpRK.dia.ref
scilab/modules/scicos/tests/unit_tests/ImpRK.tst

index 76d7972..5a102de 100644 (file)
@@ -15,26 +15,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
-// looking for the CLOCK_f/EVTDLY_f to update period
-for path_1=1:length(scs_m.objs)
-    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
-        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
-        break;
-    end
-end
-for path_2=1:length(CLOCK_f_scs_m)
-    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
-        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
-        break;
-    end
-end
-// Start by updating the clock block period (sampling)
-scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"0"];
-// Modify solver + run DDaskr + save results
-scs_m.props.tol(6) = 102;      // Solver
-//scs_m.props.tol(1) = 1.0e-10; // abstol
-//scs_m.props.tol(2) = 1.0e-10; // reltol
-scicos_simulate(scs_m, 'nw');  // DDaskr
+Info = scicos_simulate(scs_m, list(), 'nw');
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 50 50 50 50                                        
@@ -81,57 +62,41 @@ scicos_simulate(scs_m, 'nw');  // DDaskr
    Generate a cleaner file
 Shared archive loaded.
 Link done.
+// looking for the CLOCK_f/EVTDLY_f to update period
+for path_1=1:length(scs_m.objs)
+    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
+        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
+        break;
+    end
+end
+for path_2=1:length(CLOCK_f_scs_m)
+    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
+        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
+        break;
+    end
+end
+// Start by updating the clock block period (sampling)
+scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"0"];
+// Modify solver + run DDaskr + save results
+scs_m.props.tol(6) = 102;      // Solver
+//scs_m.props.tol(1) = 1.0e-10; // abstol
+//scs_m.props.tol(2) = 1.0e-10; // reltol
+scicos_simulate(scs_m, Info, 'nw');  // DDaskr
+ CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
+      ected, getting 50 50 50 50                                        
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
+
 ddaskrval = res.values;         // Results
 time = res.time;                // Time
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;     // Solver
-scicos_simulate(scs_m, 'nw'); // IDA
+scicos_simulate(scs_m, Info, 'nw'); // IDA
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 50 50 50 50                                        
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_test2_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_test2_imf.mo
- Simulation C code :TMPDIR/DDaskr_test2_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_test2_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
 idaval = res.values;          // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
index bfa3a6b..2379d43 100644 (file)
@@ -18,6 +18,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 // looking for the CLOCK_f/EVTDLY_f to update period
 for path_1=1:length(scs_m.objs)
@@ -40,13 +41,13 @@ scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"
 scs_m.props.tol(6) = 102;      // Solver
 //scs_m.props.tol(1) = 1.0e-10; // abstol
 //scs_m.props.tol(2) = 1.0e-10; // reltol
-scicos_simulate(scs_m, 'nw');  // DDaskr
+scicos_simulate(scs_m, Info, 'nw');  // DDaskr
 ddaskrval = res.values;         // Results
 time = res.time;                // Time
 
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;     // Solver
-scicos_simulate(scs_m, 'nw'); // IDA
+scicos_simulate(scs_m, Info, 'nw'); // IDA
 idaval = res.values;          // Results
 
 // Compare results
index 5418040..89d6f6d 100644 (file)
@@ -17,42 +17,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
-// looking for the CLOCK_f/EVTDLY_f to update period
-for path_1=1:length(scs_m.objs)
-    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_c" then
-        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
-        break;
-    end
-end
-for path_2=1:length(CLOCK_f_scs_m)
-    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_c" then
-        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
-        break;
-    end
-end
-for i=1:2  // 'max step size' = 10^-i, precision
-    // Start by updating the clock block period (sampling)
-    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
-    // Modify solver + run DDaskr + save results
-    scs_m.props.tol(6) = 102;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
-    ddaskrval = res.values;       // Results
-    time = res.time;              // Time
-    // Modify solver + run IDA + save results
-    scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
-    idaval = res.values;          // Results
-    // Compare results
-    compa = abs(ddaskrval-idaval);
-    // Extract mean, standard deviation, maximum
-    mea = mean(compa);
-    [maxi, indexMaxi] = max(compa);
-    stdeviation = st_deviation(compa);
-    // Verifying closeness of the results
-    assert_checktrue(maxi <= 10^-(i+1));
-    assert_checktrue(mea <= 10^-(i+1));
-    assert_checktrue(stdeviation <= 10^-(i+1));
-end
+Info = scicos_simulate(scs_m, list(), 'nw');
 --------------------------------------------\
  Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
 
@@ -96,132 +61,47 @@ end
    Generate a cleaner file
 Shared archive loaded.
 Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+// looking for the CLOCK_f/EVTDLY_f to update period
+for path_1=1:length(scs_m.objs)
+    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_c" then
+        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
+        break;
+    end
+end
+for path_2=1:length(CLOCK_f_scs_m)
+    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_c" then
+        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
+        break;
+    end
+end
+for i=1:2  // 'max step size' = 10^-i, precision
+    // Start by updating the clock block period (sampling)
+    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
+    // Modify solver + run DDaskr + save results
+    scs_m.props.tol(6) = 102;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
+    ddaskrval = res.values;       // Results
+    time = res.time;              // Time
+    // Modify solver + run IDA + save results
+    scs_m.props.tol(6) = 100;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
+    idaval = res.values;          // Results
+    // Compare results
+    compa = abs(ddaskrval-idaval);
+    // Extract mean, standard deviation, maximum
+    mea = mean(compa);
+    [maxi, indexMaxi] = max(compa);
+    stdeviation = st_deviation(compa);
+    // Verifying closeness of the results
+    assert_checktrue(maxi <= 10^-(i+1));
+    assert_checktrue(mea <= 10^-(i+1));
+    assert_checktrue(stdeviation <= 10^-(i+1));
+end
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
+
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
index 795842f..e54abaf 100644 (file)
@@ -20,6 +20,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 // looking for the CLOCK_f/EVTDLY_f to update period
 for path_1=1:length(scs_m.objs)
@@ -42,13 +43,13 @@ for i=1:2  // 'max step size' = 10^-i, precision
 
     // Modify solver + run DDaskr + save results
     scs_m.props.tol(6) = 102;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
     ddaskrval = res.values;       // Results
     time = res.time;              // Time
 
     // Modify solver + run IDA + save results
     scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
     idaval = res.values;          // Results
 
     // Compare results
index 516c871..3f2da12 100644 (file)
@@ -15,42 +15,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
-// looking for the CLOCK_f/EVTDLY_f to update period
-for path_1=1:length(scs_m.objs)
-    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
-        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
-        break;
-    end
-end
-for path_2=1:length(CLOCK_f_scs_m)
-    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
-        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
-        break;
-    end
-end
-for i=2:3
-    // Start by updating the clock block period (sampling)
-    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
-    // Modify solver + run DDaskr + save results
-    scs_m.props.tol(6) = 102;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
-    ddaskrval = res.values;        // Results
-    time = res.time;               // Time
-    // Modify solver + run IDA + save results
-    scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
-    idaval = res.values;          // Results
-    // Compare results
-    compa = abs(ddaskrval-idaval);
-    // Extract mean, standard deviation, maximum
-    mea = mean(compa);
-    [maxi, indexMaxi] = max(compa);
-    stdeviation = st_deviation(compa);
-    // Verifying closeness of the results
-    assert_checktrue(maxi <= 10^-(i+3));
-    assert_checktrue(mea <= 10^-(i+3));
-    assert_checktrue(stdeviation <= 10^-(i+3));
-end
+Info = scicos_simulate(scs_m, list(), 'nw');
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
@@ -97,141 +62,59 @@ end
    Generate a cleaner file
 Shared archive loaded.
 Link done.
+// looking for the CLOCK_f/EVTDLY_f to update period
+for path_1=1:length(scs_m.objs)
+    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
+        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
+        break;
+    end
+end
+for path_2=1:length(CLOCK_f_scs_m)
+    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
+        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
+        break;
+    end
+end
+for i=2:3
+    // Start by updating the clock block period (sampling)
+    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
+    // Modify solver + run DDaskr + save results
+    scs_m.props.tol(6) = 102;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
+    ddaskrval = res.values;        // Results
+    time = res.time;               // Time
+    // Modify solver + run IDA + save results
+    scs_m.props.tol(6) = 100;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
+    idaval = res.values;          // Results
+    // Compare results
+    compa = abs(ddaskrval-idaval);
+    // Extract mean, standard deviation, maximum
+    mea = mean(compa);
+    [maxi, indexMaxi] = max(compa);
+    stdeviation = st_deviation(compa);
+    // Verifying closeness of the results
+    assert_checktrue(maxi <= 10^-(i+3));
+    assert_checktrue(mea <= 10^-(i+3));
+    assert_checktrue(stdeviation <= 10^-(i+3));
+end
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 1                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 0                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_RLC_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 1                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 0                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_RLC_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
  
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 1                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 0                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_RLC_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
+ CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
+      ected, getting 2 2 2 2                                            
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
+
index c55fd92..2336b99 100644 (file)
@@ -18,6 +18,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 // looking for the CLOCK_f/EVTDLY_f to update period
 for path_1=1:length(scs_m.objs)
@@ -42,13 +43,13 @@ for i=2:3
 
     // Modify solver + run DDaskr + save results
     scs_m.props.tol(6) = 102;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
     ddaskrval = res.values;        // Results
     time = res.time;               // Time
 
     // Modify solver + run IDA + save results
     scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
     idaval = res.values;          // Results
 
     // Compare results
index 9261d19..59bf9c7 100644 (file)
@@ -15,26 +15,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
-// looking for the CLOCK_f/EVTDLY_f to update period
-for path_1=1:length(scs_m.objs)
-    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
-        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
-        break;
-    end
-end
-for path_2=1:length(CLOCK_f_scs_m)
-    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
-        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
-        break;
-    end
-end
-// Start by updating the clock block period (sampling)
-scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"0"];
-// Modify solver + run DDaskr + save results
-scs_m.props.tol(6) = 101;      // Solver
-//scs_m.props.tol(1) = 1.0e-10; // abstol
-//scs_m.props.tol(2) = 1.0e-10; // reltol
-scicos_simulate(scs_m, 'nw');  // DDaskr
+Info = scicos_simulate(scs_m, list(), 'nw');
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 50 50 50 50                                        
@@ -68,7 +49,7 @@ scicos_simulate(scs_m, 'nw');  // DDaskr
 !                                                         !
 !                                                         !
 !                                                         !
-!Generated files path: TMPDIR/          !
+!Generated files path: TMPDIR/         !
 !                                                         !
 !                                                         !
    Generate a loader file
@@ -81,57 +62,41 @@ scicos_simulate(scs_m, 'nw');  // DDaskr
    Generate a cleaner file
 Shared archive loaded.
 Link done.
+// looking for the CLOCK_f/EVTDLY_f to update period
+for path_1=1:length(scs_m.objs)
+    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
+        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
+        break;
+    end
+end
+for path_2=1:length(CLOCK_f_scs_m)
+    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
+        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
+        break;
+    end
+end
+// Start by updating the clock block period (sampling)
+scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"0"];
+// Modify solver + run DDaskr + save results
+scs_m.props.tol(6) = 101;      // Solver
+//scs_m.props.tol(1) = 1.0e-10; // abstol
+//scs_m.props.tol(2) = 1.0e-10; // reltol
+scicos_simulate(scs_m, Info, 'nw');  // DDaskr
+ CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
+      ected, getting 50 50 50 50                                        
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
+
 ddaskrval = res.values;         // Results
 time = res.time;                // Time
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;     // Solver
-scicos_simulate(scs_m, 'nw'); // IDA
+scicos_simulate(scs_m, Info, 'nw'); // IDA
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 50 50 50 50                                        
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_test2_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_test2_imf.mo
- Simulation C code :TMPDIR/DDaskr_test2_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/          !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_test2_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
 idaval = res.values;          // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
index 2713e9a..d6956fd 100644 (file)
@@ -18,6 +18,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 // looking for the CLOCK_f/EVTDLY_f to update period
 for path_1=1:length(scs_m.objs)
@@ -40,13 +41,13 @@ scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"
 scs_m.props.tol(6) = 101;      // Solver
 //scs_m.props.tol(1) = 1.0e-10; // abstol
 //scs_m.props.tol(2) = 1.0e-10; // reltol
-scicos_simulate(scs_m, 'nw');  // DDaskr
+scicos_simulate(scs_m, Info, 'nw');  // DDaskr
 ddaskrval = res.values;         // Results
 time = res.time;                // Time
 
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;     // Solver
-scicos_simulate(scs_m, 'nw'); // IDA
+scicos_simulate(scs_m, Info, 'nw'); // IDA
 idaval = res.values;          // Results
 
 // Compare results
index 51fded6..1ec4e53 100644 (file)
@@ -17,42 +17,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
-// looking for the CLOCK_f/EVTDLY_f to update period
-for path_1=1:length(scs_m.objs)
-    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_c" then
-        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
-        break;
-    end
-end
-for path_2=1:length(CLOCK_f_scs_m)
-    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_c" then
-        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
-        break;
-    end
-end
-for i=1:3  // 'max step size' = 10^-i, precision
-    // Start by updating the clock block period (sampling)
-    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
-    // Modify solver + run DDaskr + save results
-    scs_m.props.tol(6) = 101;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
-    ddaskrval = res.values;       // Results
-    time = res.time;              // Time
-    // Modify solver + run IDA + save results
-    scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
-    idaval = res.values;          // Results
-    // Compare results
-    compa = abs(ddaskrval-idaval);
-    // Extract mean, standard deviation, maximum
-    mea = mean(compa);
-    [maxi, indexMaxi] = max(compa);
-    stdeviation = st_deviation(compa);
-    // Verifying closeness of the results
-    assert_checktrue(maxi <= 10^-(i+3));
-    assert_checktrue(mea <= 10^-(i+3));
-    assert_checktrue(stdeviation <= 10^-(i+3));
-end
+Info = scicos_simulate(scs_m, list(), 'nw');
 --------------------------------------------\
  Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
 
@@ -83,7 +48,7 @@ end
 !                                                         !
 !                                                         !
 !                                                         !
-!Generated files path: TMPDIR/          !
+!Generated files path: TMPDIR/         !
 !                                                         !
 !                                                         !
    Generate a loader file
@@ -96,218 +61,51 @@ end
    Generate a cleaner file
 Shared archive loaded.
 Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+// looking for the CLOCK_f/EVTDLY_f to update period
+for path_1=1:length(scs_m.objs)
+    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_c" then
+        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
+        break;
+    end
+end
+for path_2=1:length(CLOCK_f_scs_m)
+    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_c" then
+        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
+        break;
+    end
+end
+for i=1:3  // 'max step size' = 10^-i, precision
+    // Start by updating the clock block period (sampling)
+    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
+    // Modify solver + run DDaskr + save results
+    scs_m.props.tol(6) = 101;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
+    ddaskrval = res.values;       // Results
+    time = res.time;              // Time
+    // Modify solver + run IDA + save results
+    scs_m.props.tol(6) = 100;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
+    idaval = res.values;          // Results
+    // Compare results
+    compa = abs(ddaskrval-idaval);
+    // Extract mean, standard deviation, maximum
+    mea = mean(compa);
+    [maxi, indexMaxi] = max(compa);
+    stdeviation = st_deviation(compa);
+    // Verifying closeness of the results
+    assert_checktrue(maxi <= 10^-(i+3));
+    assert_checktrue(mea <= 10^-(i+3));
+    assert_checktrue(stdeviation <= 10^-(i+3));
+end
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/          !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/          !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/          !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/          !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Platform_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
+
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Platform_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Platform_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 4                         !
-!                                                         !
-!Number of algebraic states: 0                            !
-!                                                         !
-!Number of discrete time states  : 2                      !
-!                                                         !
-!Number of zero-crossing surfaces: 1                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/          !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Platform_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
index fecd6c2..f8ca582 100644 (file)
@@ -20,6 +20,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 // looking for the CLOCK_f/EVTDLY_f to update period
 for path_1=1:length(scs_m.objs)
@@ -42,13 +43,13 @@ for i=1:3  // 'max step size' = 10^-i, precision
 
     // Modify solver + run DDaskr + save results
     scs_m.props.tol(6) = 101;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
     ddaskrval = res.values;       // Results
     time = res.time;              // Time
 
     // Modify solver + run IDA + save results
     scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
     idaval = res.values;          // Results
 
     // Compare results
index 22593e0..9a049e5 100644 (file)
@@ -15,42 +15,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
-// looking for the CLOCK_f/EVTDLY_f to update period
-for path_1=1:length(scs_m.objs)
-    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
-        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
-        break;
-    end
-end
-for path_2=1:length(CLOCK_f_scs_m)
-    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
-        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
-        break;
-    end
-end
-for i=2:3
-    // Start by updating the clock block period (sampling)
-    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
-    // Modify solver + run DDaskr + save results
-    scs_m.props.tol(6) = 101;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
-    ddaskrval = res.values;        // Results
-    time = res.time;               // Time
-    // Modify solver + run IDA + save results
-    scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
-    idaval = res.values;          // Results
-    // Compare results
-    compa = abs(ddaskrval-idaval);
-    // Extract mean, standard deviation, maximum
-    mea = mean(compa);
-    [maxi, indexMaxi] = max(compa);
-    stdeviation = st_deviation(compa);
-    // Verifying closeness of the results
-    assert_checktrue(maxi <= 10^-(i+4));
-    assert_checktrue(mea <= 10^-(i+4));
-    assert_checktrue(stdeviation <= 10^-(i+4));
-end
+Info = scicos_simulate(scs_m, list(), 'nw');
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
@@ -97,141 +62,59 @@ end
    Generate a cleaner file
 Shared archive loaded.
 Link done.
+// looking for the CLOCK_f/EVTDLY_f to update period
+for path_1=1:length(scs_m.objs)
+    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
+        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
+        break;
+    end
+end
+for path_2=1:length(CLOCK_f_scs_m)
+    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
+        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
+        break;
+    end
+end
+for i=2:3
+    // Start by updating the clock block period (sampling)
+    scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-i));"0"];
+    // Modify solver + run DDaskr + save results
+    scs_m.props.tol(6) = 101;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
+    ddaskrval = res.values;        // Results
+    time = res.time;               // Time
+    // Modify solver + run IDA + save results
+    scs_m.props.tol(6) = 100;     // Solver
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
+    idaval = res.values;          // Results
+    // Compare results
+    compa = abs(ddaskrval-idaval);
+    // Extract mean, standard deviation, maximum
+    mea = mean(compa);
+    [maxi, indexMaxi] = max(compa);
+    stdeviation = st_deviation(compa);
+    // Verifying closeness of the results
+    assert_checktrue(maxi <= 10^-(i+4));
+    assert_checktrue(mea <= 10^-(i+4));
+    assert_checktrue(stdeviation <= 10^-(i+4));
+end
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 1                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 0                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_RLC_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 1                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 0                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_RLC_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 2 2 2 2                                            
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_RLC_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_RLC_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_RLC_test_im.c
  
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 1                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 0                      !
-!                                                         !
-!Number of modes  : 0                                     !
-!                                                         !
-!Number of inputs : 0                                     !
-!                                                         !
-!Number of outputs: 3                                     !
-!                                                         !
-!Input/output dependency:[T]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_RLC_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
+ CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
+      ected, getting 2 2 2 2                                            
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
+
index 6225d1f..14e47e1 100644 (file)
@@ -18,6 +18,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 // looking for the CLOCK_f/EVTDLY_f to update period
 for path_1=1:length(scs_m.objs)
@@ -42,13 +43,13 @@ for i=2:3
 
     // Modify solver + run DDaskr + save results
     scs_m.props.tol(6) = 101;     // Solver
-    scicos_simulate(scs_m, 'nw'); // DDaskr
+    scicos_simulate(scs_m, Info, 'nw'); // DDaskr
     ddaskrval = res.values;        // Results
     time = res.time;               // Time
 
     // Modify solver + run IDA + save results
     scs_m.props.tol(6) = 100;     // Solver
-    scicos_simulate(scs_m, 'nw'); // IDA
+    scicos_simulate(scs_m, Info, 'nw'); // IDA
     idaval = res.values;          // Results
 
     // Compare results
index 114fd47..0d6a776 100644 (file)
@@ -15,26 +15,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
-// looking for the CLOCK_f/EVTDLY_f to update period
-for path_1=1:length(scs_m.objs)
-    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
-        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
-        break;
-    end
-end
-for path_2=1:length(CLOCK_f_scs_m)
-    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
-        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
-        break;
-    end
-end
-// Start by updating the clock block period (sampling)
-scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"0"];
-// Modify solver + run DDaskr + save results
-scs_m.props.tol(6) = 101;       // Solver
-//scs_m.props.tol(1) = 1.0e-10; // abstol
-//scs_m.props.tol(2) = 1.0e-10; // reltol
-scicos_simulate(scs_m, 'nw');   // DDaskr
+Info = scicos_simulate(scs_m, list(), 'nw');
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 50 50 50 50                                        
@@ -81,57 +62,41 @@ scicos_simulate(scs_m, 'nw');   // DDaskr
    Generate a cleaner file
 Shared archive loaded.
 Link done.
+// looking for the CLOCK_f/EVTDLY_f to update period
+for path_1=1:length(scs_m.objs)
+    if typeof(scs_m.objs(path_1))=="Block" & scs_m.objs(path_1).gui=="CLOCK_f" then
+        CLOCK_f_scs_m = scs_m.objs(path_1).model.rpar;
+        break;
+    end
+end
+for path_2=1:length(CLOCK_f_scs_m)
+    if typeof(CLOCK_f_scs_m.objs(path_2))=="Block" & CLOCK_f_scs_m.objs(path_2).gui=="EVTDLY_f" then
+        EVTDLY_f_blk = CLOCK_f_scs_m.objs(path_2);
+        break;
+    end
+end
+// Start by updating the clock block period (sampling)
+scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"0"];
+// Modify solver + run DDaskr + save results
+scs_m.props.tol(6) = 101;       // Solver
+//scs_m.props.tol(1) = 1.0e-10; // abstol
+//scs_m.props.tol(2) = 1.0e-10; // reltol
+scicos_simulate(scs_m, Info, 'nw');   // DDaskr
+ CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
+      ected, getting 50 50 50 50                                        
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
+
 ddaskrval = res.values;         // Results
 time = res.time;                // Time
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;       // Solver
-scicos_simulate(scs_m, 'nw');   // IDA
+scicos_simulate(scs_m, Info, 'nw');   // IDA
  
  CMSCOPE('set'): Wrong size for block parameter 'Refresh period': 2 exp 
       ected, getting 50 50 50 50                                        
---------------------------------------------\
- Main Modelica : TMPDIR/DDaskr_Hydraulics_test_im.mo
+Warning : redefining function: dst                     . Use funcprot(0) to avoid this message
 
- Flat Modelica : TMPDIR/DDaskr_Hydraulics_test_imf.mo
- Simulation C code :TMPDIR/DDaskr_Hydraulics_test_im.c
-!Modelica blocks are reduced to a block with:             !
-!                                                         !
-!Number of differential states: 2                         !
-!                                                         !
-!Number of algebraic states: 5                            !
-!                                                         !
-!Number of discrete time states  : 0                      !
-!                                                         !
-!Number of zero-crossing surfaces: 19                     !
-!                                                         !
-!Number of modes  : 19                                    !
-!                                                         !
-!Number of inputs : 1                                     !
-!                                                         !
-!Number of outputs: 2                                     !
-!                                                         !
-!Input/output dependency:[F]                              !
-!                                                         !
-!Analytical Jacobian: enabled  (%Jacobian=%t)             !
-!                                                         !
-!Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
-!                                                         !
-!                                                         !
-!                                                         !
-!Generated files path: TMPDIR/         !
-!                                                         !
-!                                                         !
-   Generate a loader file
-   Generate a Makefile
-   ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy DDaskr_Hydraulics_test_im.c to TMPDIR
-   ilib_gen_Make: configure : Generate Makefile.
-   ilib_gen_Make: Modification of the Makefile in TMPDIR.
-   Running the Makefile
-   Generate a cleaner file
-Shared archive loaded.
-Link done.
 idaval = res.values;            // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
index 73d0db6..75f7bd6 100644 (file)
@@ -18,6 +18,7 @@ function messagebox(msg, msg_title)
  disp(msg);
 endfunction
 funcprot(prot);
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 // looking for the CLOCK_f/EVTDLY_f to update period
 for path_1=1:length(scs_m.objs)
@@ -40,13 +41,13 @@ scs_m.objs(path_1).model.rpar.objs(path_2).graphics.exprs = [string(5*(10^-3));"
 scs_m.props.tol(6) = 101;       // Solver
 //scs_m.props.tol(1) = 1.0e-10; // abstol
 //scs_m.props.tol(2) = 1.0e-10; // reltol
-scicos_simulate(scs_m, 'nw');   // DDaskr
+scicos_simulate(scs_m, Info, 'nw');   // DDaskr
 ddaskrval = res.values;         // Results
 time = res.time;                // Time
 
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;       // Solver
-scicos_simulate(scs_m, 'nw');   // IDA
+scicos_simulate(scs_m, Info, 'nw');   // IDA
 idaval = res.values;            // Results
 
 // Compare results
index 89ffa4b..7e98f3c 100644 (file)
@@ -8,18 +8,19 @@
 // <-- XCOS TEST -->
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/DoPri_test.zcos"));
+Info = scicos_simulate(scs_m, list(), 'nw');
 for i=2:4  // 'max step size' = 5*10^-i, precision
  // Start by updating the clock block period (sampling)
  scs_m.objs(8).model.rpar(1) = 5*10^(-i);
  scs_m.objs(9).model.rpar(1) = 5*10^(-i);
  // Modify solver and 'max step size' + run DoPri + save results
  scs_m.props.tol(7) = 5*10^(-i); scs_m.props.tol(6) = 5;           // 'max step size' + solver
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end;   // DoPri
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;   // DoPri
  doprival = res.values;   // Results
  time = res.time;         // Time
  // Modify solver and 'max step size' + run CVode + save results
  scs_m.props.tol(7) = 0; scs_m.props.tol(6) = 1;
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end;
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;
  cvval = res.values;
  // Compare results
  compa = abs(doprival-cvval);
index d184189..c5dc37f 100644 (file)
@@ -11,6 +11,7 @@
 
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/DoPri_test.zcos"));
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 for i=2:4  // 'max step size' = 5*10^-i, precision
 
@@ -20,13 +21,13 @@ for i=2:4  // 'max step size' = 5*10^-i, precision
 
  // Modify solver and 'max step size' + run DoPri + save results
  scs_m.props.tol(7) = 5*10^(-i); scs_m.props.tol(6) = 5;           // 'max step size' + solver
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end;   // DoPri
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;   // DoPri
  doprival = res.values;   // Results
  time = res.time;         // Time
 
  // Modify solver and 'max step size' + run CVode + save results
  scs_m.props.tol(7) = 0; scs_m.props.tol(6) = 1;
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end;
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;
  cvval = res.values;
 
  // Compare results
index 0074f97..9bfc4c1 100644 (file)
@@ -8,18 +8,19 @@
 // <-- XCOS TEST -->
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/RK_test.zcos"));
+Info = scicos_simulate(scs_m, list(), 'nw');
 for i=2:4  // 'max step size' = 10^-i, precision
  // Start by updating the clock block period (sampling)
  scs_m.objs(7).model.rpar(1) = 5*10^(-i);
  scs_m.objs(8).model.rpar(1) = 5*10^(-i);
  // Modify solver and 'max step size' + run ExpRK + save results
  scs_m.props.tol(7) = 5*10^(-i); scs_m.props.tol(6) = 6;     // 'max step size' + solver
- try scicos_simulate(scs_m); catch disp(lasterror()); end;   // ExpRK
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;   // ExpRK
  rkval = res.values;   // Results
  time = res.time;      // Time
  // Modify solver and 'max step size' + run CVode + save results
  scs_m.props.tol(7) = 0; scs_m.props.tol(6) = 1;
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end;
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;
  cvval = res.values;
  // Compare results
  compa = abs(rkval-cvval);
index eac8d48..6a3cda5 100644 (file)
@@ -11,6 +11,7 @@
 
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/RK_test.zcos"));
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 for i=2:4  // 'max step size' = 10^-i, precision
 
@@ -20,13 +21,13 @@ for i=2:4  // 'max step size' = 10^-i, precision
 
  // Modify solver and 'max step size' + run ExpRK + save results
  scs_m.props.tol(7) = 5*10^(-i); scs_m.props.tol(6) = 6;     // 'max step size' + solver
- try scicos_simulate(scs_m); catch disp(lasterror()); end;   // ExpRK
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;   // ExpRK
  rkval = res.values;   // Results
  time = res.time;      // Time
 
  // Modify solver and 'max step size' + run CVode + save results
  scs_m.props.tol(7) = 0; scs_m.props.tol(6) = 1;
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end;
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end;
  cvval = res.values;
 
  // Compare results
index 18fb62f..f5d5418 100644 (file)
@@ -8,6 +8,7 @@
 // <-- XCOS TEST -->
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/RK_test.zcos"));
+Info = scicos_simulate(scs_m, list(), 'nw');
 for i=2:4  // 'max step size' = 10^-i, precision
  // Start by updating the clock block period (sampling)
  scs_m.objs(7).model.rpar(1) = 5*(10^-i);
@@ -15,12 +16,12 @@ for i=2:4  // 'max step size' = 10^-i, precision
  // Modify solver and 'max step size' + run ImpRK + save results
  scs_m.props.tol(7) = 5*(10^-i); scs_m.props.tol(6) = 7;         // 'max step size' + solver
  scs_m.props.tol(2) = 1.0e-12;                                   // reltol
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end  // ImpRK
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end  // ImpRK
  rkval = res.values;   // Results
  time = res.time;      // Time
  // Modify solver and reltol + run CVode + save results
  scs_m.props.tol(6) = 4; scs_m.props.tol(2) = 1.0e-15;
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end
  cvval = res.values;
  // Compare results
  compa = abs(rkval-cvval);
index f515276..7644d64 100644 (file)
@@ -10,6 +10,7 @@
 
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/RK_test.zcos"));
+Info = scicos_simulate(scs_m, list(), 'nw');
 
 for i=2:4  // 'max step size' = 10^-i, precision
 
@@ -20,13 +21,13 @@ for i=2:4  // 'max step size' = 10^-i, precision
  // Modify solver and 'max step size' + run ImpRK + save results
  scs_m.props.tol(7) = 5*(10^-i); scs_m.props.tol(6) = 7;         // 'max step size' + solver
  scs_m.props.tol(2) = 1.0e-12;                                   // reltol
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end  // ImpRK
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end  // ImpRK
  rkval = res.values;   // Results
  time = res.time;      // Time
 
  // Modify solver and reltol + run CVode + save results
  scs_m.props.tol(6) = 4; scs_m.props.tol(2) = 1.0e-15;
- try scicos_simulate(scs_m, 'nw'); catch disp(lasterror()); end
+ try scicos_simulate(scs_m, Info, 'nw'); catch disp(lasterror()); end
  cvval = res.values;
 
  // Compare results