Changeset 13385


Ignore:
Timestamp:
2012-10-15T12:12:37+02:00 (12 years ago)
Author:
lochel
Message:
  • always test for getErrorString()
  • create test-folders for linear/nonlinear systems
  • move some linear/nonlinear tests
Location:
trunk/testsuite/simulation/modelica
Files:
4 added
3 deleted
15 edited
5 moved

Legend:

Unmodified
Added
Removed

  • trunk/testsuite/simulation/modelica/initialization/FilterBlock1.mos

    r13362 r13385  
    11// Name:     FilterBlock1
    2 // keywords: equations when
     2// keywords: initial, reinit
    33// status:   correct
    4 // teardown_command: rm -f _FilterBlock1.* FilterBlock1_res.mat FilterBlock1.exe FilterBlock1.c FilterBlock1_* output.log
    5 //  Tests when, elsewhen
     4// teardown_command: rm -rf initializationTests.FilterBlock1* _initializationTests.FilterBlock1* output.log
     5// First order filter block
    66// Drmodelica: 9.1 reinit (p. 296)
    77//
    88
    9 loadFile("FilterBlock1.mo"); getErrorString();
    10 simulate(FilterBlock1,numberOfIntervals=2, tolerance=1e-5); getErrorString();
    11 res := readSimulationResult("FilterBlock1_res.mat",{x, y},4); getErrorString();
     9loadString("
     10within ;
     11package initializationTests
     12  block FilterBlock1
     13    parameter Real T = 1 \"Time constant\";
     14    parameter Real k = 1 \"Gain\";
     15    Real u = 1;
     16    output Real y;
     17  protected
     18    Real x;
     19  equation
     20    der(x) = (u - x)/T;
     21    y = k*x;
     22  algorithm
     23    when initial() then
     24      reinit(x, u); // if x is u since der(x) = (u - x)/T
     25    end when;
     26  end FilterBlock1;
     27end initializationTests;
     28"); getErrorString();
    1229
     30simulate(initializationTests.FilterBlock1, tolerance=1e-5, startTime=0.0, stopTime=0.0); getErrorString();
     31res := readSimulationResult("initializationTests.FilterBlock1_res.mat", {time, x, y}, 2); getErrorString();
    1332
    1433// Result:
    … …  
    1635// ""
    1736// record SimulationResult
    18 //     resultFile = "FilterBlock1_res.mat",
    19 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 2, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'FilterBlock1', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
     37//     resultFile = "initializationTests.FilterBlock1_res.mat",
     38//     simulationOptions = "startTime = 0.0, stopTime = 0.0, numberOfIntervals = 500, tolerance = 1e-05, method = 'dassl', fileNamePrefix = 'initializationTests.FilterBlock1', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
    2039//     messages = ""
    2140// end SimulationResult;
    2241// ""
    23 // {{0.0,0.0,0.0,0.0},{0.0,0.0,0.0,0.0}}
     42// {{0.0,0.0},{1.0,1.0},{1.0,1.0}}
    2443// ""
    2544// endResult

  • trunk/testsuite/simulation/modelica/initialization/Initialization.mos

    r13337 r13385  
    22// keywords: Simulate, Initialization
    33// status:   correct
    4 // teardown_command: rm -rf Init1 Init1.* Init1_* Init2 Init2.* Init2_* Init3 Init3.* Init3_* output.log
     4// teardown_command: rm -rf initializationTests.Init* _initializationTests.Init* output.log
    55//
    66//  Simulate models with initial conditions.
    77//
    8 loadFile("Initialization.mo");
    98
    10 simulate(Init1, tolerance=1e-5, numberOfIntervals=100);
    11 val(x,0.0);
    12 val(y,0.0);
    13 getErrorString();
    14 simulate(Init2, tolerance=1e-5, numberOfIntervals=100);
    15 val(x,0.0);
    16 val(y,0.0);
    17 getErrorString();
    18 simulate(Init3, tolerance=1e-5, numberOfIntervals=100);
    19 val(x,0.0);
    20 val(y,0.0);
    21 getErrorString();
     9loadString("
     10within ;
     11package initializationTests
     12  model Init1
     13    Real x;
     14    Real y;
     15  equation
     16    der(x) = 2*x*y-3*y;
     17    der(y) = 5*y-7*x*y;
     18  initial equation
     19    x = 5;
     20    y = 5;
     21  end Init1;
     22
     23  model Init2
     24    Real x(start=5);
     25    Real y(start=5);
     26  equation
     27    der(x) = 2*x*y-3*y;
     28    der(y) = 5*y-7*x*y;
     29  end Init2;
     30
     31  model Init3
     32    Real x(start=5);
     33    Real y(start=5);
     34  equation
     35    der(x) = 2*x*y-3*y;
     36    der(y) = 5*y-7*x*y;
     37  initial equation
     38    x = 3;
     39    y = 4;
     40  end Init3;
     41end initializationTests;
     42"); getErrorString();
     43
     44simulate(initializationTests.Init1, tolerance=1e-5, startTime=0.0, stopTime=0.0); getErrorString();
     45res := readSimulationResult("initializationTests.Init1_res.mat", {time, x, y}, 2); getErrorString();
     46
     47simulate(initializationTests.Init2, tolerance=1e-5, startTime=0.0, stopTime=0.0); getErrorString();
     48res := readSimulationResult("initializationTests.Init2_res.mat", {time, x, y}, 2); getErrorString();
     49
     50simulate(initializationTests.Init3, tolerance=1e-5, startTime=0.0, stopTime=0.0); getErrorString();
     51res := readSimulationResult("initializationTests.Init3_res.mat", {time, x, y}, 2); getErrorString();
    2252
    2353// Result:
    2454// true
     55// ""
    2556// record SimulationResult
    26 //     resultFile = "Init1_res.mat",
    27 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 100, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'Init1', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
     57//     resultFile = "initializationTests.Init1_res.mat",
     58//     simulationOptions = "startTime = 0.0, stopTime = 0.0, numberOfIntervals = 500, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'initializationTests.Init1', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
    2859//     messages = ""
    2960// end SimulationResult;
    30 // 4.999999684615445
    31 // 4.99999919026922
     61// ""
     62// {{0.0,0.0},{5.0,5.0},{5.0,5.0}}
    3263// ""
    3364// record SimulationResult
    34 //     resultFile = "Init2_res.mat",
    35 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 100, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'Init2', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
     65//     resultFile = "initializationTests.Init2_res.mat",
     66//     simulationOptions = "startTime = 0.0, stopTime = 0.0, numberOfIntervals = 500, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'initializationTests.Init2', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
    3667//     messages = ""
    3768// end SimulationResult;
    38 // 5.0
    39 // 5.0
     69// ""
     70// {{0.0,0.0},{5.0,5.0},{5.0,5.0}}
    4071// ""
    4172// record SimulationResult
    42 //     resultFile = "Init3_res.mat",
    43 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 100, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'Init3', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
     73//     resultFile = "initializationTests.Init3_res.mat",
     74//     simulationOptions = "startTime = 0.0, stopTime = 0.0, numberOfIntervals = 500, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'initializationTests.Init3', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
    4475//     messages = ""
    4576// end SimulationResult;
    46 // 3.000000488773206
    47 // 4.000000706536821
     77// ""
     78// {{0.0,0.0},{3.0,3.0},{4.0,4.0}}
    4879// ""
    4980// endResult

  • trunk/testsuite/simulation/modelica/initialization/Makefile

    r13337 r13385  
    77Initialization.mos \
    88minvalue.mos\
    9 MissV.mos \
    109nominal.mos \
    1110nonlinear.mos \

  • trunk/testsuite/simulation/modelica/initialization/forest.mos

    r11875 r13385  
    5050  end forest_850;
    5151end initializationTests;
    52 ");
    53 getErrorString();
     52"); getErrorString();
    5453
    55 simulate(initializationTests.forest_350, startTime=0.0, stopTime=0.0);
    56 readFile("output.log");
    57 print("with population(start=350)");
    58 val(foxes, 0.0);
    59 val(rabbits, 0.0);
     54simulate(initializationTests.forest_350, startTime=0.0, stopTime=0.0); getErrorString();
     55print("with population(start=350): {time, foxes, rabbits}");
     56res := readSimulationResult("initializationTests.forest_350_res.mat", {time, foxes, rabbits}, 2); getErrorString();
    6057
    61 simulate(initializationTests.forest_850, startTime=0.0, stopTime=0.0);
    62 readFile("output.log");
    63 print("with population(start=850)");
    64 val(foxes, 0.0);
    65 val(rabbits, 0.0);
     58simulate(initializationTests.forest_850, startTime=0.0, stopTime=0.0); getErrorString();
     59print("with population(start=850): {time, foxes, rabbits}");
     60res := readSimulationResult("initializationTests.forest_850_res.mat", {time, foxes, rabbits}, 2); getErrorString();
    6661
    6762// Result:
    … …  
    7469// end SimulationResult;
    7570// ""
    76 // with population(start=350)
    77 // 52.882140522046654
    78 // 255.63990423508562
     71// with population(start=350): {time, foxes, rabbits}
     72// {{0.0,0.0},{52.88214148830836,52.88214148830836},{255.63990056178312,255.63990056178312}}
     73// ""
    7974// record SimulationResult
    8075//     resultFile = "initializationTests.forest_850_res.mat",
    … …  
    8378// end SimulationResult;
    8479// ""
    85 // with population(start=850)
    86 // 6.051192281038914
    87 // 841.0267521607786
     80// with population(start=850): {time, foxes, rabbits}
     81// {{0.0,0.0},{6.051192555034769,6.051192555034769},{841.0267697638469,841.0267697638469}}
     82// ""
    8883// endResult

  • trunk/testsuite/simulation/modelica/initialization/gaspropreties.mos

    r12732 r13385  
    2828  end intake1;
    2929end gaspropreties;
    30 ");
    31 getErrorString();
     30"); getErrorString();
    3231
    33 simulate(gaspropreties.intake1, startTime=0.0, stopTime=0.0);
    34 readFile("output.log");
     32simulate(gaspropreties.intake1, startTime=0.0, stopTime=0.0); getErrorString();
    3533
    3634// Result:

  • trunk/testsuite/simulation/modelica/initialization/minvalue.mos

    r12732 r13385  
    3232  end minvalue_04;
    3333end initializationTests;
    34 ");
    35 getErrorString();
     34"); getErrorString();
    3635
    37 simulate(initializationTests.minvalue_02, startTime=0.0, stopTime=0.0, simflags="-iom kinsol");
    38 val(x[1], 0);
    39 val(x[2], 0);
     36simulate(initializationTests.minvalue_02, startTime=0.0, stopTime=0.0, simflags="-iom kinsol"); getErrorString();
     37res := readSimulationResult("initializationTests.minvalue_02_res.mat", {time, x[1], x[2]}, 2); getErrorString();
    4038
    41 simulate(initializationTests.minvalue_04, startTime=0.0, stopTime=0.0, simflags="-iom kinsol");
    42 val(x[1], 0);
    43 val(x[2], 0);
    44 val(x[3], 0);
    45 val(x[4], 0);
     39simulate(initializationTests.minvalue_04, startTime=0.0, stopTime=0.0, simflags="-iom kinsol"); getErrorString();
     40res := readSimulationResult("initializationTests.minvalue_04_res.mat", {time, x[1], x[2], x[3], x[4]}, 2); getErrorString();
    4641
    4742// Result:
    … …  
    5348//     messages = ""
    5449// end SimulationResult;
    55 // 1.0
    56 // 2.0
     50// ""
     51// {{0.0,0.0},{1.0,1.0},{2.0,2.0}}
     52// ""
    5753// record SimulationResult
    5854//     resultFile = "initializationTests.minvalue_04_res.mat",
    … …  
    6056//     messages = ""
    6157// end SimulationResult;
    62 // 1.0
    63 // 2.0
    64 // 3.0
    65 // 4.0
     58// ""
     59// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0},{4.0,4.0}}
     60// ""
    6661// endResult

  • trunk/testsuite/simulation/modelica/initialization/nominal.mos

    r12813 r13385  
    4242  end forest;
    4343end initializationTests;
    44 ");
    45 getErrorString();
     44"); getErrorString();
    4645
    47 simulate(initializationTests.forest, startTime=0.0, stopTime=0.0);
    48 readFile("output.log");
    49 val(foxes, 0.0);
    50 val(rabbits, 0.0);
     46simulate(initializationTests.forest, startTime=0.0, stopTime=0.0); getErrorString();
     47res := readSimulationResult("initializationTests.forest_res.mat", {time, foxes, rabbits}, 2); getErrorString();
    5148
    5249// Result:
    … …  
    5956// end SimulationResult;
    6057// ""
    61 // 528821412699.6485
    62 // 0.000000025563990079136763
     58// {{0.0,0.0},{528821412699.6485,528821412699.6485},{0.000000025563990079136763,0.000000025563990079136763}}
     59// ""
    6360// endResult

  • trunk/testsuite/simulation/modelica/initialization/nonlinear.mos

    r12732 r13385  
    3333  end nonlinear_05;
    3434end initializationTests;
    35 ");
    36 getErrorString();
     35"); getErrorString();
    3736
    38 simulate(initializationTests.nonlinear_03, startTime=0.0, stopTime=0.0, simflags="-iom kinsol");
    39 readFile("output.log");
    40 val(x[1], 0);
    41 val(x[2], 0);
    42 val(x[3], 0);
     37simulate(initializationTests.nonlinear_03, startTime=0.0, stopTime=0.0, simflags="-iom kinsol"); getErrorString();
     38res := readSimulationResult("initializationTests.nonlinear_03_res.mat", {time, x[1], x[2], x[3]}, 2); getErrorString();
    4339
    44 simulate(initializationTests.nonlinear_05, startTime=0.0, stopTime=0.0, simflags="-iom kinsol");
    45 readFile("output.log");
    46 val(x[1], 0);
    47 val(x[2], 0);
    48 val(x[3], 0);
    49 val(x[4], 0);
    50 val(x[5], 0);
     40simulate(initializationTests.nonlinear_05, startTime=0.0, stopTime=0.0, simflags="-iom kinsol"); getErrorString();
     41res := readSimulationResult("initializationTests.nonlinear_05_res.mat", {time, x[1], x[2], x[3], x[4], x[5]}, 2); getErrorString();
    5142
    5243// Result:
    … …  
    5950// end SimulationResult;
    6051// ""
    61 // 1.0
    62 // 2.0
    63 // 3.0
     52// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0}}
     53// ""
    6454// record SimulationResult
    6555//     resultFile = "initializationTests.nonlinear_05_res.mat",
    … …  
    6858// end SimulationResult;
    6959// ""
    70 // 1.0
    71 // 2.0
    72 // 3.0
    73 // 4.0
    74 // 5.0
     60// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0},{4.0,4.0},{5.0,5.0}}
     61// ""
    7562// endResult

  • trunk/testsuite/simulation/modelica/initialization/nonlinear2.mos

    r12732 r13385  
    3737  end nonlinear2_49;
    3838end initializationTests;
    39 ");
    40 getErrorString();
     39"); getErrorString();
    4140
    42 simulate(initializationTests.nonlinear2_03, startTime=0.0, stopTime=0.0);
    43 readFile("output.log");
    44 val(x[1], 0.0);
    45 val(x[2], 0.0);
    46 val(x[3], 0.0);
     41simulate(initializationTests.nonlinear2_03, startTime=0.0, stopTime=0.0); getErrorString();
     42res := readSimulationResult("initializationTests.nonlinear2_03_res.mat", {time, x[1], x[2], x[3]}, 2); getErrorString();
    4743
    48 simulate(initializationTests.nonlinear2_05, startTime=0.0, stopTime=0.0);
    49 readFile("output.log");
    50 val(x[1], 0.0);
    51 val(x[2], 0.0);
    52 val(x[3], 0.0);
    53 val(x[4], 0.0);
    54 val(x[5], 0.0);
     44simulate(initializationTests.nonlinear2_05, startTime=0.0, stopTime=0.0); getErrorString();
     45res := readSimulationResult("initializationTests.nonlinear2_05_res.mat", {time, x[1], x[2], x[3], x[4], x[5]}, 2); getErrorString();
    5546
    56 simulate(initializationTests.nonlinear2_49, startTime=0.0, stopTime=0.0, simflags="-iom kinsol");
    57 readFile("output.log");
    58 val(x[1], 0.0);
    59 val(x[2], 0.0);
    60 val(x[3], 0.0);
    61 val(x[47], 0.0);
    62 val(x[48], 0.0);
    63 val(x[49], 0.0);
     47simulate(initializationTests.nonlinear2_49, startTime=0.0, stopTime=0.0, simflags="-iom kinsol"); getErrorString();
     48res := readSimulationResult("initializationTests.nonlinear2_49_res.mat", {time, x[1], x[2], x[3], x[47], x[48], x[49]}, 2); getErrorString();
    6449
    6550// Result:
    … …  
    7257// end SimulationResult;
    7358// ""
    74 // 1.0
    75 // 2.0
    76 // 3.0
     59// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0}}
     60// ""
    7761// record SimulationResult
    7862//     resultFile = "initializationTests.nonlinear2_05_res.mat",
    … …  
    8165// end SimulationResult;
    8266// ""
    83 // 1.0
    84 // 2.0
    85 // 3.0
    86 // 4.0
    87 // 5.0
     67// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0},{4.0,4.0},{5.0,5.0}}
     68// ""
    8869// record SimulationResult
    8970//     resultFile = "initializationTests.nonlinear2_49_res.mat",
    … …  
    9273// end SimulationResult;
    9374// ""
    94 // 1.0
    95 // 2.0
    96 // 3.0
    97 // 47.0
    98 // 48.0
    99 // 49.0
     75// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0},{47.0,47.0},{48.0,48.0},{49.0,49.0}}
     76// ""
    10077// endResult

  • trunk/testsuite/simulation/modelica/initialization/outputTest.mos

    r12732 r13385  
    2323  end outputTest;
    2424end initializationTests;
    25 ");
    26 getErrorString();
     25"); getErrorString();
    2726
    28 simulate(initializationTests.outputTest, startTime=0.0, stopTime=0.0, simflags="-iom ipopt");
     27simulate(initializationTests.outputTest, startTime=0.0, stopTime=0.0, simflags="-iom ipopt"); getErrorString();
    2928val(y, 0);
    3029

  • trunk/testsuite/simulation/modelica/initialization/scaling1.mos

    r11875 r13385  
    4242  end forest;
    4343end initializationTests;
    44 ");
    45 getErrorString();
     44"); getErrorString();
    4645
    47 simulate(initializationTests.forest, startTime=0.0, stopTime=0.0);
    48 readFile("output.log");
    49 val(foxes, 0.0);
    50 val(rabbits, 0.0);
     46simulate(initializationTests.forest, startTime=0.0, stopTime=0.0); getErrorString();
     47res := readSimulationResult("initializationTests.forest_res.mat", {time, foxes, rabbits}, 2); getErrorString();
    5148
    5249// Result:
    … …  
    5956// end SimulationResult;
    6057// ""
    61 // 6.051192281038914
    62 // 841.0267521607786
     58// {{0.0,0.0},{6.051192281038914,6.051192281038914},{841.0267521607786,841.0267521607786}}
     59// ""
    6360// endResult

  • trunk/testsuite/simulation/modelica/initialization/scaling2.mos

    r11875 r13385  
    4242  end forest;
    4343end initializationTests;
    44 ");
    45 getErrorString();
     44"); getErrorString();
    4645
    47 simulate(initializationTests.forest, startTime=0.0, stopTime=0.0);
    48 readFile("output.log");
    49 val(foxes, 0.0);
    50 val(rabbits, 0.0);
     46simulate(initializationTests.forest, startTime=0.0, stopTime=0.0); getErrorString();
     47res := readSimulationResult("initializationTests.forest_res.mat", {time, foxes, rabbits}, 2); getErrorString();
    5148
    5249// Result:
    … …  
    5956// end SimulationResult;
    6057// ""
    61 // 6.051192281038914
    62 // 841.0267521607786
     58// {{0.0,0.0},{6.051192281038914,6.051192281038914},{841.0267521607786,841.0267521607786}}
     59// ""
    6360// endResult

  • trunk/testsuite/simulation/modelica/initialization/singularJacobian.mos

    r12732 r13385  
    3333  end singularJacobian_05;
    3434end initializationTests;
    35 ");
    36 getErrorString();
     35"); getErrorString();
    3736
    38 simulate(initializationTests.singularJacobian_03, startTime=0.0, stopTime=0.0);
    39 readFile("output.log");
    40 val(x[1], 0);
    41 val(x[2], 0);
    42 val(x[3], 0);
     37simulate(initializationTests.singularJacobian_03, startTime=0.0, stopTime=0.0); getErrorString();
     38res := readSimulationResult("initializationTests.singularJacobian_03_res.mat", {time, x[1], x[2], x[3]}, 2); getErrorString();
    4339
    44 simulate(initializationTests.singularJacobian_05, startTime=0.0, stopTime=0.0);
    45 readFile("output.log");
    46 val(x[1], 0);
    47 val(x[2], 0);
    48 val(x[3], 0);
    49 val(x[4], 0);
    50 val(x[5], 0);
     40simulate(initializationTests.singularJacobian_05, startTime=0.0, stopTime=0.0); getErrorString();
     41res := readSimulationResult("initializationTests.singularJacobian_05_res.mat", {time, x[1], x[2], x[3], x[4], x[5]}, 2); getErrorString();
    5142
    5243// Result:
    … …  
    5950// end SimulationResult;
    6051// ""
    61 // 1.0
    62 // 2.0
    63 // 3.0
     52// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0}}
     53// ""
    6454// record SimulationResult
    6555//     resultFile = "initializationTests.singularJacobian_05_res.mat",
    … …  
    6858// end SimulationResult;
    6959// ""
    70 // 1.0
    71 // 2.0
    72 // 3.0
    73 // 4.0
    74 // 5.0
     60// {{0.0,0.0},{1.0,1.0},{2.0,2.0},{3.0,3.0},{4.0,4.0},{5.0,5.0}}
     61// ""
    7562// endResult

  • trunk/testsuite/simulation/modelica/initialization/startValue.mos

    r12732 r13385  
    2121  end startValue;
    2222end initializationTests;
    23 ");
    24 getErrorString();
     23"); getErrorString();
    2524
    26 simulate(initializationTests.startValue, startTime=0.0, stopTime=0.0);
    27 readFile("output.log");
    28 val(y, 0.0);
     25simulate(initializationTests.startValue, startTime=0.0, stopTime=0.0); getErrorString();
     26res := readSimulationResult("initializationTests.startValue_res.mat", {time, y}, 2); getErrorString();
    2927
    3028// Result:
    … …  
    3735// end SimulationResult;
    3836// ""
    39 // -3.1622772216796875
     37// {{0.0,0.0},{-3.1622772216796875,-3.1622772216796875}}
     38// ""
    4039// endResult

  • trunk/testsuite/simulation/modelica/linear_system/MissV.mos

    r13381 r13385  
    22// keywords: linear system of equations
    33// status: correct
    4 // teardown_command: rm -rf MissV_* MissV MissV.exe MissV.cpp MissV.makefile MissV.libs MissV.log output.log
     4// teardown_command: rm -rf initializationTests.MissV* _initializationTests.MissV* output.log
    55//
    66// Solving of a linear system of equations
    77//
    8 // Tests fixes for bug: http://openmodelica.ida.liu.se:8080/cb/issue/1110
    9 // 
    10 loadFile("MissV.mo");
    11 instantiateModel(MissV);
    12 simulate(MissV,startTime=0.0, stopTime=1.0, numberOfIntervals=500, tolerance=1e-5);
     8// Tests fixes for bug: https://trac.openmodelica.org/OpenModelica/ticket/1110
     9//
     10
     11loadString("
     12package initializationTests
     13  model MissV
     14    Real pb(start = 12000000);
     15    Real Qb;
     16    Real pa(start = 12000000);
     17    Real Qa;
     18    parameter Real s = 1e-3;
     19    parameter Real v = 5e3;
     20
     21  equation
     22    der(pb) = (Qb - v)/s;
     23    der(pa) = (Qa - v)/s;
     24    pa = pb;
     25    Qa + Qb = 0;
     26  end MissV;
     27end initializationTests;
     28"); getErrorString();
     29instantiateModel(initializationTests.MissV); getErrorString();
     30simulate(initializationTests.MissV,startTime=0.0, stopTime=1.0, numberOfIntervals=500, tolerance=1e-5); getErrorString();
    1331
    1432val(pa, 1.0);
    … …  
    1735// Result:
    1836// true
    19 // "class MissV
     37// ""
     38// "class initializationTests.MissV
    2039//   Real pb(start = 12000000.0);
    2140//   Real Qb;
    … …  
    2948//   pa = pb;
    3049//   Qa + Qb = 0.0;
    31 // end MissV;
     50// end initializationTests.MissV;
    3251// "
     52// ""
    3353// record SimulationResult
    34 //     resultFile = "MissV_res.mat",
    35 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'MissV', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
     54//     resultFile = "initializationTests.MissV_res.mat",
     55//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'initializationTests.MissV', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
    3656//     messages = ""
    3757// end SimulationResult;
     58// ""
    3859// 7000000.0
    3960// 7000000.0

  • trunk/testsuite/simulation/modelica/others/Makefile

    r13337 r13385  
    1414nonConstantIndex.mos \
    1515nonConstantParam.mos \
    16 NonlinearFailed.mos \
    17 NonlinearMixed.mos \
    1816ParameterCycle.mos \
    1917ParameterModel.mos \
Note: See TracChangeset for help on using the changeset viewer.