Skip to content

Commit

Permalink
Added Modelica_Synchronous test cases
Browse files Browse the repository at this point in the history
Added test cases for the elementary clock signal tests after
changing the Modelica_Synchronous library.
  • Loading branch information
bernhard-thiele committed May 30, 2016
1 parent c44afbc commit 5ad2b53
Show file tree
Hide file tree
Showing 7 changed files with 95 additions and 1 deletion.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 5 additions & 1 deletion simulation/libraries/3rdParty/Modelica_Synchronous/Makefile
Expand Up @@ -7,6 +7,7 @@ Modelica_Synchronous.Examples.SimpleControlledDrive.Continuous.mos \
Modelica_Synchronous.Examples.SimpleControlledDrive.ClockedWithDiscreteTextbookController.mos \
Modelica_Synchronous.Examples.SimpleControlledDrive.ClockedWithDiscreteController.mos \
Modelica_Synchronous.Examples.CascadeControlledDrive.Continuous.mos \
Modelica_Synchronous.Examples.Elementary.ClockSignals.ShiftSample.mos \
Modelica_Synchronous.Examples.Elementary.RealSignals.TimeBasedStep.mos \
Modelica_Synchronous.Examples.Elementary.RealSignals.TickBasedStep.mos \
Modelica_Synchronous.Examples.Elementary.RealSignals.TimeBasedSine.mos \
Expand All @@ -15,6 +16,7 @@ Modelica_Synchronous.Examples.Elementary.RealSignals.TickBasedRamp.mos \
Modelica_Synchronous.Examples.Elementary.BooleanSignals.TimeBasedStep.mos \
Modelica_Synchronous.Examples.Elementary.BooleanSignals.TickBasedStep.mos \


# test that currently fail. Move up when fixed.
# Run make testfailing
FAILINGTESTFILES= \
Expand All @@ -26,7 +28,8 @@ Modelica_Synchronous.Examples.CascadeControlledDrive.SuperSampled.mos \
Modelica_Synchronous.Examples.CascadeControlledDrive.AbsoluteClocks.mos \
Modelica_Synchronous.Examples.Systems.ControlledMixingUnit.mos \
Modelica_Synchronous.Examples.Systems.EngineThrottleControl.mos \
Modelica_Synchronous.Examples.Elementary.IntegerSignals.TimeBasedStep.mos \
Modelica_Synchronous.Examples.Elementary.ClockSignals.SubSample.mos \
Modelica_Synchronous.Examples.Elementary.ClockSignals.SuperSample.mos \
Modelica_Synchronous.Examples.Elementary.RealSignals.Sample1.mos \
Modelica_Synchronous.Examples.Elementary.RealSignals.Sample2.mos \
Modelica_Synchronous.Examples.Elementary.RealSignals.Sample3.mos \
Expand Down Expand Up @@ -61,6 +64,7 @@ Modelica_Synchronous.Examples.Elementary.IntegerSignals.BackSample.mos \
Modelica_Synchronous.Examples.Elementary.IntegerSignals.AssignClock.mos \
Modelica_Synchronous.Examples.Elementary.IntegerSignals.AssignClockVectorized.mos \
Modelica_Synchronous.Examples.Elementary.IntegerSignals.UpSample.mos \
Modelica_Synchronous.Examples.Elementary.IntegerSignals.TimeBasedStep.mos \
Modelica_Synchronous.Examples.Elementary.IntegerSignals.TickBasedStep.mos \
Modelica_Synchronous.Examples.Elementary.BooleanSignals.Sample1.mos \
Modelica_Synchronous.Examples.Elementary.BooleanSignals.Sample2.mos \
Expand Down
@@ -0,0 +1,30 @@
// name: Modelica_Synchronous.Examples.Elementary.ClockSignals.ShiftSample
// keywords: simulation Modelica_Synchronous examples
// status: correct
//
// Simulation Results
// Modelica_Synchronous
//

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

echo(false);
modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelName := $TypeName(Modelica_Synchronous.Examples.Elementary.ClockSignals.ShiftSample);
compareVars := {"sample1.y"};

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

runScript(modelTesting);getErrorString();

// Result:
// "true
// "
// ""
// Simulation options: startTime = 0.0, stopTime = 0.09, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica_Synchronous.Examples.Elementary.ClockSignals.ShiftSample', options = '', outputFormat = 'mat', variableFilter = 'time|sample1.y', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica_Synchronous.Examples.Elementary.ClockSignals.ShiftSample_res.mat
// Files Equal!
// "true
// "
// ""
// endResult
@@ -0,0 +1,30 @@
// name: Modelica_Synchronous.Examples.Elementary.ClockSignals.SubSample
// keywords: simulation Modelica_Synchronous examples
// status: correct
//
// Simulation Results
// Modelica_Synchronous
//

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

echo(false);
modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelName := $TypeName(Modelica_Synchronous.Examples.Elementary.ClockSignals.SubSample);
compareVars := {"sample1.y"};

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

runScript(modelTesting);getErrorString();

// Result:
// "true
// "
// ""
// Simulation options: startTime = 0.0, stopTime = 0.09, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica_Synchronous.Examples.Elementary.ClockSignals.SubSample', options = '', outputFormat = 'mat', variableFilter = 'time|sample1.y', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica_Synchronous.Examples.Elementary.ClockSignals.SubSample_res.mat
// Files Equal!
// "true
// "
// ""
// endResult
@@ -0,0 +1,30 @@
// name: Modelica_Synchronous.Examples.Elementary.ClockSignals.SuperSample
// keywords: simulation Modelica_Synchronous examples
// status: correct
//
// Simulation Results
// Modelica_Synchronous
//

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

echo(false);
modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
modelName := $TypeName(Modelica_Synchronous.Examples.Elementary.ClockSignals.SuperSample);
compareVars := {"sample1.y"};

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

runScript(modelTesting);getErrorString();

// Result:
// "true
// "
// ""
// Simulation options: startTime = 0.0, stopTime = 0.09, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica_Synchronous.Examples.Elementary.ClockSignals.SuperSample', options = '', outputFormat = 'mat', variableFilter = 'time|sample1.y', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica_Synchronous.Examples.Elementary.ClockSignals.SuperSample_res.mat
// Files Equal!
// "true
// "
// ""
// endResult

0 comments on commit 5ad2b53

Please sign in to comment.