Skip to content

Commit

Permalink
expected output for cpp tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@niklwors
niklwors committed Aug 19, 2015
1 parent c0bf140 commit 0754291
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 42 deletions.
3 changes: 1 addition & 2 deletions simulation/libraries/msl32_cpp/Modelica.Electrical.Digital.Examples.FlipFlop.mos
View file
Expand Up @@ -16,8 +16,7 @@ compareVars :=
"CLK.y",
"K.y",
"FF.q",
"FF.qn",
""
"FF.qn"
};

runScript("common.mos");getErrorString();
Expand Down
3 changes: 1 addition & 2 deletions simulation/libraries/msl32_cpp/Modelica.Electrical.Digital.Examples.Multiplexer.mos
View file
Expand Up @@ -21,8 +21,7 @@ compareVars :=
"FF.q",
"FF.qn",
"MUX.d",
""
};
};

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

Expand Down
5 changes: 2 additions & 3 deletions simulation/libraries/msl32_cpp/Modelica.Electrical.Digital.Examples.WiredX.mos
View file
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.WiredX);
compareVars :=
{
Expand All @@ -29,15 +29,14 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// 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
// "
// ""
// 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
// Files Equal!
// "true
// "
// ""
Expand Down
27 changes: 10 additions & 17 deletions .../Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer.mos
View file
Expand Up @@ -8,7 +8,7 @@

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

modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
modelName := $TypeName(Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer);
compareVars :=
{
Expand All @@ -31,29 +31,22 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// OpenModelicaModelTesting.Kind.SimpleSimulation
// Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer
// {"aimc.idq_rr[1]","aimc.idq_rr[2]","aimc.lssigma.i_[1]","aimc.lssigma.i_[2]","aimc.lszero.i","loadInertia.phi","loadInertia.w","transformer.l1sigma.inductor[2].i","transformer.l1sigma.inductor[3].i"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// Simulation options: startTime = 0.0, stopTime = 2.5, numberOfIntervals = 2500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer_res.mat
// Failed variables: aimc.idq_rr[2]aimc.idq_rr[1]
// [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.
// [Modelica 3.2.1/Electrical/Machines.mo:12962:7-12967: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:12962:7-12967: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:12962:7-12967: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.
// [Modelica 3.2.1/Electrical/Machines.mo:12968:7-12970: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.
// Warning: Files not Equal
// Failed variables: aimc.idq_rr[2]aimc.idq_rr[1]
// [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.
// Created diff file Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer.aimc.idq_rr[1].html
// This test cannot succeed automated testing because the test kind is wrong
//
// "true
// "
// ""
// endResult
9 changes: 3 additions & 6 deletions ...es/msl32_cpp/Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97OnePhase_ph.mos
View file
Expand Up @@ -8,7 +8,7 @@

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

modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
modelName := $TypeName(Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97OnePhase_ph);
compareVars :=
{
Expand All @@ -24,15 +24,13 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// OpenModelicaModelTesting.Kind.Compilation
// Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97OnePhase_ph
// {"volume.U","volume.m"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// Simulation options: startTime = 0.0, stopTime = 1.01, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97OnePhase_ph', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97OnePhase_ph_res.mat
// Files Equal!
// Compilation succeeded
// Warning: Alias set with different nominal values
// * candidate: volume.medium.sat.psat(nominal = 1000000.0)
// * candidate: volume.medium.state.p(nominal = 1000000.0)
Expand All @@ -44,7 +42,6 @@ runScript(modelTesting);getErrorString();
// * candidate: volume.port.p(nominal = 1000000.0)
// * candidate: volume.medium.p(nominal = 100000.0)
// => select value from volume.medium.p(nominal = 100000.0) for variable: volume.medium.p
//
// "true
// "
// ""
Expand Down
9 changes: 3 additions & 6 deletions .../libraries/msl32_cpp/Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_pT.mos
View file
Expand Up @@ -8,7 +8,7 @@

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

modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
modelName := $TypeName(Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_pT);
compareVars :=
{
Expand All @@ -24,15 +24,13 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// OpenModelicaModelTesting.Kind.Compilation
// Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_pT
// {"volume.U","volume.m"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// Simulation options: startTime = 0.0, stopTime = 1.01, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_pT', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_pT_res.mat
// Files Equal!
// Compilation succeeded
// Warning: Alias set with different nominal values
// * candidate: volume.medium.sat.psat(nominal = 1000000.0)
// * candidate: volume.medium.state.p(nominal = 1000000.0)
Expand All @@ -44,7 +42,6 @@ runScript(modelTesting);getErrorString();
// * candidate: volume.port.p(nominal = 1000000.0)
// * candidate: volume.medium.p(nominal = 100000.0)
// => select value from volume.medium.p(nominal = 100000.0) for variable: volume.medium.p
//
// "true
// "
// ""
Expand Down
9 changes: 3 additions & 6 deletions .../libraries/msl32_cpp/Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_ph.mos
View file
Expand Up @@ -8,7 +8,7 @@

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

modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
modelName := $TypeName(Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_ph);
compareVars :=
{
Expand All @@ -24,15 +24,13 @@ runScript(modelTesting);getErrorString();
// "true
// "
// ""
// OpenModelicaModelTesting.Kind.VerifiedSimulation
// OpenModelicaModelTesting.Kind.Compilation
// Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_ph
// {"volume.U","volume.m"}
// "OpenModelicaModelTesting.SimulationRuntime.Cpp
// "
// ""
// Simulation options: startTime = 0.0, stopTime = 1.01, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_ph', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
// Result file: Modelica.Media.Examples.Tests.MediaTestModels.Water.WaterIF97_ph_res.mat
// Files Equal!
// Compilation succeeded
// Warning: Alias set with different nominal values
// * candidate: volume.medium.sat.psat(nominal = 1000000.0)
// * candidate: volume.medium.state.p(nominal = 1000000.0)
Expand All @@ -44,7 +42,6 @@ runScript(modelTesting);getErrorString();
// * candidate: volume.port.p(nominal = 1000000.0)
// * candidate: volume.medium.p(nominal = 100000.0)
// => select value from volume.medium.p(nominal = 100000.0) for variable: volume.medium.p
//
// "true
// "
// ""
Expand Down

0 comments on commit 0754291

Please sign in to comment.