Skip to content

Commit

Permalink
Updated tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@perost
perost committed Oct 19, 2015
1 parent 29d30bf commit 863971a
Show file tree
Hide file tree
Showing 41 changed files with 6 additions and 508 deletions.
8 changes: 1 addition & 7 deletions flattening/modelica/records/RecordModifications2.mo
View file
Expand Up @@ -45,22 +45,16 @@ end RecordModifications2;
// output FrictionParameters res;
// end FrictionParameters;
//
// function FrictionParameters$dcpm2$frictionParameters "Automatically generated record constructor for FrictionParameters$dcpm2$frictionParameters"
// input Real PRef = 0.0;
// input Real wRef;
// output FrictionParameters$dcpm2$frictionParameters res;
// end FrictionParameters$dcpm2$frictionParameters;
//
// function FrictionParameters$frictionParameters "Automatically generated record constructor for FrictionParameters$frictionParameters"
// input Real PRef = 0.0;
// input Real wRef;
// output FrictionParameters$frictionParameters res;
// end FrictionParameters$frictionParameters;
//
// class RecordModifications2
// parameter Real dcpm2.wNominal = wNominal;
// parameter Real dcpm2.frictionParameters.PRef = frictionParameters.PRef;
// parameter Real dcpm2.frictionParameters.wRef = frictionParameters.wRef;
// parameter Real dcpm2.wNominal = wNominal;
// Real dcpm2.friction.tau;
// parameter Real dcpm2.friction.frictionParameters.PRef = dcpm2.frictionParameters.PRef;
// parameter Real dcpm2.friction.frictionParameters.wRef = dcpm2.frictionParameters.wRef;
Expand Down
7 changes: 0 additions & 7 deletions ...es/msl32/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_DOL.mos
View file
Expand Up @@ -33,13 +33,6 @@ runScript(modelTesting);getErrorString();
// 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 = 'time|aimc.idq_rr.1.|aimc.idq_rr.2.|aimc.lssigma.i_.1.|aimc.lssigma.i_.2.|aimc.lszero.i|loadInertia.phi|loadInertia.w', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_DOL_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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:12940:7-12945:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
//
// "true
// "
// ""
Expand Down
7 changes: 0 additions & 7 deletions ...2/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Initialize.mos
View file
Expand Up @@ -33,13 +33,6 @@ runScript(modelTesting);getErrorString();
// 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 = 'time|aimc.idq_rr.1.|aimc.idq_rr.2.|aimc.lssigma.i_.1.|aimc.lssigma.i_.2.|aimc.lszero.i|loadInertia.phi|loadInertia.w', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Initialize_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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:12940:7-12945:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
//
// "true
// "
// ""
Expand Down
7 changes: 0 additions & 7 deletions ...l32/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Inverter.mos
View file
Expand Up @@ -33,13 +33,6 @@ runScript(modelTesting);getErrorString();
// Simulation options: startTime = 0.0, stopTime = 1.5, numberOfIntervals = 1500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Inverter', options = '', outputFormat = 'mat', variableFilter = 'time|aimc.i_0_s|aimc.idq_rr.1.|aimc.idq_rr.2.|aimc.lssigma.i_.1.|vfController.x|loadInertia.phi|loadInertia.w', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Inverter_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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:12940:7-12945:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
//
// "true
// "
// ""
Expand Down
7 changes: 0 additions & 7 deletions ...32/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Steinmetz.mos
View file
Expand Up @@ -35,13 +35,6 @@ runScript(modelTesting);getErrorString();
// Simulation options: startTime = 0.0, stopTime = 1.5, numberOfIntervals = 1500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Steinmetz', options = '', outputFormat = 'mat', variableFilter = 'time|aimc.i_0_s|aimc.idq_rr.1.|aimc.idq_rr.2.|aimc.idq_sr.1.|aimc.idq_sr.2.|cRun.v|cStart.v|loadInertia.phi|loadInertia.w', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Steinmetz_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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:12940:7-12945:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
//
// "true
// "
// ""
Expand Down
7 changes: 0 additions & 7 deletions .../Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer.mos
View file
Expand Up @@ -37,13 +37,6 @@ runScript(modelTesting);getErrorString();
// 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 = 'time|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', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Transformer_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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:12940:7-12945:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
//
// "true
// "
// ""
Expand Down
7 changes: 0 additions & 7 deletions ...ies/msl32/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_YD.mos
View file
Expand Up @@ -34,13 +34,6 @@ runScript(modelTesting);getErrorString();
// Simulation options: startTime = 0.0, stopTime = 2.5, numberOfIntervals = 2500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_YD', options = '', outputFormat = 'mat', variableFilter = 'time|aimc.idq_rr.1.|aimc.idq_rr.2.|aimc.lssigma.i_.1.|aimc.lssigma.i_.2.|aimc.lszero.i|loadInertia.phi|loadInertia.w', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_YD_res.mat
// Files Equal!
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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:12940:7-12945:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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 DAE.PROP(Integer, C_CONST), value: 100 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)100 DAE.PROP(Integer, C_CONST), value: 100 on component IRef.
//
// "true
// "
// ""
Expand Down
11 changes: 0 additions & 11 deletions ...2/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_withLosses.mos
View file
Expand Up @@ -33,17 +33,6 @@ runScript(modelTesting);getErrorString();
// {"PI.x","aimc.i_0_s","aimc.idq_sr[1]","aimc.idq_sr[2]","aimc.idq_rr[1]","aimc.idq_rr[2]","loadInertia.phi","loadInertia.w"}
// Simulation options: startTime = 0.0, stopTime = 5.0, numberOfIntervals = 5000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_withLosses', options = '', outputFormat = 'mat', variableFilter = 'time|PI.x|aimc.i_0_s|aimc.idq_sr.1.|aimc.idq_sr.2.|aimc.idq_rr.1.|aimc.idq_rr.2.|loadInertia.phi|loadInertia.w', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
// Result file: Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_withLosses_res.mat
// [Modelica 3.2.1/Electrical/Machines.mo:12808:7-12809:75:writable] Error: Variable aimc.frictionParameters: Duplicate modification of element = (typed)6.283185307179586 * aimc.fsNominal / /*Real*/(aimc.p) DAE.PROP(Real, C_PARAM), value: 157.0796326794897 and = (typed)153.1526418625024 DAE.PROP(Real, C_CONST), value: 153.1526418625024 on component wRef.
// Error: Duplicate modification of element = (typed)6.283185307179586 * aimc.fsNominal / /*Real*/(aimc.p) DAE.PROP(Real, C_PARAM), value: 157.0796326794897 and = (typed)153.1526418625024 DAE.PROP(Real, C_CONST), value: 153.1526418625024 on component wRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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:12940:7-12945:42:writable] Error: Variable aimc.statorCoreParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)387.9 DAE.PROP(Real, C_CONST), value: 387.9 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12940:7-12945: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)387.9 DAE.PROP(Real, C_CONST), value: 387.9 on component VRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)18.96595634287921 DAE.PROP(Real, C_CONST), value: 18.96595634287921 on component IRef.
// [Modelica 3.2.1/Electrical/Machines.mo:12946:7-12948:77:writable] Error: Variable aimc.strayLoadParameters: Duplicate modification of element = (typed)6.283185307179586 * aimc.fsNominal / /*Real*/(aimc.p) DAE.PROP(Real, C_PARAM), value: 157.0796326794897 and = (typed)153.1526418625024 DAE.PROP(Real, C_CONST), value: 153.1526418625024 on component wRef.
// Error: Duplicate modification of element {start = (typed)100 DAE.PROP(Integer, C_CONST), value: 100} and = (typed)18.96595634287921 DAE.PROP(Real, C_CONST), value: 18.96595634287921 on component IRef.
// Error: Duplicate modification of element = (typed)6.283185307179586 * aimc.fsNominal / /*Real*/(aimc.p) DAE.PROP(Real, C_PARAM), value: 157.0796326794897 and = (typed)153.1526418625024 DAE.PROP(Real, C_CONST), value: 153.1526418625024 on component wRef.
//
// "true
// "
// ""
Expand Down

0 comments on commit 863971a

Please sign in to comment.