Skip to content

Commit

Permalink
update tests after library bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrpo
adrpo committed Sep 29, 2015
1 parent b1c6557 commit d438645
Show file tree
Hide file tree
Showing 39 changed files with 198 additions and 198 deletions.
4 changes: 2 additions & 2 deletions simulation/libraries/3rdParty/Exercises/ServoSystem1.Aufgabe3_2.mos
View file
Expand Up @@ -19,7 +19,7 @@ simulate(ServoSystem1.Aufgabe3_2); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem1.Aufgabe3_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// endResult
4 changes: 2 additions & 2 deletions simulation/libraries/3rdParty/Exercises/ServoSystem1.Aufgabe3_3.mos
View file
Expand Up @@ -19,7 +19,7 @@ simulate(ServoSystem1.Aufgabe3_3); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem1.Aufgabe3_3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// endResult
4 changes: 2 additions & 2 deletions simulation/libraries/3rdParty/Exercises/ServoSystem3.Aufgabe3_2.mos
View file
Expand Up @@ -18,7 +18,7 @@ simulate(ServoSystem3.Aufgabe3_2); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe3_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// endResult
4 changes: 2 additions & 2 deletions simulation/libraries/3rdParty/Exercises/ServoSystem3.Aufgabe3_3.mos
View file
Expand Up @@ -18,7 +18,7 @@ simulate(ServoSystem3.Aufgabe3_3); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe3_3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo1.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo1.motor.DCPM.Jr) as default value.
// [Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo2.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo2.motor.DCPM.Jr) as default value.
// "
// endResult
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/Exercises/ServoSystem3.Aufgabe4_1.mos
View file
Expand Up @@ -18,6 +18,6 @@ simulate(ServoSystem3.Aufgabe4_1); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 4.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// endResult
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/Exercises/ServoSystem3.Aufgabe4_2.mos
View file
Expand Up @@ -18,6 +18,6 @@ simulate(ServoSystem3.Aufgabe4_2); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// endResult
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/Exercises/ServoSystem3.Aufgabe4_3a.mos
View file
Expand Up @@ -18,6 +18,6 @@ simulate(ServoSystem3.Aufgabe4_3a); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_3a', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// endResult
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/Exercises/ServoSystem3.Aufgabe4_3b.mos
View file
Expand Up @@ -18,6 +18,6 @@ simulate(ServoSystem3.Aufgabe4_3b); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_3b', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// endResult
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/Exercises/ServoSystem3.Aufgabe4_4a.mos
View file
Expand Up @@ -18,6 +18,6 @@ simulate(ServoSystem3.Aufgabe4_4a); getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 4.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ServoSystem3.Aufgabe4_4a', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// "[Modelica 3.2.1/Electrical/Machines.mo:12806:7-12807:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "[Modelica 3.2.1/Electrical/Machines.mo:12803:7-12804:76:writable] Warning: Parameter servo.motor.DCPM.Js has no value, and is fixed during initialization (fixed=true), using available start value (start=servo.motor.DCPM.Jr) as default value.
// "
// endResult
8 changes: 4 additions & 4 deletions ...es/msl32/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_DOL.mos
View file
Expand Up @@ -33,11 +33,11 @@ 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: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: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.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: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.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: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.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
8 changes: 4 additions & 4 deletions ...2/Modelica.Electrical.Machines.Examples.AsynchronousInductionMachines.AIMC_Initialize.mos
View file
Expand Up @@ -33,11 +33,11 @@ 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: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: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.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: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.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: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.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 d438645

Please sign in to comment.