Skip to content

Commit

Permalink
expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
niklwors committed Mar 10, 2016
1 parent 8d7b6f8 commit a7681ee
Show file tree
Hide file tree
Showing 106 changed files with 1,641 additions and 2,022 deletions.
Expand Up @@ -32,9 +32,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed
// {"opAmp.v_in","opAmp.q_fr1","opAmp.q_fr2","opAmp.q_fr3","opAmp.q_fp1","opAmp.v_source","opAmp.x"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 0.003, numberOfIntervals = 2500, tolerance = 2e-07, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed_res.mat
// "true
Expand Down
Expand Up @@ -29,9 +29,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Analog.Examples.CharacteristicThyristors
// {"R1.i","R1.v","R3.i","R3.v"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 6.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.CharacteristicThyristors', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.CharacteristicThyristors_res.mat
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
Expand Down
Expand Up @@ -28,12 +28,8 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SuppressedSimulation
// Modelica.Electrical.Analog.Examples.ChuaCircuit
// {"L.i","C1.v","C2.v"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 50000.0, numberOfIntervals = 50000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.ChuaCircuit', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.ChuaCircuit_res.mat
// "true
// "
// ""
// Note: There were no messages so you do not need to suppress them any longer, Please update the test.
// endResult
Expand Up @@ -27,9 +27,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Analog.Examples.ControlledSwitchWithArc
// {"inductor1.i","inductor2.i"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 6.0, numberOfIntervals = 24000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.ControlledSwitchWithArc', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.ControlledSwitchWithArc_res.mat
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
Expand Down
Expand Up @@ -34,9 +34,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Analog.Examples.DifferenceAmplifier
// {"C1.v","C4.v","C5.v","C2.v","C3.v","Transistor1.Tr.vbc","Transistor1.Tr.vbe","Transistor2.Tr.vbc","Transistor2.Tr.vbe"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.DifferenceAmplifier', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.DifferenceAmplifier_res.mat
// "true
Expand Down
Expand Up @@ -8,7 +8,7 @@

runScript("../common/ModelTestingDefaults.mos"); getErrorString();

modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelName := $TypeName(Modelica.Electrical.Analog.Examples.HeatingNPN_OrGate);
compareVars :=
{
Expand All @@ -23,16 +23,15 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.SimpleSimulation
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// Modelica.Electrical.Analog.Examples.HeatingNPN_OrGate
// {"HeatCapacitor1.T"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 200.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.HeatingNPN_OrGate', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.HeatingNPN_OrGate_res.mat
// Files Equal!
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
//
//
// "true
// "
// ""
Expand Down
Expand Up @@ -27,9 +27,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Analog.Examples.NandGate
// {"Nand.C4.v","Nand.C7.v"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 1e-07, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.NandGate', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.NandGate_res.mat
// "true
Expand Down
Expand Up @@ -28,14 +28,24 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// Modelica.Electrical.Analog.Examples.SimpleTriacCircuit
// {"L.i","simpleTriac.thyristor.vControl","simpleTriac.thyristor1.vControl"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 0.001, numberOfIntervals = 2000, tolerance = 1e-12, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.SimpleTriacCircuit', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Analog.Examples.SimpleTriacCircuit_res.mat
// Messages:
// [CVODES ERROR] CVode
// At t = 7e-005 and h = 1e-024, the corrector convergence test failed repeatedly or with |h| = hmin.
//
//
// SUNDIALS_ERROR: CVode() failed with flag = -4
//
//
// Files Equal!
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
//
//
// Warning: Resultfile and Reference have different end time points!
// Reffile[2286]=0.001000
// File[157]=0.000070
//
// "true
// "
// ""
Expand Down
Expand Up @@ -35,9 +35,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Digital.Examples.Counter
// {"Enable.y","Clock.y","Counter.q[1]","Counter.q[2]","Counter.q[3]","Counter.q[4]","Q0.y[1]","Q1.y[1]","Q2.y[1]","Q3.y[1]"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 100.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Digital.Examples.Counter', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Digital.Examples.Counter_res.mat
// "true
Expand Down
Expand Up @@ -31,9 +31,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Digital.Examples.Counter3
// {"Enable.y","Clock.y","Counter.q0","Counter.q1","Counter.q2","Counter.count"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Digital.Examples.Counter3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Digital.Examples.Counter3_res.mat
// "true
Expand Down
Expand Up @@ -8,7 +8,7 @@

runScript("../common/ModelTestingDefaults.mos"); getErrorString();

modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
modelName := $TypeName(Modelica.Electrical.Digital.Examples.FlipFlop);
compareVars :=
{
Expand All @@ -27,20 +27,13 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Digital.Examples.FlipFlop
// {"J.y","CLK.y","K.y","FF.q","FF.qn",""}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// {"J.y","CLK.y","K.y","FF.q","FF.qn"}
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 250.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Digital.Examples.FlipFlop', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Digital.Examples.FlipFlop_res.mat
// Failed variables: FF.qnFF.q
// Error: Could not read variable in file Modelica.Electrical.Digital.Examples.FlipFlop.mat.
// Warning: Get data of variable from file Modelica.Electrical.Digital.Examples.FlipFlop.mat failed!
// Warning: Files not Equal
// Failed variables: FF.qnFF.q
// Error: Could not read variable in file Modelica.Electrical.Digital.Examples.FlipFlop_res.mat.
// Created diff file Modelica.Electrical.Digital.Examples.FlipFlop.FF.q.html
// This test cannot succeed automated testing because the test kind is wrong
// "true
// "
// ""
// endResult
Expand Up @@ -34,9 +34,7 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Digital.Examples.FullAdder
// {"Enable.y","CLK.y","Counter.q0","Counter.q1","Counter.q2","Adder1.s","Adder1.c_out","s.y[1]","c_out.y[1]"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Digital.Examples.FullAdder', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Digital.Examples.FullAdder_res.mat
// "true
Expand Down
Expand Up @@ -8,7 +8,7 @@

runScript("../common/ModelTestingDefaults.mos"); getErrorString();

modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
modelName := $TypeName(Modelica.Electrical.Digital.Examples.Multiplexer);
compareVars :=
{
Expand All @@ -20,19 +20,23 @@ compareVars :=
"Enable.y",
"FF.q",
"FF.qn",
"MUX.d",
"MUX.d"
};

simulationRuntime := OpenModelicaModelTesting.SimulationRuntime.Cpp;

runScript(modelTesting);getErrorString();

// Result:
// Error processing file: Modelica.Electrical.Digital.Examples.Multiplexer.mos
// [simulation/libraries/msl32_cpp/Modelica.Electrical.Digital.Examples.Multiplexer.mos:24:2-24:2:writable] Error: Parser error: LA(2) == EQUALS near: } (RBRACE)
//
// # Error encountered! Exiting...
// # Please check the error message and the flags.
//
// Execution failed!
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.Compilation
// Modelica.Electrical.Digital.Examples.Multiplexer
// {"D0.y","D1.y","D2.y","D3.y","CLK.y","Enable.y","FF.q","FF.qn","MUX.d"}
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Compilation succeeded
// "true
// "
// ""
// endResult
Expand Up @@ -33,12 +33,13 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Digital.Examples.RAM
// {"addr_1.y","addr_0.y","data_1.y","data_0.y","RE.y","WE.y","dLATRAM.dataOut[1]","dLATRAM.dataOut[2]"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 400.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Digital.Examples.RAM', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Digital.Examples.RAM_res.mat
// "true
// "
// ""
// Error: Simulation did not produce a result-file
// Errors: Simulation execution failed for model: Modelica.Electrical.Digital.Examples.RAM
// Assertion failed: b.getNumElems() == nelems, file d:/Projekte/OMC/OpenModelica/build/include/omc/cpp/Core/Math/Array.h, line 782
//
// This application has requested the Runtime to terminate it in an unusual way.
// Please contact the application's support team for more information.
//
// endResult
Expand Up @@ -32,12 +32,8 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Digital.Examples.WiredX
// {"e_table1.y","x_table1.y","e_table2.y","x_table2.y","bUF3S1.y","bUF3S2.y","wiredX.y"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 12.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Digital.Examples.WiredX', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Digital.Examples.WiredX_res.mat
// "true
// "
// ""
// Note: Result files are now equal. Please update the test to do verified simulation!
// endResult
Expand Up @@ -32,19 +32,10 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_DOL
// {"aimc.idq_rr[1]","aimc.idq_rr[2]","aimc.lssigma.i_[1]","aimc.lssigma.i_[2]","aimc.lszero.i","loadInertia.phi","loadInertia.w"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 1.5, numberOfIntervals = 1500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_DOL', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_DOL_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12943:7-12948:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element final = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 and = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 on component m.
// [Modelica 3.2.1/Electrical/Machines.mo:12943:7-12948:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricPotential", unit = "V"), C_CONST), value: 100.0 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12943:7-12948:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element final = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 and = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 on component m.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricPotential", unit = "V"), C_CONST), value: 100.0 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12949:7-12951:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricCurrent", unit = "A"), C_CONST), value: 100.0 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricCurrent", unit = "A"), C_CONST), value: 100.0 on component IRef.
//
// "true
// "
// ""
Expand Down
Expand Up @@ -32,19 +32,10 @@ runScript(modelTesting);getErrorString();
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Initialize
// {"aimc.idq_rr[1]","aimc.idq_rr[2]","aimc.lssigma.i_[1]","aimc.lssigma.i_[2]","aimc.lszero.i","loadInertia.phi","loadInertia.w"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// OpenModelicaModelTesting.SimulationRuntime.Cpp
// Simulation options: startTime = 0.0, stopTime = 1.5, numberOfIntervals = 1500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Initialize', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Initialize_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12943:7-12948:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element final = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 and = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 on component m.
// [Modelica 3.2.1/Electrical/Machines.mo:12943:7-12948:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricPotential", unit = "V"), C_CONST), value: 100.0 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12943:7-12948:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element final = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 and = (typed)3 DAE.PROP(Integer, C_CONST), value: 3 on component m.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricPotential", unit = "V"), C_CONST), value: 100.0 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12949:7-12951:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricCurrent", unit = "A"), C_CONST), value: 100.0 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100.0 DAE.PROP(Real(min = 1e-60, quantity = "ElectricCurrent", unit = "A"), C_CONST), value: 100.0 on component IRef.
//
// "true
// "
// ""
Expand Down

0 comments on commit a7681ee

Please sign in to comment.