From 2ea670455892d58fdfa3bf69d141890d2e76e712 Mon Sep 17 00:00:00 2001 From: Thomas Beutlich Date: Fri, 24 Jan 2025 16:30:48 +0100 Subject: [PATCH 1/2] Sync comparisonSignals.txt with MSL d2592ead8b --- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 2 +- .../ActuatorWithNoise/comparisonSignals.txt | 10 +- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 8 +- .../comparisonSignals.txt | 8 +- .../comparisonSignals.txt | 2 +- .../DemoPowerSupply/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 4 +- .../CompareLineTrunks/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 2 +- .../Lines/SmoothStep/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 12 +- .../comparisonSignals.txt | 12 +- .../SpeedControlledDCPM/comparisonSignals.txt | 16 +- .../DCPM_Drive/comparisonSignals.txt | 2 +- .../IMC_InverterDrive/comparisonSignals.txt | 17 +- .../SMPM_NoLoad/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 3 - .../comparisonSignals.txt | 16 +- .../comparisonSignals.txt | 8 +- .../comparisonSignals.txt | 2 +- .../HBridge_DC_Drive/comparisonSignals.txt | 10 +- .../HBridge/HBridge_R/comparisonSignals.txt | 4 +- .../HBridge/HBridge_RL/comparisonSignals.txt | 6 +- .../comparisonSignals.txt | 6 +- .../MultipleResonance/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 288 +++++++++--------- .../comparisonSignals.txt | 72 ++--- .../comparisonSignals.txt | 80 ++--- .../comparisonSignals.txt | 6 +- .../comparisonSignals.txt | 1 - .../comparisonSignals.txt | 14 +- .../PolyphaseInductance/comparisonSignals.txt | 2 +- .../IMC_Conveyor/comparisonSignals.txt | 2 +- .../IMC_Initialize/comparisonSignals.txt | 2 +- .../IMC_Inverter/comparisonSignals.txt | 2 +- .../IMC_Transformer/comparisonSignals.txt | 2 +- .../IMC_YD/comparisonSignals.txt | 2 +- .../SMEE_Generator/comparisonSignals.txt | 2 +- .../SMPM_FieldWeakening/comparisonSignals.txt | 2 +- .../BevelGear1D/comparisonSignals.txt | 2 +- .../RobotR3/OneAxis/comparisonSignals.txt | 2 - .../comparisonSignals.txt | 2 +- .../CoupledClutches/comparisonSignals.txt | 6 - .../EddyCurrentBrake/comparisonSignals.txt | 4 +- .../Examples/Friction/comparisonSignals.txt | 4 - .../Examples/HeatLosses/comparisonSignals.txt | 7 - .../LossyGearDemo2/comparisonSignals.txt | 2 - .../SimpleGearShift/comparisonSignals.txt | 4 - .../Examples/Brake/comparisonSignals.txt | 4 - .../CompareBrakingForce/comparisonSignals.txt | 2 +- .../EddyCurrentBrake/comparisonSignals.txt | 4 +- .../Examples/Friction/comparisonSignals.txt | 6 - .../Examples/HeatLosses/comparisonSignals.txt | 6 - .../Blocks/Mean/comparisonSignals.txt | 2 +- .../MultiSensorTest/comparisonSignals.txt | 2 +- .../FrequencySweep/comparisonSignals.txt | 6 +- .../FrequencySweep/comparisonSignals.txt | 6 +- .../SingularTransformer/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 4 +- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 106 +++---- .../comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 80 ++--- .../ReferenceMoistAir/comparisonSignals.txt | 4 - .../MoistAir/comparisonSignals.txt | 4 - .../R134a_setState_pTX/comparisonSignals.txt | 2 +- .../Air/DryAirNasa/comparisonSignals.txt | 2 +- .../Air/MoistAir/comparisonSignals.txt | 4 +- .../Air/SimpleAir/comparisonSignals.txt | 2 +- .../IdealGases/Air/comparisonSignals.txt | 2 +- .../IdealGases/Nitrogen/comparisonSignals.txt | 2 +- .../SimpleNaturalGas/comparisonSignals.txt | 4 +- .../comparisonSignals.txt | 2 +- .../Essotherm650/comparisonSignals.txt | 4 +- .../Glycol47/comparisonSignals.txt | 4 +- .../LinearColdWater/comparisonSignals.txt | 2 +- .../LinearWater_pT/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 4 +- .../Water/IdealSteam/comparisonSignals.txt | 2 +- .../comparisonSignals.txt | 2 +- .../Water/WaterIF97_pT/comparisonSignals.txt | 2 +- .../Water/WaterIF97_ph/comparisonSignals.txt | 2 +- .../EngineGasForce/comparisonSignals.txt | 1 - .../GearConstraint3/comparisonSignals.txt | 2 +- .../AbsoluteSensor/comparisonSignals.txt | 96 +++--- .../AllComponents/comparisonSignals.txt | 42 +-- .../SupportTorque1/comparisonSignals.txt | 2 - .../comparisonSignals.txt | 8 - .../TestBraking/comparisonSignals.txt | 2 +- .../TestFriction/comparisonSignals.txt | 7 - .../Test26/comparisonSignals.txt | 4 +- .../Test27/comparisonSignals.txt | 4 +- .../Test26/comparisonSignals.txt | 4 +- .../Test27/comparisonSignals.txt | 4 +- .../TestBraking/comparisonSignals.txt | 2 +- 101 files changed, 538 insertions(+), 608 deletions(-) diff --git a/Modelica/Blocks/Examples/DemoSignalCharacteristic/comparisonSignals.txt b/Modelica/Blocks/Examples/DemoSignalCharacteristic/comparisonSignals.txt index 996d54cdc..9e63fb1b0 100644 --- a/Modelica/Blocks/Examples/DemoSignalCharacteristic/comparisonSignals.txt +++ b/Modelica/Blocks/Examples/DemoSignalCharacteristic/comparisonSignals.txt @@ -3,4 +3,4 @@ mean.y rectifiedMean.y rootMeanSquare.y harmonic.mean1.y -harmonic.mean2.y \ No newline at end of file +harmonic.mean2.y diff --git a/Modelica/Blocks/Examples/DemonstrateContinuousSignalExtrema/comparisonSignals.txt b/Modelica/Blocks/Examples/DemonstrateContinuousSignalExtrema/comparisonSignals.txt index 025d03075..4d2186d7c 100644 --- a/Modelica/Blocks/Examples/DemonstrateContinuousSignalExtrema/comparisonSignals.txt +++ b/Modelica/Blocks/Examples/DemonstrateContinuousSignalExtrema/comparisonSignals.txt @@ -10,4 +10,4 @@ signalExtrema2.t_max signalExtrema3.y_min signalExtrema3.y_max signalExtrema3.t_min -signalExtrema3.t_max \ No newline at end of file +signalExtrema3.t_max diff --git a/Modelica/Blocks/Examples/DemonstrateSignalExtrema/comparisonSignals.txt b/Modelica/Blocks/Examples/DemonstrateSignalExtrema/comparisonSignals.txt index 9d487d136..576b90401 100644 --- a/Modelica/Blocks/Examples/DemonstrateSignalExtrema/comparisonSignals.txt +++ b/Modelica/Blocks/Examples/DemonstrateSignalExtrema/comparisonSignals.txt @@ -6,4 +6,4 @@ signalExtrema1.t_max signalExtrema2.y_min signalExtrema2.y_max signalExtrema2.t_min -signalExtrema2.t_max \ No newline at end of file +signalExtrema2.t_max diff --git a/Modelica/Blocks/Examples/Noise/ActuatorWithNoise/comparisonSignals.txt b/Modelica/Blocks/Examples/Noise/ActuatorWithNoise/comparisonSignals.txt index c9d4d2071..4acd2eb12 100644 --- a/Modelica/Blocks/Examples/Noise/ActuatorWithNoise/comparisonSignals.txt +++ b/Modelica/Blocks/Examples/Noise/ActuatorWithNoise/comparisonSignals.txt @@ -1,12 +1,12 @@ time -controller.speed_PI.x +controller.busdelay.y controller.positionToSpeed.x controller.position_PI.x -controller.busdelay.y +controller.speed_PI.x +elastoGap.s_rel +elastoGap.v_rel gearbox.phi_rel gearbox.w_rel -slewRateLimiter.y rodMass.s rodMass.v -elastoGap.s_rel -elastoGap.v_rel \ No newline at end of file +slewRateLimiter.y diff --git a/Modelica/Blocks/Examples/Noise/DrydenContinuousTurbulence/comparisonSignals.txt b/Modelica/Blocks/Examples/Noise/DrydenContinuousTurbulence/comparisonSignals.txt index 35aaeaed5..64071c143 100644 --- a/Modelica/Blocks/Examples/Noise/DrydenContinuousTurbulence/comparisonSignals.txt +++ b/Modelica/Blocks/Examples/Noise/DrydenContinuousTurbulence/comparisonSignals.txt @@ -1,3 +1,3 @@ time Hw.x_scaled[1] -Hw.x_scaled[2] \ No newline at end of file +Hw.x_scaled[2] diff --git a/Modelica/Blocks/Examples/Noise/NormalNoiseProperties/comparisonSignals.txt b/Modelica/Blocks/Examples/Noise/NormalNoiseProperties/comparisonSignals.txt index a9bb37313..c5bd5355e 100644 --- a/Modelica/Blocks/Examples/Noise/NormalNoiseProperties/comparisonSignals.txt +++ b/Modelica/Blocks/Examples/Noise/NormalNoiseProperties/comparisonSignals.txt @@ -1,8 +1,8 @@ time -meanError_y -sigmaError_y mean.y +standardDeviation.variance.mu +standardDeviation.variance.var variance.mu variance.var -standardDeviation.variance.mu -standardDeviation.variance.var \ No newline at end of file +meanError_y +sigmaError_y diff --git a/Modelica/Blocks/Examples/Noise/UniformNoiseProperties/comparisonSignals.txt b/Modelica/Blocks/Examples/Noise/UniformNoiseProperties/comparisonSignals.txt index a9bb37313..c5bd5355e 100644 --- a/Modelica/Blocks/Examples/Noise/UniformNoiseProperties/comparisonSignals.txt +++ b/Modelica/Blocks/Examples/Noise/UniformNoiseProperties/comparisonSignals.txt @@ -1,8 +1,8 @@ time -meanError_y -sigmaError_y mean.y +standardDeviation.variance.mu +standardDeviation.variance.var variance.mu variance.var -standardDeviation.variance.mu -standardDeviation.variance.var \ No newline at end of file +meanError_y +sigmaError_y diff --git a/Modelica/ComplexBlocks/Examples/ShowTransferFunction/comparisonSignals.txt b/Modelica/ComplexBlocks/Examples/ShowTransferFunction/comparisonSignals.txt index 169346f50..fee3be60f 100644 --- a/Modelica/ComplexBlocks/Examples/ShowTransferFunction/comparisonSignals.txt +++ b/Modelica/ComplexBlocks/Examples/ShowTransferFunction/comparisonSignals.txt @@ -3,4 +3,4 @@ logFrequencySweep.y const.y.re const.y.im transferFunction.y.re -transferFunction.y.im \ No newline at end of file +transferFunction.y.im diff --git a/Modelica/Electrical/Analog/Examples/DemoPowerSupply/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/DemoPowerSupply/comparisonSignals.txt index d32d90c15..f58b49e1a 100644 --- a/Modelica/Electrical/Analog/Examples/DemoPowerSupply/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/DemoPowerSupply/comparisonSignals.txt @@ -1,4 +1,4 @@ time dcPowerSupply.v dcPowerSupply.i -dcPowerSupply.P \ No newline at end of file +dcPowerSupply.P diff --git a/Modelica/Electrical/Analog/Examples/DemoPowerSupplyWithBuffer/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/DemoPowerSupplyWithBuffer/comparisonSignals.txt index dee44a023..11ed425cc 100644 --- a/Modelica/Electrical/Analog/Examples/DemoPowerSupplyWithBuffer/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/DemoPowerSupplyWithBuffer/comparisonSignals.txt @@ -2,4 +2,4 @@ time dcPowerSupply.v dcPowerSupply.i bufferCapacitor.v -bufferCapacitor.i \ No newline at end of file +bufferCapacitor.i diff --git a/Modelica/Electrical/Analog/Examples/DemonstrateLightning/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/DemonstrateLightning/comparisonSignals.txt index 4f7e2e574..b265898af 100644 --- a/Modelica/Electrical/Analog/Examples/DemonstrateLightning/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/DemonstrateLightning/comparisonSignals.txt @@ -1,7 +1,7 @@ time currentSensor1.i -currentSensor2.i integrator1.y der1.y +currentSensor2.i integrator2.y -der2.y \ No newline at end of file +der2.y diff --git a/Modelica/Electrical/Analog/Examples/Lines/CompareLineTrunks/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/Lines/CompareLineTrunks/comparisonSignals.txt index 4297382f3..b26a4b08f 100644 --- a/Modelica/Electrical/Analog/Examples/Lines/CompareLineTrunks/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/Lines/CompareLineTrunks/comparisonSignals.txt @@ -7,4 +7,4 @@ oLine4.p2.v tLine1.p2.v tLine2.p2.v tLine3.p2.v -tLine4.p2.v \ No newline at end of file +tLine4.p2.v diff --git a/Modelica/Electrical/Analog/Examples/Lines/CompareLosslessLines/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/Lines/CompareLosslessLines/comparisonSignals.txt index fe1c7af1c..41e46d288 100644 --- a/Modelica/Electrical/Analog/Examples/Lines/CompareLosslessLines/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/Lines/CompareLosslessLines/comparisonSignals.txt @@ -10,4 +10,4 @@ line2.i2 line3.v1 line3.v2 line3.i1 -line3.i2 \ No newline at end of file +line3.i2 diff --git a/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine/comparisonSignals.txt index df89b16cf..45a3108f5 100644 --- a/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine/comparisonSignals.txt @@ -1,4 +1,4 @@ time source.i load.v -load.i \ No newline at end of file +load.i diff --git a/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine/comparisonSignals.txt index 1db10822d..18f2896bc 100644 --- a/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine/comparisonSignals.txt @@ -1,4 +1,4 @@ time source.i load.i -lightningImpulseCurrent.v \ No newline at end of file +lightningImpulseCurrent.v diff --git a/Modelica/Electrical/Analog/Examples/Lines/SmoothStep/comparisonSignals.txt b/Modelica/Electrical/Analog/Examples/Lines/SmoothStep/comparisonSignals.txt index f1395eeb5..0d87367f5 100644 --- a/Modelica/Electrical/Analog/Examples/Lines/SmoothStep/comparisonSignals.txt +++ b/Modelica/Electrical/Analog/Examples/Lines/SmoothStep/comparisonSignals.txt @@ -2,4 +2,4 @@ time R1.v R5.v R50.v -Rdistr.v \ No newline at end of file +Rdistr.v diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM/comparisonSignals.txt b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM/comparisonSignals.txt index f73668543..10bf94e2a 100644 --- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM/comparisonSignals.txt +++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM/comparisonSignals.txt @@ -1,11 +1,11 @@ time -loadInertia.phi -loadInertia.w -dcpm.la.i -armatureInverter.vDCFilter.y +armatureInverter.iDCFilter.y armatureInverter.iMotFilter.y armatureInverter.idealDcDc.deadTime.y armatureInverter.idealDcDc.powerController.y +armatureInverter.vDCFilter.y armatureInverter.vMotFilter.y -armatureInverter.iDCFilter.y -currentController.integrator.y \ No newline at end of file +currentController.integrator.y +dcpm.la.i +loadInertia.phi +loadInertia.w diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM/comparisonSignals.txt b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM/comparisonSignals.txt index 313cbc666..252d13e0f 100644 --- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM/comparisonSignals.txt +++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM/comparisonSignals.txt @@ -1,12 +1,12 @@ time -loadInertia.phi -loadInertia.w -dcpm.la.i -armatureInverter.vDCFilter.y +armatureInverter.iDCFilter.y armatureInverter.iMotFilter.y armatureInverter.idealDcDc.deadTime.y armatureInverter.idealDcDc.powerController.y +armatureInverter.vDCFilter.y armatureInverter.vMotFilter.y -armatureInverter.iDCFilter.y currentController.integrator.y -speedController.integrator.y \ No newline at end of file +dcpm.la.i +loadInertia.phi +loadInertia.w +speedController.integrator.y diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM/comparisonSignals.txt b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM/comparisonSignals.txt index 94e111c41..01edf6d18 100644 --- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM/comparisonSignals.txt +++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM/comparisonSignals.txt @@ -1,14 +1,14 @@ time -loadInertia.phi -loadInertia.w -dcpm.la.i -armatureInverter.vDCFilter.y -armatureInverter.iMotFilter.y +armatureInverter.iDCFilter.y armatureInverter.idealDcDc.deadTime.y armatureInverter.idealDcDc.powerController.y +armatureInverter.iMotFilter.y +armatureInverter.vDCFilter.y armatureInverter.vMotFilter.y -armatureInverter.iDCFilter.y currentController.integrator.y -speedController.integrator.y +dcpm.la.i +loadInertia.phi +loadInertia.w preFilter.y -slewRateLimiter.y \ No newline at end of file +slewRateLimiter.y +speedController.integrator.y diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive/comparisonSignals.txt b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive/comparisonSignals.txt index c679aee97..ca212abcf 100644 --- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive/comparisonSignals.txt +++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive/comparisonSignals.txt @@ -1,5 +1,5 @@ time coupling.w coupling.tau +multiSensor.v multiSensor.i -multiSensor.v \ No newline at end of file diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive/comparisonSignals.txt b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive/comparisonSignals.txt index 78c380350..492a4b50b 100644 --- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive/comparisonSignals.txt +++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive/comparisonSignals.txt @@ -1,13 +1,14 @@ time -inductor.inductor[2].i -inductor.inductor[3].i -capacitor.v -aimc.is[1] -aimc.is[2] -aimc.idq_sr[1] -aimc.idq_sr[2] +// aimc.i_0_s aimc.idq_rr[1] aimc.idq_rr[2] +aimc.idq_sr[1] +aimc.idq_sr[2] +aimc.is[1] +aimc.is[2] +capacitor.v +inductor.inductor[2].i +inductor.inductor[3].i loadInertia.phi loadInertia.w -vfController.x \ No newline at end of file +vfController.x diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad/comparisonSignals.txt b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad/comparisonSignals.txt index 25fd98281..976ce7eb6 100644 --- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad/comparisonSignals.txt +++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad/comparisonSignals.txt @@ -1,4 +1,4 @@ time toPolar.y[1] toPolar.y[2] -hallSensor.y \ No newline at end of file +hallSensor.y diff --git a/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_RL/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_RL/comparisonSignals.txt index ddaca1460..bd3499ce1 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_RL/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_RL/comparisonSignals.txt @@ -43,6 +43,3 @@ inverter.ac.pin[6].i currentSensor.i[1] currentSensor.i[2] currentSensor.i[3] -voltageSensor.v[1] -voltageSensor.v[2] -voltageSensor.v[3] diff --git a/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/ThreePhaseTwoLevel_PWM/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/ThreePhaseTwoLevel_PWM/comparisonSignals.txt index 411010028..c861ff8fe 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/ThreePhaseTwoLevel_PWM/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/ThreePhaseTwoLevel_PWM/comparisonSignals.txt @@ -1,15 +1,15 @@ time -potentialSensor.phi[1] -potentialSensor.phi[2] -potentialSensor.phi[3] +filter[1].x[1] +filter[1].x[2] +filter[2].x[1] +filter[2].x[2] harmonic.mean1.x harmonic.mean2.x harmonic.y_rms harmonic.y_arg integrator.y -filter[1].x[1] -filter[1].x[2] -filter[2].x[1] -filter[2].x[2] +potentialSensor.phi[1] +potentialSensor.phi[2] +potentialSensor.phi[3] toPolar.y[1] -toPolar.y[2] \ No newline at end of file +toPolar.y[2] diff --git a/Modelica/Electrical/PowerConverters/Examples/DCAC/SinglePhaseTwoLevel/SinglePhaseTwoLevel_R/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCAC/SinglePhaseTwoLevel/SinglePhaseTwoLevel_R/comparisonSignals.txt index 82eb30538..f7bb4b4d4 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCAC/SinglePhaseTwoLevel/SinglePhaseTwoLevel_R/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCAC/SinglePhaseTwoLevel/SinglePhaseTwoLevel_R/comparisonSignals.txt @@ -1,7 +1,7 @@ time -inverter.ac.v -inverter.ac.i +fundamentalWaveCurrent.mean1.y +fundamentalWaveCurrent.mean2.y fundamentalWaveVoltage.mean1.y fundamentalWaveVoltage.mean2.y -fundamentalWaveCurrent.mean1.y -fundamentalWaveCurrent.mean2.y \ No newline at end of file +inverter.ac.v +inverter.ac.i diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperBuckBoost/ChopperBuckBoost_DutyCycle/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperBuckBoost/ChopperBuckBoost_DutyCycle/comparisonSignals.txt index 6bbabb566..207d3d15c 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperBuckBoost/ChopperBuckBoost_DutyCycle/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperBuckBoost/ChopperBuckBoost_DutyCycle/comparisonSignals.txt @@ -2,4 +2,4 @@ time vLV.y iLV.y vHV.y -iHV.y \ No newline at end of file +iHV.y diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_DC_Drive/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_DC_Drive/comparisonSignals.txt index 3089acbb1..988b6ccff 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_DC_Drive/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_DC_Drive/comparisonSignals.txt @@ -1,10 +1,10 @@ time +dcpm.inertiaRotor.phi +dcpm.inertiaRotor.w +inductor.i +meanCurrent.y +meanVoltage.y hbridge.vDC1 hbridge.iDC1 hbridge.vDC2 hbridge.iDC2 -meanCurrent.y -meanVoltage.y -dcpm.inertiaRotor.phi -dcpm.inertiaRotor.w -inductor.i \ No newline at end of file diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_R/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_R/comparisonSignals.txt index 9e7cb1e3e..a3539e73b 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_R/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_R/comparisonSignals.txt @@ -1,7 +1,7 @@ time +meanCurrent.y +meanVoltage.y hbridge.vDC1 hbridge.iDC1 hbridge.vDC2 hbridge.iDC2 -meanCurrent.y -meanVoltage.y \ No newline at end of file diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_RL/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_RL/comparisonSignals.txt index 51d7c8bbd..601c33b8d 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_RL/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_RL/comparisonSignals.txt @@ -1,8 +1,8 @@ time +inductor.i +meanCurrent.y +meanVoltage.y hbridge.vDC1 hbridge.iDC1 hbridge.vDC2 hbridge.iDC2 -meanCurrent.y -meanVoltage.y -inductor.i \ No newline at end of file diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL/comparisonSignals.txt b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL/comparisonSignals.txt index 51d7c8bbd..601c33b8d 100644 --- a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL/comparisonSignals.txt +++ b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL/comparisonSignals.txt @@ -1,8 +1,8 @@ time +inductor.i +meanCurrent.y +meanVoltage.y hbridge.vDC1 hbridge.iDC1 hbridge.vDC2 hbridge.iDC2 -meanCurrent.y -meanVoltage.y -inductor.i \ No newline at end of file diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/MultipleResonance/comparisonSignals.txt b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/MultipleResonance/comparisonSignals.txt index a8a49678c..2f09eb7c5 100644 --- a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/MultipleResonance/comparisonSignals.txt +++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/MultipleResonance/comparisonSignals.txt @@ -2,4 +2,4 @@ time transformer.pin_n1.reference.gamma transformer.pin_n2.reference.gamma currentSensor.abs_i -currentSensor.arg_i \ No newline at end of file +currentSensor.arg_i diff --git a/Modelica/Electrical/Spice3/Examples/Spice3BenchmarkFourBitBinaryAdder/comparisonSignals.txt b/Modelica/Electrical/Spice3/Examples/Spice3BenchmarkFourBitBinaryAdder/comparisonSignals.txt index fd2e67348..87d0ca6b7 100644 --- a/Modelica/Electrical/Spice3/Examples/Spice3BenchmarkFourBitBinaryAdder/comparisonSignals.txt +++ b/Modelica/Electrical/Spice3/Examples/Spice3BenchmarkFourBitBinaryAdder/comparisonSignals.txt @@ -1,325 +1,325 @@ time X1.X1.X1.X1.Q1.vbe -X1.X1.X1.X1.Q2.vbe X1.X1.X1.X1.Q2.vbc -X1.X1.X1.X1.Q3.vbe +X1.X1.X1.X1.Q2.vbe X1.X1.X1.X1.Q3.vbc -X1.X1.X1.X1.Q4.vbe +X1.X1.X1.X1.Q3.vbe X1.X1.X1.X1.Q4.vbc -X1.X1.X1.X1.Q5.vbe +X1.X1.X1.X1.Q4.vbe X1.X1.X1.X1.Q5.vbc -X1.X1.X1.X2.Q1.vbe +X1.X1.X1.X1.Q5.vbe X1.X1.X1.X2.Q1.vbc +X1.X1.X1.X2.Q1.vbe X1.X1.X1.X2.Q2.vbe -X1.X1.X1.X2.Q3.vbe X1.X1.X1.X2.Q3.vbc -X1.X1.X1.X2.Q4.vbe +X1.X1.X1.X2.Q3.vbe X1.X1.X1.X2.Q4.vbc -X1.X1.X1.X2.Q5.vbe +X1.X1.X1.X2.Q4.vbe X1.X1.X1.X2.Q5.vbc -X1.X1.X1.X3.Q1.vbe +X1.X1.X1.X2.Q5.vbe X1.X1.X1.X3.Q1.vbc +X1.X1.X1.X3.Q1.vbe X1.X1.X1.X3.Q2.vbe -X1.X1.X1.X3.Q3.vbe X1.X1.X1.X3.Q3.vbc -X1.X1.X1.X3.Q4.vbe +X1.X1.X1.X3.Q3.vbe X1.X1.X1.X3.Q4.vbc +X1.X1.X1.X3.Q4.vbe X1.X1.X1.X3.Q5.vbe -X1.X1.X1.X4.Q1.vbe X1.X1.X1.X4.Q1.vbc -X1.X1.X1.X4.Q2.vbe +X1.X1.X1.X4.Q1.vbe X1.X1.X1.X4.Q2.vbc -X1.X1.X1.X4.Q3.vbe +X1.X1.X1.X4.Q2.vbe X1.X1.X1.X4.Q3.vbc -X1.X1.X1.X4.Q4.vbe +X1.X1.X1.X4.Q3.vbe X1.X1.X1.X4.Q4.vbc +X1.X1.X1.X4.Q4.vbe X1.X1.X1.X4.Q5.vbe X1.X1.X1.X5.Q1.vbe -X1.X1.X1.X5.Q2.vbe X1.X1.X1.X5.Q2.vbc -X1.X1.X1.X5.Q3.vbe +X1.X1.X1.X5.Q2.vbe X1.X1.X1.X5.Q3.vbc -X1.X1.X1.X5.Q4.vbe +X1.X1.X1.X5.Q3.vbe X1.X1.X1.X5.Q4.vbc +X1.X1.X1.X5.Q4.vbe X1.X1.X1.X5.Q5.vbe -X1.X1.X1.X6.Q1.vbe X1.X1.X1.X6.Q1.vbc -X1.X1.X1.X6.Q2.vbe +X1.X1.X1.X6.Q1.vbe X1.X1.X1.X6.Q2.vbc -X1.X1.X1.X6.Q3.vbe +X1.X1.X1.X6.Q2.vbe X1.X1.X1.X6.Q3.vbc -X1.X1.X1.X6.Q4.vbe +X1.X1.X1.X6.Q3.vbe X1.X1.X1.X6.Q4.vbc -X1.X1.X1.X6.Q5.vbe +X1.X1.X1.X6.Q4.vbe X1.X1.X1.X6.Q5.vbc -X1.X1.X1.X7.Q1.vbe +X1.X1.X1.X6.Q5.vbe X1.X1.X1.X7.Q1.vbc -X1.X1.X1.X7.Q2.vbe +X1.X1.X1.X7.Q1.vbe X1.X1.X1.X7.Q2.vbc -X1.X1.X1.X7.Q3.vbe +X1.X1.X1.X7.Q2.vbe X1.X1.X1.X7.Q3.vbc -X1.X1.X1.X7.Q4.vbe +X1.X1.X1.X7.Q3.vbe X1.X1.X1.X7.Q4.vbc +X1.X1.X1.X7.Q4.vbe X1.X1.X1.X7.Q5.vbe -X1.X1.X1.X8.Q1.vbe X1.X1.X1.X8.Q1.vbc -X1.X1.X1.X8.Q2.vbe +X1.X1.X1.X8.Q1.vbe X1.X1.X1.X8.Q2.vbc -X1.X1.X1.X8.Q3.vbe +X1.X1.X1.X8.Q2.vbe X1.X1.X1.X8.Q3.vbc -X1.X1.X1.X8.Q4.vbe +X1.X1.X1.X8.Q3.vbe X1.X1.X1.X8.Q4.vbc -X1.X1.X1.X8.Q5.vbe +X1.X1.X1.X8.Q4.vbe X1.X1.X1.X8.Q5.vbc +X1.X1.X1.X8.Q5.vbe X1.X1.X1.X9.Q1.vbe -X1.X1.X1.X9.Q2.vbe X1.X1.X1.X9.Q2.vbc -X1.X1.X1.X9.Q3.vbe +X1.X1.X1.X9.Q2.vbe X1.X1.X1.X9.Q3.vbc -X1.X1.X1.X9.Q4.vbe +X1.X1.X1.X9.Q3.vbe X1.X1.X1.X9.Q4.vbc -X1.X1.X1.X9.Q5.vbe +X1.X1.X1.X9.Q4.vbe X1.X1.X1.X9.Q5.vbc -X1.X1.X2.X1.Q1.vbe +X1.X1.X1.X9.Q5.vbe X1.X1.X2.X1.Q1.vbc +X1.X1.X2.X1.Q1.vbe X1.X1.X2.X1.Q2.vbe -X1.X1.X2.X1.Q3.vbe X1.X1.X2.X1.Q3.vbc -X1.X1.X2.X1.Q4.vbe +X1.X1.X2.X1.Q3.vbe X1.X1.X2.X1.Q4.vbc +X1.X1.X2.X1.Q4.vbe X1.X1.X2.X1.Q5.vbc X1.X1.X2.X2.Q1.vbe -X1.X1.X2.X2.Q2.vbe X1.X1.X2.X2.Q2.vbc -X1.X1.X2.X2.Q3.vbe +X1.X1.X2.X2.Q2.vbe X1.X1.X2.X2.Q3.vbc -X1.X1.X2.X2.Q4.vbe +X1.X1.X2.X2.Q3.vbe X1.X1.X2.X2.Q4.vbc -X1.X1.X2.X2.Q5.vbe +X1.X1.X2.X2.Q4.vbe X1.X1.X2.X2.Q5.vbc -X1.X1.X2.X3.Q1.vbe +X1.X1.X2.X2.Q5.vbe X1.X1.X2.X3.Q1.vbc +X1.X1.X2.X3.Q1.vbe X1.X1.X2.X3.Q2.vbe -X1.X1.X2.X3.Q3.vbe X1.X1.X2.X3.Q3.vbc -X1.X1.X2.X3.Q4.vbe +X1.X1.X2.X3.Q3.vbe X1.X1.X2.X3.Q4.vbc +X1.X1.X2.X3.Q4.vbe X1.X1.X2.X3.Q5.vbe -X1.X1.X2.X4.Q1.vbe X1.X1.X2.X4.Q1.vbc -X1.X1.X2.X4.Q2.vbe +X1.X1.X2.X4.Q1.vbe X1.X1.X2.X4.Q2.vbc -X1.X1.X2.X4.Q3.vbe +X1.X1.X2.X4.Q2.vbe X1.X1.X2.X4.Q3.vbc -X1.X1.X2.X4.Q4.vbe +X1.X1.X2.X4.Q3.vbe X1.X1.X2.X4.Q4.vbc -X1.X1.X2.X4.Q5.vbe +X1.X1.X2.X4.Q4.vbe X1.X1.X2.X4.Q5.vbc +X1.X1.X2.X4.Q5.vbe X1.X1.X2.X5.Q1.vbe -X1.X1.X2.X5.Q2.vbe X1.X1.X2.X5.Q2.vbc -X1.X1.X2.X5.Q3.vbe +X1.X1.X2.X5.Q2.vbe X1.X1.X2.X5.Q3.vbc -X1.X1.X2.X5.Q4.vbe +X1.X1.X2.X5.Q3.vbe X1.X1.X2.X5.Q4.vbc +X1.X1.X2.X5.Q4.vbe X1.X1.X2.X5.Q5.vbe -X1.X1.X2.X6.Q1.vbe X1.X1.X2.X6.Q1.vbc +X1.X1.X2.X6.Q1.vbe X1.X1.X2.X6.Q2.vbe -X1.X1.X2.X6.Q3.vbe X1.X1.X2.X6.Q3.vbc -X1.X1.X2.X6.Q4.vbe +X1.X1.X2.X6.Q3.vbe X1.X1.X2.X6.Q4.vbc +X1.X1.X2.X6.Q4.vbe X1.X1.X2.X6.Q5.vbe -X1.X1.X2.X7.Q1.vbe X1.X1.X2.X7.Q1.vbc -X1.X1.X2.X7.Q2.vbe +X1.X1.X2.X7.Q1.vbe X1.X1.X2.X7.Q2.vbc -X1.X1.X2.X7.Q3.vbe +X1.X1.X2.X7.Q2.vbe X1.X1.X2.X7.Q3.vbc -X1.X1.X2.X7.Q4.vbe +X1.X1.X2.X7.Q3.vbe X1.X1.X2.X7.Q4.vbc -X1.X1.X2.X7.Q5.vbe +X1.X1.X2.X7.Q4.vbe X1.X1.X2.X7.Q5.vbc -X1.X1.X2.X8.Q1.vbe +X1.X1.X2.X7.Q5.vbe X1.X1.X2.X8.Q1.vbc -X1.X1.X2.X8.Q2.vbe +X1.X1.X2.X8.Q1.vbe X1.X1.X2.X8.Q2.vbc -X1.X1.X2.X8.Q3.vbe +X1.X1.X2.X8.Q2.vbe X1.X1.X2.X8.Q3.vbc -X1.X1.X2.X8.Q4.vbe +X1.X1.X2.X8.Q3.vbe X1.X1.X2.X8.Q4.vbc -X1.X1.X2.X8.Q5.vbe +X1.X1.X2.X8.Q4.vbe X1.X1.X2.X8.Q5.vbc -X1.X1.X2.X9.Q1.vbe +X1.X1.X2.X8.Q5.vbe X1.X1.X2.X9.Q1.vbc -X1.X1.X2.X9.Q2.vbe +X1.X1.X2.X9.Q1.vbe X1.X1.X2.X9.Q2.vbc -X1.X1.X2.X9.Q3.vbe +X1.X1.X2.X9.Q2.vbe X1.X1.X2.X9.Q3.vbc -X1.X1.X2.X9.Q4.vbe +X1.X1.X2.X9.Q3.vbe X1.X1.X2.X9.Q4.vbc -X1.X1.X2.X9.Q5.vbe +X1.X1.X2.X9.Q4.vbe X1.X1.X2.X9.Q5.vbc -X1.X2.X1.X1.Q1.vbe +X1.X1.X2.X9.Q5.vbe X1.X2.X1.X1.Q1.vbc +X1.X2.X1.X1.Q1.vbe X1.X2.X1.X1.Q2.vbc -X1.X2.X1.X1.Q3.vbe X1.X2.X1.X1.Q3.vbc -X1.X2.X1.X1.Q4.vbe +X1.X2.X1.X1.Q3.vbe X1.X2.X1.X1.Q4.vbc +X1.X2.X1.X1.Q4.vbe X1.X2.X1.X1.Q5.vbc X1.X2.X1.X2.Q1.vbe -X1.X2.X1.X2.Q2.vbe X1.X2.X1.X2.Q2.vbc -X1.X2.X1.X2.Q3.vbe +X1.X2.X1.X2.Q2.vbe X1.X2.X1.X2.Q3.vbc -X1.X2.X1.X2.Q4.vbe +X1.X2.X1.X2.Q3.vbe X1.X2.X1.X2.Q4.vbc -X1.X2.X1.X2.Q5.vbe +X1.X2.X1.X2.Q4.vbe X1.X2.X1.X2.Q5.vbc -X1.X2.X1.X3.Q1.vbe +X1.X2.X1.X2.Q5.vbe X1.X2.X1.X3.Q1.vbc +X1.X2.X1.X3.Q1.vbe X1.X2.X1.X3.Q2.vbe -X1.X2.X1.X3.Q3.vbe X1.X2.X1.X3.Q3.vbc -X1.X2.X1.X3.Q4.vbe +X1.X2.X1.X3.Q3.vbe X1.X2.X1.X3.Q4.vbc +X1.X2.X1.X3.Q4.vbe X1.X2.X1.X3.Q5.vbe -X1.X2.X1.X4.Q1.vbe X1.X2.X1.X4.Q1.vbc -X1.X2.X1.X4.Q2.vbe +X1.X2.X1.X4.Q1.vbe X1.X2.X1.X4.Q2.vbc -X1.X2.X1.X4.Q3.vbe +X1.X2.X1.X4.Q2.vbe X1.X2.X1.X4.Q3.vbc -X1.X2.X1.X4.Q4.vbe +X1.X2.X1.X4.Q3.vbe X1.X2.X1.X4.Q4.vbc -X1.X2.X1.X4.Q5.vbe +X1.X2.X1.X4.Q4.vbe X1.X2.X1.X4.Q5.vbc +X1.X2.X1.X4.Q5.vbe X1.X2.X1.X5.Q1.vbe -X1.X2.X1.X5.Q2.vbe X1.X2.X1.X5.Q2.vbc -X1.X2.X1.X5.Q3.vbe +X1.X2.X1.X5.Q2.vbe X1.X2.X1.X5.Q3.vbc -X1.X2.X1.X5.Q4.vbe +X1.X2.X1.X5.Q3.vbe X1.X2.X1.X5.Q4.vbc +X1.X2.X1.X5.Q4.vbe X1.X2.X1.X5.Q5.vbe -X1.X2.X1.X6.Q1.vbe X1.X2.X1.X6.Q1.vbc +X1.X2.X1.X6.Q1.vbe X1.X2.X1.X6.Q2.vbe -X1.X2.X1.X6.Q3.vbe X1.X2.X1.X6.Q3.vbc -X1.X2.X1.X6.Q4.vbe +X1.X2.X1.X6.Q3.vbe X1.X2.X1.X6.Q4.vbc +X1.X2.X1.X6.Q4.vbe X1.X2.X1.X6.Q5.vbe -X1.X2.X1.X7.Q1.vbe X1.X2.X1.X7.Q1.vbc -X1.X2.X1.X7.Q2.vbe +X1.X2.X1.X7.Q1.vbe X1.X2.X1.X7.Q2.vbc -X1.X2.X1.X7.Q3.vbe +X1.X2.X1.X7.Q2.vbe X1.X2.X1.X7.Q3.vbc -X1.X2.X1.X7.Q4.vbe +X1.X2.X1.X7.Q3.vbe X1.X2.X1.X7.Q4.vbc -X1.X2.X1.X7.Q5.vbe +X1.X2.X1.X7.Q4.vbe X1.X2.X1.X7.Q5.vbc -X1.X2.X1.X8.Q1.vbe +X1.X2.X1.X7.Q5.vbe X1.X2.X1.X8.Q1.vbc -X1.X2.X1.X8.Q2.vbe +X1.X2.X1.X8.Q1.vbe X1.X2.X1.X8.Q2.vbc -X1.X2.X1.X8.Q3.vbe +X1.X2.X1.X8.Q2.vbe X1.X2.X1.X8.Q3.vbc -X1.X2.X1.X8.Q4.vbe +X1.X2.X1.X8.Q3.vbe X1.X2.X1.X8.Q4.vbc -X1.X2.X1.X8.Q5.vbe +X1.X2.X1.X8.Q4.vbe X1.X2.X1.X8.Q5.vbc -X1.X2.X1.X9.Q1.vbe +X1.X2.X1.X8.Q5.vbe X1.X2.X1.X9.Q1.vbc -X1.X2.X1.X9.Q2.vbe +X1.X2.X1.X9.Q1.vbe X1.X2.X1.X9.Q2.vbc -X1.X2.X1.X9.Q3.vbe +X1.X2.X1.X9.Q2.vbe X1.X2.X1.X9.Q3.vbc -X1.X2.X1.X9.Q4.vbe +X1.X2.X1.X9.Q3.vbe X1.X2.X1.X9.Q4.vbc -X1.X2.X1.X9.Q5.vbe +X1.X2.X1.X9.Q4.vbe X1.X2.X1.X9.Q5.vbc -X1.X2.X2.X1.Q1.vbe +X1.X2.X1.X9.Q5.vbe X1.X2.X2.X1.Q1.vbc +X1.X2.X2.X1.Q1.vbe X1.X2.X2.X1.Q2.vbc -X1.X2.X2.X1.Q3.vbe X1.X2.X2.X1.Q3.vbc -X1.X2.X2.X1.Q4.vbe +X1.X2.X2.X1.Q3.vbe X1.X2.X2.X1.Q4.vbc +X1.X2.X2.X1.Q4.vbe X1.X2.X2.X1.Q5.vbc X1.X2.X2.X2.Q1.vbe -X1.X2.X2.X2.Q2.vbe X1.X2.X2.X2.Q2.vbc -X1.X2.X2.X2.Q3.vbe +X1.X2.X2.X2.Q2.vbe X1.X2.X2.X2.Q3.vbc -X1.X2.X2.X2.Q4.vbe +X1.X2.X2.X2.Q3.vbe X1.X2.X2.X2.Q4.vbc -X1.X2.X2.X2.Q5.vbe +X1.X2.X2.X2.Q4.vbe X1.X2.X2.X2.Q5.vbc -X1.X2.X2.X3.Q1.vbe +X1.X2.X2.X2.Q5.vbe X1.X2.X2.X3.Q1.vbc +X1.X2.X2.X3.Q1.vbe X1.X2.X2.X3.Q2.vbe -X1.X2.X2.X3.Q3.vbe X1.X2.X2.X3.Q3.vbc -X1.X2.X2.X3.Q4.vbe +X1.X2.X2.X3.Q3.vbe X1.X2.X2.X3.Q4.vbc +X1.X2.X2.X3.Q4.vbe X1.X2.X2.X3.Q5.vbe -X1.X2.X2.X4.Q1.vbe X1.X2.X2.X4.Q1.vbc -X1.X2.X2.X4.Q2.vbe +X1.X2.X2.X4.Q1.vbe X1.X2.X2.X4.Q2.vbc -X1.X2.X2.X4.Q3.vbe +X1.X2.X2.X4.Q2.vbe X1.X2.X2.X4.Q3.vbc -X1.X2.X2.X4.Q4.vbe +X1.X2.X2.X4.Q3.vbe X1.X2.X2.X4.Q4.vbc -X1.X2.X2.X4.Q5.vbe +X1.X2.X2.X4.Q4.vbe X1.X2.X2.X4.Q5.vbc +X1.X2.X2.X4.Q5.vbe X1.X2.X2.X5.Q1.vbe -X1.X2.X2.X5.Q2.vbe X1.X2.X2.X5.Q2.vbc -X1.X2.X2.X5.Q3.vbe +X1.X2.X2.X5.Q2.vbe X1.X2.X2.X5.Q3.vbc -X1.X2.X2.X5.Q4.vbe +X1.X2.X2.X5.Q3.vbe X1.X2.X2.X5.Q4.vbc +X1.X2.X2.X5.Q4.vbe X1.X2.X2.X5.Q5.vbe -X1.X2.X2.X6.Q1.vbe X1.X2.X2.X6.Q1.vbc +X1.X2.X2.X6.Q1.vbe X1.X2.X2.X6.Q2.vbe -X1.X2.X2.X6.Q3.vbe X1.X2.X2.X6.Q3.vbc -X1.X2.X2.X6.Q4.vbe +X1.X2.X2.X6.Q3.vbe X1.X2.X2.X6.Q4.vbc +X1.X2.X2.X6.Q4.vbe X1.X2.X2.X6.Q5.vbe -X1.X2.X2.X7.Q1.vbe X1.X2.X2.X7.Q1.vbc -X1.X2.X2.X7.Q2.vbe +X1.X2.X2.X7.Q1.vbe X1.X2.X2.X7.Q2.vbc -X1.X2.X2.X7.Q3.vbe +X1.X2.X2.X7.Q2.vbe X1.X2.X2.X7.Q3.vbc -X1.X2.X2.X7.Q4.vbe +X1.X2.X2.X7.Q3.vbe X1.X2.X2.X7.Q4.vbc -X1.X2.X2.X7.Q5.vbe +X1.X2.X2.X7.Q4.vbe X1.X2.X2.X7.Q5.vbc -X1.X2.X2.X8.Q1.vbe +X1.X2.X2.X7.Q5.vbe X1.X2.X2.X8.Q1.vbc -X1.X2.X2.X8.Q2.vbe +X1.X2.X2.X8.Q1.vbe X1.X2.X2.X8.Q2.vbc -X1.X2.X2.X8.Q3.vbe +X1.X2.X2.X8.Q2.vbe X1.X2.X2.X8.Q3.vbc -X1.X2.X2.X8.Q4.vbe +X1.X2.X2.X8.Q3.vbe X1.X2.X2.X8.Q4.vbc -X1.X2.X2.X8.Q5.vbe +X1.X2.X2.X8.Q4.vbe X1.X2.X2.X8.Q5.vbc -X1.X2.X2.X9.Q1.vbe +X1.X2.X2.X8.Q5.vbe X1.X2.X2.X9.Q1.vbc -X1.X2.X2.X9.Q2.vbe +X1.X2.X2.X9.Q1.vbe X1.X2.X2.X9.Q2.vbc -X1.X2.X2.X9.Q3.vbe +X1.X2.X2.X9.Q2.vbe X1.X2.X2.X9.Q3.vbc -X1.X2.X2.X9.Q4.vbe +X1.X2.X2.X9.Q3.vbe X1.X2.X2.X9.Q4.vbc +X1.X2.X2.X9.Q4.vbe +X1.X2.X2.X9.Q5.vbc X1.X2.X2.X9.Q5.vbe -X1.X2.X2.X9.Q5.vbc \ No newline at end of file diff --git a/Modelica/Fluid/Examples/AST_BatchPlant/BatchPlant_StandardWater/comparisonSignals.txt b/Modelica/Fluid/Examples/AST_BatchPlant/BatchPlant_StandardWater/comparisonSignals.txt index a0a47b155..a0fc42b38 100644 --- a/Modelica/Fluid/Examples/AST_BatchPlant/BatchPlant_StandardWater/comparisonSignals.txt +++ b/Modelica/Fluid/Examples/AST_BatchPlant/BatchPlant_StandardWater/comparisonSignals.txt @@ -1,54 +1,54 @@ time -B5.medium.h -B5.level -B5.InnerTankTop[1].m_flow_negative -B5.InnerTankSide[1].m_flow_negative -B5.InnerTankBottom[1].m_flow_negative -controller.Transition1.enableFire -controller.Transition2.enableFire -controller.Transition3.enableFire -controller.Transition4.enableFire -controller.Transition5.enableFire -controller.Transition6.enableFire -controller.Transition7.enableFire -controller.Transition8.enableFire -controller.Transition9.enableFire -controller.Transition10.enableFire -controller.Transition11.enableFire -controller.Transition12.enableFire -controller.Transition13.enableFire -controller.TransitionWithSignal1.enableFire -volume5.medium.p -volume5.medium.h -P1.medium.p -P1.medium.h -P2.medium.p -P2.medium.h B1.level B1.medium.h -P1_on.y -P2_on.y B2.level B2.medium.h B3.level B3.medium.h B4.level B4.medium.h +B5.level +B5.medium.h +B6.level +B6.medium.h B7.level B7.medium.h -pipeB1B2.mediums[1].p +P1.medium.h +P1.medium.p +P2.medium.h +P2.medium.p pipeB1B2.mediums[1].h -pipeB1B2.mediums[2].p +pipeB1B2.mediums[1].p pipeB1B2.mediums[2].h -pipePump1B1.mediums[1].p +pipeB1B2.mediums[2].p pipePump1B1.mediums[1].h -pipePump1B1.mediums[2].p +pipePump1B1.mediums[1].p pipePump1B1.mediums[2].h -pipePump2B2.mediums[1].p +pipePump1B1.mediums[2].p pipePump2B2.mediums[1].h -pipePump2B2.mediums[2].p +pipePump2B2.mediums[1].p pipePump2B2.mediums[2].h -B6.level -B6.medium.h +pipePump2B2.mediums[2].p +volume4.medium.h volume4.medium.p -volume4.medium.h \ No newline at end of file +volume5.medium.h +volume5.medium.p +B5.InnerTankBottom[1].m_flow_negative +B5.InnerTankSide[1].m_flow_negative +B5.InnerTankTop[1].m_flow_negative +P1_on.y +P2_on.y +controller.Transition1.enableFire +controller.Transition10.enableFire +controller.Transition11.enableFire +controller.Transition12.enableFire +controller.Transition13.enableFire +controller.Transition2.enableFire +controller.Transition3.enableFire +controller.Transition4.enableFire +controller.Transition5.enableFire +controller.Transition6.enableFire +controller.Transition7.enableFire +controller.Transition8.enableFire +controller.Transition9.enableFire +controller.TransitionWithSignal1.enableFire diff --git a/Modelica/Fluid/Examples/BranchingDynamicPipes/comparisonSignals.txt b/Modelica/Fluid/Examples/BranchingDynamicPipes/comparisonSignals.txt index c398de67e..f91a9dca6 100644 --- a/Modelica/Fluid/Examples/BranchingDynamicPipes/comparisonSignals.txt +++ b/Modelica/Fluid/Examples/BranchingDynamicPipes/comparisonSignals.txt @@ -5,79 +5,79 @@ pipe1.flowModel.m_flows[3] pipe1.flowModel.m_flows[4] pipe1.flowModel.m_flows[5] pipe1.flowModel.m_flows[6] -pipe1.mediums[1].p -pipe1.mediums[1].Xi[1] pipe1.mediums[1].T -pipe1.mediums[2].p -pipe1.mediums[2].Xi[1] +pipe1.mediums[1].Xi[1] +pipe1.mediums[1].p pipe1.mediums[2].T -pipe1.mediums[3].p -pipe1.mediums[3].Xi[1] +pipe1.mediums[2].Xi[1] +pipe1.mediums[2].p pipe1.mediums[3].T -pipe1.mediums[4].p -pipe1.mediums[4].Xi[1] +pipe1.mediums[3].Xi[1] +pipe1.mediums[3].p pipe1.mediums[4].T -pipe1.mediums[5].p -pipe1.mediums[5].Xi[1] +pipe1.mediums[4].Xi[1] +pipe1.mediums[4].p pipe1.mediums[5].T +pipe1.mediums[5].Xi[1] +pipe1.mediums[5].p pipe2.flowModel.m_flows[1] pipe2.flowModel.m_flows[2] pipe2.flowModel.m_flows[3] pipe2.flowModel.m_flows[4] -pipe2.mediums[1].p -pipe2.mediums[1].Xi[1] pipe2.mediums[1].T -pipe2.mediums[2].p -pipe2.mediums[2].Xi[1] +pipe2.mediums[1].Xi[1] +pipe2.mediums[1].p pipe2.mediums[2].T -pipe2.mediums[3].p -pipe2.mediums[3].Xi[1] +pipe2.mediums[2].Xi[1] +pipe2.mediums[2].p pipe2.mediums[3].T -pipe2.mediums[4].p -pipe2.mediums[4].Xi[1] +pipe2.mediums[3].Xi[1] +pipe2.mediums[3].p pipe2.mediums[4].T -pipe2.mediums[5].p -pipe2.mediums[5].Xi[1] +pipe2.mediums[4].Xi[1] +pipe2.mediums[4].p pipe2.mediums[5].T +pipe2.mediums[5].Xi[1] +pipe2.mediums[5].p pipe3.flowModel.m_flows[1] pipe3.flowModel.m_flows[2] pipe3.flowModel.m_flows[3] pipe3.flowModel.m_flows[4] pipe3.flowModel.m_flows[5] pipe3.flowModel.m_flows[6] -pipe3.mediums[1].p -pipe3.mediums[1].Xi[1] pipe3.mediums[1].T -pipe3.mediums[2].p -pipe3.mediums[2].Xi[1] +pipe3.mediums[1].Xi[1] +pipe3.mediums[1].p pipe3.mediums[2].T -pipe3.mediums[3].p -pipe3.mediums[3].Xi[1] +pipe3.mediums[2].Xi[1] +pipe3.mediums[2].p pipe3.mediums[3].T -pipe3.mediums[4].p -pipe3.mediums[4].Xi[1] +pipe3.mediums[3].Xi[1] +pipe3.mediums[3].p pipe3.mediums[4].T -pipe3.mediums[5].p -pipe3.mediums[5].Xi[1] +pipe3.mediums[4].Xi[1] +pipe3.mediums[4].p pipe3.mediums[5].T +pipe3.mediums[5].Xi[1] +pipe3.mediums[5].p pipe4.flowModel.m_flows[1] pipe4.flowModel.m_flows[2] pipe4.flowModel.m_flows[3] pipe4.flowModel.m_flows[4] pipe4.flowModel.m_flows[5] pipe4.flowModel.m_flows[6] -pipe4.mediums[1].p -pipe4.mediums[1].Xi[1] pipe4.mediums[1].T -pipe4.mediums[2].p -pipe4.mediums[2].Xi[1] +pipe4.mediums[1].Xi[1] +pipe4.mediums[1].p pipe4.mediums[2].T -pipe4.mediums[3].p -pipe4.mediums[3].Xi[1] +pipe4.mediums[2].Xi[1] +pipe4.mediums[2].p pipe4.mediums[3].T -pipe4.mediums[4].p -pipe4.mediums[4].Xi[1] +pipe4.mediums[3].Xi[1] +pipe4.mediums[3].p pipe4.mediums[4].T -pipe4.mediums[5].p +pipe4.mediums[4].Xi[1] +pipe4.mediums[4].p +pipe4.mediums[5].T pipe4.mediums[5].Xi[1] -pipe4.mediums[5].T \ No newline at end of file +pipe4.mediums[5].p diff --git a/Modelica/Fluid/Examples/Explanatory/MomentumBalanceFittings/comparisonSignals.txt b/Modelica/Fluid/Examples/Explanatory/MomentumBalanceFittings/comparisonSignals.txt index 472ad4952..ca1556483 100644 --- a/Modelica/Fluid/Examples/Explanatory/MomentumBalanceFittings/comparisonSignals.txt +++ b/Modelica/Fluid/Examples/Explanatory/MomentumBalanceFittings/comparisonSignals.txt @@ -1,7 +1,7 @@ time -suddenExpansion1.m_flow suddenExpansion1.dp +suddenExpansion1.m_flow suddenExpansion1.port_b_T -suddenExpansion2.m_flow suddenExpansion2.dp -suddenExpansion2.port_b_T \ No newline at end of file +suddenExpansion2.m_flow +suddenExpansion2.port_b_T diff --git a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour/comparisonSignals.txt b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour/comparisonSignals.txt index ddfbe1724..940d096ee 100644 --- a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour/comparisonSignals.txt +++ b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour/comparisonSignals.txt @@ -2,4 +2,3 @@ time cActuator.flange.f pmActuator.flange.f pmActuator.coil.Phi -pmActuator.coil.L_stat diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage/comparisonSignals.txt b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage/comparisonSignals.txt index 7a7c19b83..48b13563b 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage/comparisonSignals.txt +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage/comparisonSignals.txt @@ -3,29 +3,29 @@ aimc0.is[1] aimc0.is[2] aimc0.is[3] aimc0.is[4] -aimc0.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re -aimc0.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im aimc0.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re aimc0.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im +aimc0.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re +aimc0.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im loadInertia0.phi loadInertia0.w aimcH.is[1] aimcH.is[2] aimcH.is[3] aimcH.is[4] -aimcH.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re -aimcH.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im aimcH.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re aimcH.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im +aimcH.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re +aimcH.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im loadInertiaH.phi loadInertiaH.w aimc1.is[1] aimc1.is[2] aimc1.is[3] aimc1.is[4] -aimc1.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re -aimc1.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im aimc1.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re aimc1.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im +aimc1.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re +aimc1.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im loadInertia1.phi -loadInertia1.w \ No newline at end of file +loadInertia1.w diff --git a/Modelica/Magnetic/FundamentalWave/Examples/Components/PolyphaseInductance/comparisonSignals.txt b/Modelica/Magnetic/FundamentalWave/Examples/Components/PolyphaseInductance/comparisonSignals.txt index 7b839e52e..93abc7bae 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/Components/PolyphaseInductance/comparisonSignals.txt +++ b/Modelica/Magnetic/FundamentalWave/Examples/Components/PolyphaseInductance/comparisonSignals.txt @@ -4,4 +4,4 @@ resistor_e.i[2] resistor_s.i[1] resistor_s.i[2] resistor_m.i[1] -resistor_m.i[2] \ No newline at end of file +resistor_m.i[2] diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt index 73a4414f0..af4fc9be5 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor/comparisonSignals.txt @@ -3,7 +3,7 @@ imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Ph imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im -imc.stator.zeroInductor.i0 +// imc.stator.zeroInductor.i0 imcQS.rotorCage.port_p.reference.gamma mass.s mass.v diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt index 5ca030510..abcee2ec6 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Initialize/comparisonSignals.txt @@ -9,7 +9,7 @@ imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.r imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im imc.stator.port_p.V_m.im imc.stator.port_p.V_m.re -imc.stator.zeroInductor.i0 +// imc.stator.zeroInductor.i0 imcQS.rotorCage.port_p.reference.gamma loadInertia.phi loadInertia.w diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter/comparisonSignals.txt b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter/comparisonSignals.txt index 44db7f021..f98390227 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter/comparisonSignals.txt +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter/comparisonSignals.txt @@ -1,3 +1,3 @@ time aimc.wMechanical -currentQuasiRMSSensor.I \ No newline at end of file +currentQuasiRMSSensor.I diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt index 20143e2b9..02aeeeefc 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Transformer/comparisonSignals.txt @@ -3,7 +3,7 @@ imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Ph imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im -imc.stator.zeroInductor.i0 +// imc.stator.zeroInductor.i0 imcQS.rotorCage.port_p.reference.gamma loadInertia.phi loadInertia.w diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt index 9ea4e0d2a..b3bf54d56 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD/comparisonSignals.txt @@ -3,7 +3,7 @@ imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Ph imc.rotorCage.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi.re imc.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im -imc.stator.zeroInductor.i0 +// imc.stator.zeroInductor.i0 imcQS.rotorCage.port_p.reference.gamma loadInertia.phi loadInertia.w diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt index cdd17a6ea..864b0ba25 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator/comparisonSignals.txt @@ -6,5 +6,5 @@ smee.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[1].Phi. smee.stator.electroMagneticConverter.singlePhaseElectroMagneticConverter[2].Phi.im smee.stator.stray.port_p.Phi.im smee.stator.stray.port_p.Phi.re -smee.stator.zeroInductor.i0 +// smee.stator.zeroInductor.i0 smeeQS.short.port_p.reference.gamma diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_FieldWeakening/comparisonSignals.txt b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_FieldWeakening/comparisonSignals.txt index e2196a663..4af7f2ca3 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_FieldWeakening/comparisonSignals.txt +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_FieldWeakening/comparisonSignals.txt @@ -2,4 +2,4 @@ time fieldWeakeningController.vs fieldWeakeningController.is fieldWeakeningController.id -fieldWeakeningController.iq \ No newline at end of file +fieldWeakeningController.iq diff --git a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/BevelGear1D/comparisonSignals.txt b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/BevelGear1D/comparisonSignals.txt index e5afaa5fb..6fe26543b 100644 --- a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/BevelGear1D/comparisonSignals.txt +++ b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/BevelGear1D/comparisonSignals.txt @@ -6,4 +6,4 @@ revolute1.w revolute2.phi revolute2.w revolute3.phi -revolute3.w \ No newline at end of file +revolute3.w diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis/comparisonSignals.txt b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis/comparisonSignals.txt index 460b9abe1..679f26654 100644 --- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis/comparisonSignals.txt +++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis/comparisonSignals.txt @@ -7,5 +7,3 @@ axis.initializeFlange.w_flange axis.motor.C.v axis.motor.La.i axis.gear.bearingFriction.mode -axis.gear.bearingFriction.startBackward -axis.gear.bearingFriction.startForward diff --git a/Modelica/Mechanics/Rotational/Examples/CompareBrakingTorque/comparisonSignals.txt b/Modelica/Mechanics/Rotational/Examples/CompareBrakingTorque/comparisonSignals.txt index a6762d485..2861435d6 100644 --- a/Modelica/Mechanics/Rotational/Examples/CompareBrakingTorque/comparisonSignals.txt +++ b/Modelica/Mechanics/Rotational/Examples/CompareBrakingTorque/comparisonSignals.txt @@ -2,4 +2,4 @@ time inertia1.w inertia2.w inertia3.w -inertia4.w \ No newline at end of file +inertia4.w diff --git a/Modelica/Mechanics/Rotational/Examples/CoupledClutches/comparisonSignals.txt b/Modelica/Mechanics/Rotational/Examples/CoupledClutches/comparisonSignals.txt index 2f2a6147a..cd55f4e2d 100644 --- a/Modelica/Mechanics/Rotational/Examples/CoupledClutches/comparisonSignals.txt +++ b/Modelica/Mechanics/Rotational/Examples/CoupledClutches/comparisonSignals.txt @@ -8,11 +8,5 @@ clutch2.w_rel clutch3.phi_rel clutch3.w_rel clutch1.mode -clutch1.startBackward -clutch1.startForward clutch2.mode -clutch2.startBackward -clutch2.startForward clutch3.mode -clutch3.startBackward -clutch3.startForward diff --git a/Modelica/Mechanics/Rotational/Examples/EddyCurrentBrake/comparisonSignals.txt b/Modelica/Mechanics/Rotational/Examples/EddyCurrentBrake/comparisonSignals.txt index 82925b73d..6a464494f 100644 --- a/Modelica/Mechanics/Rotational/Examples/EddyCurrentBrake/comparisonSignals.txt +++ b/Modelica/Mechanics/Rotational/Examples/EddyCurrentBrake/comparisonSignals.txt @@ -1,4 +1,4 @@ time -eddyCurrentTorque.lossPower inertia.phi -heatCapacitor.T \ No newline at end of file +heatCapacitor.T +eddyCurrentTorque.lossPower diff --git a/Modelica/Mechanics/Rotational/Examples/Friction/comparisonSignals.txt b/Modelica/Mechanics/Rotational/Examples/Friction/comparisonSignals.txt index f75b34bb7..d983de035 100644 --- a/Modelica/Mechanics/Rotational/Examples/Friction/comparisonSignals.txt +++ b/Modelica/Mechanics/Rotational/Examples/Friction/comparisonSignals.txt @@ -6,8 +6,4 @@ inertia3.w spring.phi_rel spring.w_rel brake.mode -brake.startBackward -brake.startForward clutch.mode -clutch.startBackward -clutch.startForward diff --git a/Modelica/Mechanics/Rotational/Examples/HeatLosses/comparisonSignals.txt b/Modelica/Mechanics/Rotational/Examples/HeatLosses/comparisonSignals.txt index 963993c19..3bd19bc56 100644 --- a/Modelica/Mechanics/Rotational/Examples/HeatLosses/comparisonSignals.txt +++ b/Modelica/Mechanics/Rotational/Examples/HeatLosses/comparisonSignals.txt @@ -12,14 +12,7 @@ oneWayClutch.w_rel springDamper.phi_rel springDamper.w_rel bearingFriction.mode -bearingFriction.startBackward -bearingFriction.startForward brake.mode -brake.startBackward -brake.startForward clutch.mode -clutch.startBackward -clutch.startForward lossyGear.mode -oneWayClutch.startForward oneWayClutch.stuck diff --git a/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2/comparisonSignals.txt b/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2/comparisonSignals.txt index ab9539122..16c0adc1c 100644 --- a/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2/comparisonSignals.txt +++ b/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2/comparisonSignals.txt @@ -2,6 +2,4 @@ time Inertia2.phi Inertia2.w bearingFriction.mode -bearingFriction.startBackward -bearingFriction.startForward gear.mode diff --git a/Modelica/Mechanics/Rotational/Examples/SimpleGearShift/comparisonSignals.txt b/Modelica/Mechanics/Rotational/Examples/SimpleGearShift/comparisonSignals.txt index 4c4116c8e..c76d7b763 100644 --- a/Modelica/Mechanics/Rotational/Examples/SimpleGearShift/comparisonSignals.txt +++ b/Modelica/Mechanics/Rotational/Examples/SimpleGearShift/comparisonSignals.txt @@ -6,8 +6,4 @@ engine.w load.phi load.w brake.mode -brake.startBackward -brake.startForward clutch.mode -clutch.startBackward -clutch.startForward diff --git a/Modelica/Mechanics/Translational/Examples/Brake/comparisonSignals.txt b/Modelica/Mechanics/Translational/Examples/Brake/comparisonSignals.txt index 3396a46f5..33d6b7d73 100644 --- a/Modelica/Mechanics/Translational/Examples/Brake/comparisonSignals.txt +++ b/Modelica/Mechanics/Translational/Examples/Brake/comparisonSignals.txt @@ -4,8 +4,4 @@ mass1.v mass2.s mass2.v brake.mode -brake.startBackward -brake.startForward brake1.mode -brake1.startBackward -brake1.startForward diff --git a/Modelica/Mechanics/Translational/Examples/CompareBrakingForce/comparisonSignals.txt b/Modelica/Mechanics/Translational/Examples/CompareBrakingForce/comparisonSignals.txt index 6065843ea..bae7e04d6 100644 --- a/Modelica/Mechanics/Translational/Examples/CompareBrakingForce/comparisonSignals.txt +++ b/Modelica/Mechanics/Translational/Examples/CompareBrakingForce/comparisonSignals.txt @@ -2,4 +2,4 @@ time mass1.v mass2.v mass3.v -mass4.v \ No newline at end of file +mass4.v diff --git a/Modelica/Mechanics/Translational/Examples/EddyCurrentBrake/comparisonSignals.txt b/Modelica/Mechanics/Translational/Examples/EddyCurrentBrake/comparisonSignals.txt index 9363d5d6e..f59b1c6be 100644 --- a/Modelica/Mechanics/Translational/Examples/EddyCurrentBrake/comparisonSignals.txt +++ b/Modelica/Mechanics/Translational/Examples/EddyCurrentBrake/comparisonSignals.txt @@ -1,4 +1,4 @@ time -eddyCurrentForce.lossPower mass.s -heatCapacitor.T \ No newline at end of file +heatCapacitor.T +eddyCurrentForce.lossPower diff --git a/Modelica/Mechanics/Translational/Examples/Friction/comparisonSignals.txt b/Modelica/Mechanics/Translational/Examples/Friction/comparisonSignals.txt index 7f7c96993..e68ad21f2 100644 --- a/Modelica/Mechanics/Translational/Examples/Friction/comparisonSignals.txt +++ b/Modelica/Mechanics/Translational/Examples/Friction/comparisonSignals.txt @@ -6,11 +6,5 @@ stop1.v stop2.s stop2.v stop1.mode -stop1.startBackward -stop1.startForward stop2.mode -stop2.startBackward -stop2.startForward supportFriction.mode -supportFriction.startBackward -supportFriction.startForward diff --git a/Modelica/Mechanics/Translational/Examples/HeatLosses/comparisonSignals.txt b/Modelica/Mechanics/Translational/Examples/HeatLosses/comparisonSignals.txt index c4abc1d47..947859960 100644 --- a/Modelica/Mechanics/Translational/Examples/HeatLosses/comparisonSignals.txt +++ b/Modelica/Mechanics/Translational/Examples/HeatLosses/comparisonSignals.txt @@ -8,11 +8,5 @@ springDamper.v_rel springDamper1.s_rel springDamper1.v_rel brake.mode -brake.startBackward -brake.startForward massWithStopAndFriction.mode -massWithStopAndFriction.startBackward -massWithStopAndFriction.startForward supportFriction.mode -supportFriction.startBackward -supportFriction.startForward diff --git a/ModelicaTest/Blocks/Mean/comparisonSignals.txt b/ModelicaTest/Blocks/Mean/comparisonSignals.txt index c54015f17..ecac6676d 100644 --- a/ModelicaTest/Blocks/Mean/comparisonSignals.txt +++ b/ModelicaTest/Blocks/Mean/comparisonSignals.txt @@ -6,4 +6,4 @@ yRootMeanSquare yHarmonicCos yHarmonicSin yHarmonicAbs -yHarmonicArg \ No newline at end of file +yHarmonicArg diff --git a/ModelicaTest/Electrical/MultiSensorTest/comparisonSignals.txt b/ModelicaTest/Electrical/MultiSensorTest/comparisonSignals.txt index 5644276e3..769e04b0a 100644 --- a/ModelicaTest/Electrical/MultiSensorTest/comparisonSignals.txt +++ b/ModelicaTest/Electrical/MultiSensorTest/comparisonSignals.txt @@ -49,4 +49,4 @@ rmsiM[2].y rmsiM[3].y meanpowerM[1].y meanpowerM[2].y -meanpowerM[3].y \ No newline at end of file +meanpowerM[3].y diff --git a/ModelicaTest/Electrical/QuasiStatic/Polyphase/FrequencySweep/comparisonSignals.txt b/ModelicaTest/Electrical/QuasiStatic/Polyphase/FrequencySweep/comparisonSignals.txt index 933666b7f..4da9a2a5f 100644 --- a/ModelicaTest/Electrical/QuasiStatic/Polyphase/FrequencySweep/comparisonSignals.txt +++ b/ModelicaTest/Electrical/QuasiStatic/Polyphase/FrequencySweep/comparisonSignals.txt @@ -1,7 +1,7 @@ time -vC[2] iL[1] iL[2] -vC[3] +iL[3] vC[1] -iL[3] \ No newline at end of file +vC[2] +vC[3] diff --git a/ModelicaTest/Electrical/QuasiStatic/SinglePhase/FrequencySweep/comparisonSignals.txt b/ModelicaTest/Electrical/QuasiStatic/SinglePhase/FrequencySweep/comparisonSignals.txt index 69be21ea0..f4dd66da1 100644 --- a/ModelicaTest/Electrical/QuasiStatic/SinglePhase/FrequencySweep/comparisonSignals.txt +++ b/ModelicaTest/Electrical/QuasiStatic/SinglePhase/FrequencySweep/comparisonSignals.txt @@ -1,5 +1,5 @@ time -vC -iLL iL -vCC \ No newline at end of file +iLL +vC +vCC diff --git a/ModelicaTest/Electrical/SingularTransformer/comparisonSignals.txt b/ModelicaTest/Electrical/SingularTransformer/comparisonSignals.txt index c38b09183..b07def3ab 100644 --- a/ModelicaTest/Electrical/SingularTransformer/comparisonSignals.txt +++ b/ModelicaTest/Electrical/SingularTransformer/comparisonSignals.txt @@ -1,3 +1,3 @@ time +basicTransformer.i1 basicTransformer.i2 -basicTransformer.i1 \ No newline at end of file diff --git a/ModelicaTest/Fluid/TestComponents/Fittings/TestJunctionTraceSubstances/comparisonSignals.txt b/ModelicaTest/Fluid/TestComponents/Fittings/TestJunctionTraceSubstances/comparisonSignals.txt index 65a4194d9..16e38d05d 100644 --- a/ModelicaTest/Fluid/TestComponents/Fittings/TestJunctionTraceSubstances/comparisonSignals.txt +++ b/ModelicaTest/Fluid/TestComponents/Fittings/TestJunctionTraceSubstances/comparisonSignals.txt @@ -1,5 +1,5 @@ time junction1.port_2.C_outflow[1] -junction1.medium.p +junction1.medium.T junction1.medium.Xi[1] -junction1.medium.T \ No newline at end of file +junction1.medium.p diff --git a/ModelicaTest/Fluid/TestComponents/Fittings/TestSharpEdgedOrifice/comparisonSignals.txt b/ModelicaTest/Fluid/TestComponents/Fittings/TestSharpEdgedOrifice/comparisonSignals.txt index ad088df5a..54a10d9f4 100644 --- a/ModelicaTest/Fluid/TestComponents/Fittings/TestSharpEdgedOrifice/comparisonSignals.txt +++ b/ModelicaTest/Fluid/TestComponents/Fittings/TestSharpEdgedOrifice/comparisonSignals.txt @@ -4,4 +4,4 @@ orifice1.port_b.p orifice1.port_b.h_outflow orifice2.port_b.m_flow orifice2.port_b.p -orifice2.port_b.h_outflow \ No newline at end of file +orifice2.port_b.h_outflow diff --git a/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipesWithTraceSubstances/comparisonSignals.txt b/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipesWithTraceSubstances/comparisonSignals.txt index cff613257..4ba3b7a0f 100644 --- a/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipesWithTraceSubstances/comparisonSignals.txt +++ b/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipesWithTraceSubstances/comparisonSignals.txt @@ -1,89 +1,89 @@ time -pipe2.mediums[1].p +junction1.mC_scaled[1] +junction1.mC_scaled[2] +junction1.medium.T +junction1.medium.p +junction2.mC_scaled[1] +junction2.mC_scaled[2] +junction2.medium.T +junction2.medium.p +pipe1.mediums[1].T +pipe1.mediums[1].p +pipe1.mediums[2].T +pipe1.mediums[2].p +pipe1.mediums[3].T +pipe1.mediums[3].p +pipe1.mediums[4].T +pipe1.mediums[4].p +pipe1.mediums[5].T +pipe1.mediums[5].p pipe2.mediums[1].T -pipe2.mediums[2].p +pipe2.mediums[1].p pipe2.mediums[2].T -pipe2.mediums[3].p +pipe2.mediums[2].p pipe2.mediums[3].T -pipe2.mediums[4].p +pipe2.mediums[3].p pipe2.mediums[4].T -pipe2.mediums[5].p +pipe2.mediums[4].p pipe2.mediums[5].T -pipe3.mediums[1].p +pipe2.mediums[5].p pipe3.mediums[1].T -pipe3.mediums[2].p +pipe3.mediums[1].p pipe3.mediums[2].T -pipe3.mediums[3].p +pipe3.mediums[2].p pipe3.mediums[3].T -pipe3.mediums[4].p +pipe3.mediums[3].p pipe3.mediums[4].T -pipe3.mediums[5].p +pipe3.mediums[4].p pipe3.mediums[5].T -pipe1.mediums[1].p -pipe1.mediums[1].T -pipe1.mediums[2].p -pipe1.mediums[2].T -pipe1.mediums[3].p -pipe1.mediums[3].T -pipe1.mediums[4].p -pipe1.mediums[4].T -pipe1.mediums[5].p -pipe1.mediums[5].T -pipe4.mediums[1].p +pipe3.mediums[5].p pipe4.mediums[1].T -pipe4.mediums[2].p +pipe4.mediums[1].p pipe4.mediums[2].T -pipe4.mediums[3].p +pipe4.mediums[2].p pipe4.mediums[3].T -pipe4.mediums[4].p +pipe4.mediums[3].p pipe4.mediums[4].T -pipe4.mediums[5].p +pipe4.mediums[4].p pipe4.mediums[5].T -junction1.medium.p -junction1.medium.T -junction1.mC_scaled[1] -junction1.mC_scaled[2] -junction2.medium.p -junction2.medium.T -junction2.mC_scaled[1] -junction2.mC_scaled[2] -pipe5.mediums[1].p +pipe4.mediums[5].p pipe5.mediums[1].T -pipe5.mediums[2].p +pipe5.mediums[1].p pipe5.mediums[2].T -pipe5.mediums[3].p +pipe5.mediums[2].p pipe5.mediums[3].T -pipe5.mediums[4].p +pipe5.mediums[3].p pipe5.mediums[4].T -pipe5.mediums[5].p +pipe5.mediums[4].p pipe5.mediums[5].T -pipe6.mediums[1].p +pipe5.mediums[5].p pipe6.mediums[1].T -pipe6.mediums[2].p +pipe6.mediums[1].p pipe6.mediums[2].T -pipe6.mediums[3].p +pipe6.mediums[2].p pipe6.mediums[3].T -pipe6.mediums[4].p +pipe6.mediums[3].p pipe6.mediums[4].T -pipe6.mediums[5].p +pipe6.mediums[4].p pipe6.mediums[5].T -pipe7.mediums[1].p +pipe6.mediums[5].p pipe7.mediums[1].T -pipe7.mediums[2].p +pipe7.mediums[1].p pipe7.mediums[2].T -pipe7.mediums[3].p +pipe7.mediums[2].p pipe7.mediums[3].T -pipe7.mediums[4].p +pipe7.mediums[3].p pipe7.mediums[4].T -pipe7.mediums[5].p +pipe7.mediums[4].p pipe7.mediums[5].T -pipe8.mediums[1].p +pipe7.mediums[5].p pipe8.mediums[1].T -pipe8.mediums[2].p +pipe8.mediums[1].p pipe8.mediums[2].T -pipe8.mediums[3].p +pipe8.mediums[2].p pipe8.mediums[3].T -pipe8.mediums[4].p +pipe8.mediums[3].p pipe8.mediums[4].T +pipe8.mediums[4].p +pipe8.mediums[5].T pipe8.mediums[5].p -pipe8.mediums[5].T \ No newline at end of file diff --git a/ModelicaTest/Fluid/TestComponents/Valves/TestValvesCompressibleReverse/comparisonSignals.txt b/ModelicaTest/Fluid/TestComponents/Valves/TestValvesCompressibleReverse/comparisonSignals.txt index 3d85de8d2..78b735caa 100644 --- a/ModelicaTest/Fluid/TestComponents/Valves/TestValvesCompressibleReverse/comparisonSignals.txt +++ b/ModelicaTest/Fluid/TestComponents/Valves/TestValvesCompressibleReverse/comparisonSignals.txt @@ -42,4 +42,4 @@ SinkP3.ports[1].p SinkP3.ports[1].h_outflow CloseLoad.y OpenRelief.y -CloseValves.y \ No newline at end of file +CloseValves.y diff --git a/ModelicaTest/Fluid/TestExamplesVariants/BranchingDynamicPipes_MomentumSteadyState/comparisonSignals.txt b/ModelicaTest/Fluid/TestExamplesVariants/BranchingDynamicPipes_MomentumSteadyState/comparisonSignals.txt index 5b0318626..8e54f4fef 100644 --- a/ModelicaTest/Fluid/TestExamplesVariants/BranchingDynamicPipes_MomentumSteadyState/comparisonSignals.txt +++ b/ModelicaTest/Fluid/TestExamplesVariants/BranchingDynamicPipes_MomentumSteadyState/comparisonSignals.txt @@ -1,61 +1,61 @@ time -pipe1.mediums[1].p -pipe1.mediums[1].Xi[1] pipe1.mediums[1].T -pipe1.mediums[2].p -pipe1.mediums[2].Xi[1] +pipe1.mediums[1].Xi[1] +pipe1.mediums[1].p pipe1.mediums[2].T -pipe1.mediums[3].p -pipe1.mediums[3].Xi[1] +pipe1.mediums[2].Xi[1] +pipe1.mediums[2].p pipe1.mediums[3].T -pipe1.mediums[4].p -pipe1.mediums[4].Xi[1] +pipe1.mediums[3].Xi[1] +pipe1.mediums[3].p pipe1.mediums[4].T -pipe1.mediums[5].p -pipe1.mediums[5].Xi[1] +pipe1.mediums[4].Xi[1] +pipe1.mediums[4].p pipe1.mediums[5].T -pipe2.mediums[1].p -pipe2.mediums[1].Xi[1] +pipe1.mediums[5].Xi[1] +pipe1.mediums[5].p pipe2.mediums[1].T -pipe2.mediums[2].p -pipe2.mediums[2].Xi[1] +pipe2.mediums[1].Xi[1] +pipe2.mediums[1].p pipe2.mediums[2].T -pipe2.mediums[3].p -pipe2.mediums[3].Xi[1] +pipe2.mediums[2].Xi[1] +pipe2.mediums[2].p pipe2.mediums[3].T -pipe2.mediums[4].p -pipe2.mediums[4].Xi[1] +pipe2.mediums[3].Xi[1] +pipe2.mediums[3].p pipe2.mediums[4].T -pipe2.mediums[5].p -pipe2.mediums[5].Xi[1] +pipe2.mediums[4].Xi[1] +pipe2.mediums[4].p pipe2.mediums[5].T -pipe3.mediums[1].p -pipe3.mediums[1].Xi[1] +pipe2.mediums[5].Xi[1] +pipe2.mediums[5].p pipe3.mediums[1].T -pipe3.mediums[2].p -pipe3.mediums[2].Xi[1] +pipe3.mediums[1].Xi[1] +pipe3.mediums[1].p pipe3.mediums[2].T -pipe3.mediums[3].p -pipe3.mediums[3].Xi[1] +pipe3.mediums[2].Xi[1] +pipe3.mediums[2].p pipe3.mediums[3].T -pipe3.mediums[4].p -pipe3.mediums[4].Xi[1] +pipe3.mediums[3].Xi[1] +pipe3.mediums[3].p pipe3.mediums[4].T -pipe3.mediums[5].p -pipe3.mediums[5].Xi[1] +pipe3.mediums[4].Xi[1] +pipe3.mediums[4].p pipe3.mediums[5].T -pipe4.mediums[1].p -pipe4.mediums[1].Xi[1] +pipe3.mediums[5].Xi[1] +pipe3.mediums[5].p pipe4.mediums[1].T -pipe4.mediums[2].p -pipe4.mediums[2].Xi[1] +pipe4.mediums[1].Xi[1] +pipe4.mediums[1].p pipe4.mediums[2].T -pipe4.mediums[3].p -pipe4.mediums[3].Xi[1] +pipe4.mediums[2].Xi[1] +pipe4.mediums[2].p pipe4.mediums[3].T -pipe4.mediums[4].p -pipe4.mediums[4].Xi[1] +pipe4.mediums[3].Xi[1] +pipe4.mediums[3].p pipe4.mediums[4].T -pipe4.mediums[5].p +pipe4.mediums[4].Xi[1] +pipe4.mediums[4].p +pipe4.mediums[5].T pipe4.mediums[5].Xi[1] -pipe4.mediums[5].T \ No newline at end of file +pipe4.mediums[5].p diff --git a/ModelicaTest/Media/TestAllProperties/IncompleteMedia/ReferenceMoistAir/comparisonSignals.txt b/ModelicaTest/Media/TestAllProperties/IncompleteMedia/ReferenceMoistAir/comparisonSignals.txt index f35467ec5..6a50c254e 100644 --- a/ModelicaTest/Media/TestAllProperties/IncompleteMedia/ReferenceMoistAir/comparisonSignals.txt +++ b/ModelicaTest/Media/TestAllProperties/IncompleteMedia/ReferenceMoistAir/comparisonSignals.txt @@ -21,8 +21,4 @@ a MM h2 d2 -err_T -err_d -err_u s_is -err_h_is diff --git a/ModelicaTest/Media/TestAllProperties/MoistAir/comparisonSignals.txt b/ModelicaTest/Media/TestAllProperties/MoistAir/comparisonSignals.txt index b34627857..a707fcc9a 100644 --- a/ModelicaTest/Media/TestAllProperties/MoistAir/comparisonSignals.txt +++ b/ModelicaTest/Media/TestAllProperties/MoistAir/comparisonSignals.txt @@ -28,9 +28,5 @@ dddX[2] MM h2 d2 -err_T -err_d -err_u s_is -err_h_is eps diff --git a/ModelicaTest/Media/TestOnly/R134a_setState_pTX/comparisonSignals.txt b/ModelicaTest/Media/TestOnly/R134a_setState_pTX/comparisonSignals.txt index e4f79ad16..4e0f2a47b 100644 --- a/ModelicaTest/Media/TestOnly/R134a_setState_pTX/comparisonSignals.txt +++ b/ModelicaTest/Media/TestOnly/R134a_setState_pTX/comparisonSignals.txt @@ -3,4 +3,4 @@ h rho mu cp -k \ No newline at end of file +k diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/DryAirNasa/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/DryAirNasa/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/DryAirNasa/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/DryAirNasa/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/MoistAir/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/MoistAir/comparisonSignals.txt index 92401528a..32d1e3542 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/MoistAir/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/MoistAir/comparisonSignals.txt @@ -1,4 +1,4 @@ time -volume.medium.p +volume.medium.T volume.medium.Xi[1] -volume.medium.T \ No newline at end of file +volume.medium.p diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/SimpleAir/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/SimpleAir/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/SimpleAir/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Air/SimpleAir/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Air/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Air/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Air/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Air/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Nitrogen/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Nitrogen/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Nitrogen/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/Nitrogen/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGas/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGas/comparisonSignals.txt index 579fcff7b..08935ed24 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGas/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGas/comparisonSignals.txt @@ -1,9 +1,9 @@ time -volume.medium.p volume.medium.T volume.medium.X[1] volume.medium.X[2] volume.medium.X[3] volume.medium.X[4] volume.medium.X[5] -volume.medium.X[6] \ No newline at end of file +volume.medium.X[6] +volume.medium.p diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGasFixedComposition/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGasFixedComposition/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGasFixedComposition/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/IdealGases/SimpleNaturalGasFixedComposition/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Essotherm650/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Essotherm650/comparisonSignals.txt index cd31851e6..49bac8b7c 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Essotherm650/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Essotherm650/comparisonSignals.txt @@ -1,9 +1,9 @@ time +volume.medium.T p_start T_start h_start X_start[1] -volume.medium.T volume.ports[1].m_flow volume.ports[1].p volume.ports[1].h_outflow @@ -29,4 +29,4 @@ fixedMassFlowRate.ports[1].p fixedMassFlowRate.ports[1].h_outflow shortPipe.port_b.m_flow shortPipe.port_b.p -shortPipe.port_b.h_outflow \ No newline at end of file +shortPipe.port_b.h_outflow diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Glycol47/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Glycol47/comparisonSignals.txt index cd31851e6..49bac8b7c 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Glycol47/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Incompressible/Glycol47/comparisonSignals.txt @@ -1,9 +1,9 @@ time +volume.medium.T p_start T_start h_start X_start[1] -volume.medium.T volume.ports[1].m_flow volume.ports[1].p volume.ports[1].h_outflow @@ -29,4 +29,4 @@ fixedMassFlowRate.ports[1].p fixedMassFlowRate.ports[1].h_outflow shortPipe.port_b.m_flow shortPipe.port_b.p -shortPipe.port_b.h_outflow \ No newline at end of file +shortPipe.port_b.h_outflow diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearColdWater/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearColdWater/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearColdWater/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearColdWater/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearWater_pT/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearWater_pT/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearWater_pT/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/LinearFluid/LinearWater_pT/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/ConstantPropertyLiquidWater/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/ConstantPropertyLiquidWater/comparisonSignals.txt index cd31851e6..49bac8b7c 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/ConstantPropertyLiquidWater/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/ConstantPropertyLiquidWater/comparisonSignals.txt @@ -1,9 +1,9 @@ time +volume.medium.T p_start T_start h_start X_start[1] -volume.medium.T volume.ports[1].m_flow volume.ports[1].p volume.ports[1].h_outflow @@ -29,4 +29,4 @@ fixedMassFlowRate.ports[1].p fixedMassFlowRate.ports[1].h_outflow shortPipe.port_b.m_flow shortPipe.port_b.p -shortPipe.port_b.h_outflow \ No newline at end of file +shortPipe.port_b.h_outflow diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/IdealSteam/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/IdealSteam/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/IdealSteam/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/IdealSteam/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97OnePhase_ph/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97OnePhase_ph/comparisonSignals.txt index 19515f201..51826a863 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97OnePhase_ph/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97OnePhase_ph/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.h volume.medium.p -volume.medium.h \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_pT/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_pT/comparisonSignals.txt index f47833806..c5107b165 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_pT/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_pT/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.T volume.medium.p -volume.medium.T \ No newline at end of file diff --git a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_ph/comparisonSignals.txt b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_ph/comparisonSignals.txt index 19515f201..51826a863 100644 --- a/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_ph/comparisonSignals.txt +++ b/ModelicaTest/Media/TestsWithFluid/MediaTestModels/Water/WaterIF97_ph/comparisonSignals.txt @@ -1,3 +1,3 @@ time +volume.medium.h volume.medium.p -volume.medium.h \ No newline at end of file diff --git a/ModelicaTest/MultiBody/Forces/EngineGasForce/comparisonSignals.txt b/ModelicaTest/MultiBody/Forces/EngineGasForce/comparisonSignals.txt index d23574b2b..a9b5c0800 100644 --- a/ModelicaTest/MultiBody/Forces/EngineGasForce/comparisonSignals.txt +++ b/ModelicaTest/MultiBody/Forces/EngineGasForce/comparisonSignals.txt @@ -1,5 +1,4 @@ time -gasForce.dens gasForce.f gasForce.T gasForce.V diff --git a/ModelicaTest/MultiBody/Parts/Rotor1D/GearConstraint3/comparisonSignals.txt b/ModelicaTest/MultiBody/Parts/Rotor1D/GearConstraint3/comparisonSignals.txt index 3fc3df9c7..a907f39b9 100644 --- a/ModelicaTest/MultiBody/Parts/Rotor1D/GearConstraint3/comparisonSignals.txt +++ b/ModelicaTest/MultiBody/Parts/Rotor1D/GearConstraint3/comparisonSignals.txt @@ -6,4 +6,4 @@ revolute1.w revolute2.phi revolute2.w revolute3.phi -revolute3.w \ No newline at end of file +revolute3.w diff --git a/ModelicaTest/MultiBody/Sensors/AbsoluteSensor/comparisonSignals.txt b/ModelicaTest/MultiBody/Sensors/AbsoluteSensor/comparisonSignals.txt index 27a868288..898c7b9e7 100644 --- a/ModelicaTest/MultiBody/Sensors/AbsoluteSensor/comparisonSignals.txt +++ b/ModelicaTest/MultiBody/Sensors/AbsoluteSensor/comparisonSignals.txt @@ -1,73 +1,73 @@ time -sensor_frame_a1.r[1] -sensor_frame_a1.r[2] sensor_frame_a1.r[3] -sensor_frame_a1.v[1] -sensor_frame_a1.v[2] sensor_frame_a1.v[3] -sensor_frame_a1.a[1] -sensor_frame_a1.a[2] sensor_frame_a1.a[3] -sensor_frame_a1.angles[1] -sensor_frame_a1.angles[2] sensor_frame_a1.angles[3] -sensor_frame_a1.w[1] -sensor_frame_a1.w[2] sensor_frame_a1.w[3] -sensor_frame_a1.z[1] -sensor_frame_a1.z[2] sensor_frame_a1.z[3] -sensor_frame_a2.r[1] -sensor_frame_a2.r[2] +sensor_world1.r[3] +sensor_world1.v[3] +sensor_world1.a[3] +sensor_world1.angles[3] +sensor_world1.w[3] +sensor_world1.z[3] sensor_frame_a2.r[3] -sensor_frame_a2.v[1] -sensor_frame_a2.v[2] sensor_frame_a2.v[3] -sensor_frame_a2.a[1] -sensor_frame_a2.a[2] sensor_frame_a2.a[3] -sensor_frame_a2.angles[1] -sensor_frame_a2.angles[2] sensor_frame_a2.angles[3] -sensor_frame_a2.w[1] -sensor_frame_a2.w[2] sensor_frame_a2.w[3] -sensor_frame_a2.z[1] -sensor_frame_a2.z[2] sensor_frame_a2.z[3] -sensor_world1.r[1] +sensor_world2.r[3] +sensor_world2.v[3] +sensor_world2.a[3] +sensor_world2.angles[3] +sensor_world2.z[3] +sensor_world2.w[3] +sensor_frame_a1.r[2] +sensor_frame_a1.v[2] +sensor_frame_a1.a[2] +sensor_frame_a1.angles[2] +sensor_frame_a1.w[2] +sensor_frame_a1.z[2] sensor_world1.r[2] -sensor_world1.r[3] -sensor_world1.v[1] sensor_world1.v[2] -sensor_world1.v[3] -sensor_world1.a[1] sensor_world1.a[2] -sensor_world1.a[3] -sensor_world1.angles[1] sensor_world1.angles[2] -sensor_world1.angles[3] -sensor_world1.w[1] sensor_world1.w[2] -sensor_world1.w[3] -sensor_world1.z[1] sensor_world1.z[2] -sensor_world1.z[3] -sensor_world2.r[1] +sensor_frame_a2.r[2] +sensor_frame_a2.v[2] +sensor_frame_a2.a[2] +sensor_frame_a2.angles[2] +sensor_frame_a2.w[2] +sensor_frame_a2.z[2] sensor_world2.r[2] -sensor_world2.r[3] -sensor_world2.v[1] sensor_world2.v[2] -sensor_world2.v[3] -sensor_world2.a[1] sensor_world2.a[2] -sensor_world2.a[3] -sensor_world2.angles[1] sensor_world2.angles[2] -sensor_world2.angles[3] -sensor_world2.w[1] +sensor_world2.z[2] sensor_world2.w[2] -sensor_world2.w[3] +sensor_frame_a1.r[1] +sensor_frame_a1.v[1] +sensor_frame_a1.a[1] +sensor_frame_a1.angles[1] +sensor_frame_a1.w[1] +sensor_frame_a1.z[1] +sensor_world1.r[1] +sensor_world1.v[1] +sensor_world1.a[1] +sensor_world1.angles[1] +sensor_world1.w[1] +sensor_world1.z[1] +sensor_frame_a2.r[1] +sensor_frame_a2.v[1] +sensor_frame_a2.a[1] +sensor_frame_a2.angles[1] +sensor_frame_a2.w[1] +sensor_frame_a2.z[1] +sensor_world2.r[1] +sensor_world2.v[1] +sensor_world2.a[1] +sensor_world2.angles[1] sensor_world2.z[1] -sensor_world2.z[2] -sensor_world2.z[3] \ No newline at end of file +sensor_world2.w[1] diff --git a/ModelicaTest/Rotational/AllComponents/comparisonSignals.txt b/ModelicaTest/Rotational/AllComponents/comparisonSignals.txt index e220b374b..f0d9e0918 100644 --- a/ModelicaTest/Rotational/AllComponents/comparisonSignals.txt +++ b/ModelicaTest/Rotational/AllComponents/comparisonSignals.txt @@ -1,35 +1,35 @@ time -inertia2.phi -inertia2.w +accelerate.phi +accelerate.w +clutch.phi_rel +clutch.w_rel damper.phi_rel damper.w_rel -springDamper.phi_rel -springDamper.w_rel -inertia3.phi -inertia3.w elastoBacklash.phi_rel elastoBacklash.w_rel -bearingFriction.mode -clutch.phi_rel -clutch.w_rel -clutch.mode -brake.mode -lossyGear.mode gear2_1.phi_rel gear2_1.w_rel -gear2_1.lossyGear.mode +inertia13.phi +inertia13.w +inertia14.phi +inertia14.w +inertia15.phi +inertia2.phi +inertia2.w +inertia3.phi +inertia3.w inertia8.phi inertia8.w position.phi position.w speed.phi speed.w -accelerate.phi -accelerate.w -inertia13.phi -inertia13.w -inertia14.phi -inertia14.w -inertia15.phi +springDamper.phi_rel +springDamper.w_rel +bearingFriction.mode +brake.mode +clutch.mode +gear2_1.lossyGear.mode +lossyGear.mode coupling.w -coupling.tau \ No newline at end of file +coupling.tau diff --git a/ModelicaTest/Rotational/ForUsersGuide/SupportTorque1/comparisonSignals.txt b/ModelicaTest/Rotational/ForUsersGuide/SupportTorque1/comparisonSignals.txt index 8a9f00474..ad9d24d01 100644 --- a/ModelicaTest/Rotational/ForUsersGuide/SupportTorque1/comparisonSignals.txt +++ b/ModelicaTest/Rotational/ForUsersGuide/SupportTorque1/comparisonSignals.txt @@ -2,5 +2,3 @@ time inertia4.phi inertia4.w bearingFriction1.mode -bearingFriction1.startBackward -bearingFriction1.startForward diff --git a/ModelicaTest/Rotational/TestBearingConversion/comparisonSignals.txt b/ModelicaTest/Rotational/TestBearingConversion/comparisonSignals.txt index 381805838..3cc43571f 100644 --- a/ModelicaTest/Rotational/TestBearingConversion/comparisonSignals.txt +++ b/ModelicaTest/Rotational/TestBearingConversion/comparisonSignals.txt @@ -40,17 +40,9 @@ slidingMass.v slidingMass1.s slidingMass1.v bearingFriction.mode -bearingFriction.startBackward -bearingFriction.startForward bearingFriction1.mode -bearingFriction1.startBackward -bearingFriction1.startForward brake.mode -brake.startBackward -brake.startForward brake1.mode -brake1.startBackward -brake1.startForward gear2_1.lossyGear.mode gear2_2.lossyGear.mode lossyGear.mode diff --git a/ModelicaTest/Rotational/TestBraking/comparisonSignals.txt b/ModelicaTest/Rotational/TestBraking/comparisonSignals.txt index f7c255e72..da6c44d51 100644 --- a/ModelicaTest/Rotational/TestBraking/comparisonSignals.txt +++ b/ModelicaTest/Rotational/TestBraking/comparisonSignals.txt @@ -10,4 +10,4 @@ inertia4.w inertia5.phi inertia5.w inertia6.phi -inertia6.w \ No newline at end of file +inertia6.w diff --git a/ModelicaTest/Rotational/TestFriction/comparisonSignals.txt b/ModelicaTest/Rotational/TestFriction/comparisonSignals.txt index 9076feb40..592731990 100644 --- a/ModelicaTest/Rotational/TestFriction/comparisonSignals.txt +++ b/ModelicaTest/Rotational/TestFriction/comparisonSignals.txt @@ -12,13 +12,6 @@ inertia5.w oneWayClutch.phi_rel oneWayClutch.w_rel bearingFriction.mode -bearingFriction.startBackward -bearingFriction.startForward brake.mode -brake.startBackward -brake.startForward clutch.mode -clutch.startBackward -clutch.startForward -oneWayClutch.startForward oneWayClutch.stuck diff --git a/ModelicaTest/Tables/CombiTable2Ds/Test26/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Ds/Test26/comparisonSignals.txt index c6e328a0d..175186f26 100644 --- a/ModelicaTest/Tables/CombiTable2Ds/Test26/comparisonSignals.txt +++ b/ModelicaTest/Tables/CombiTable2Ds/Test26/comparisonSignals.txt @@ -1,6 +1,6 @@ time t_new.y d_t_new.y -d2_t_new.y clock1.y -clock2.y \ No newline at end of file +clock2.y +d2_t_new.y diff --git a/ModelicaTest/Tables/CombiTable2Ds/Test27/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Ds/Test27/comparisonSignals.txt index c6e328a0d..175186f26 100644 --- a/ModelicaTest/Tables/CombiTable2Ds/Test27/comparisonSignals.txt +++ b/ModelicaTest/Tables/CombiTable2Ds/Test27/comparisonSignals.txt @@ -1,6 +1,6 @@ time t_new.y d_t_new.y -d2_t_new.y clock1.y -clock2.y \ No newline at end of file +clock2.y +d2_t_new.y diff --git a/ModelicaTest/Tables/CombiTable2Dv/Test26/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Dv/Test26/comparisonSignals.txt index 98aa976a9..46a532c90 100644 --- a/ModelicaTest/Tables/CombiTable2Dv/Test26/comparisonSignals.txt +++ b/ModelicaTest/Tables/CombiTable2Dv/Test26/comparisonSignals.txt @@ -1,6 +1,6 @@ time t_new.y[1] d_t_new.y -d2_t_new.y clock1.y -clock2.y \ No newline at end of file +clock2.y +d2_t_new.y diff --git a/ModelicaTest/Tables/CombiTable2Dv/Test27/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Dv/Test27/comparisonSignals.txt index 98aa976a9..46a532c90 100644 --- a/ModelicaTest/Tables/CombiTable2Dv/Test27/comparisonSignals.txt +++ b/ModelicaTest/Tables/CombiTable2Dv/Test27/comparisonSignals.txt @@ -1,6 +1,6 @@ time t_new.y[1] d_t_new.y -d2_t_new.y clock1.y -clock2.y \ No newline at end of file +clock2.y +d2_t_new.y diff --git a/ModelicaTest/Translational/TestBraking/comparisonSignals.txt b/ModelicaTest/Translational/TestBraking/comparisonSignals.txt index 9b5827146..f5b1c599a 100644 --- a/ModelicaTest/Translational/TestBraking/comparisonSignals.txt +++ b/ModelicaTest/Translational/TestBraking/comparisonSignals.txt @@ -10,4 +10,4 @@ mass4.v mass5.s mass5.v mass6.s -mass6.v \ No newline at end of file +mass6.v From 3f05e2fff6475cd0817bdb188707fbb12911ae0a Mon Sep 17 00:00:00 2001 From: Thomas Beutlich Date: Fri, 24 Jan 2025 16:33:29 +0100 Subject: [PATCH 2/2] Add missing comparisonSignals.txt from MSL d2592ead8b --- .../Exponentiation/comparisonSignals.txt | 8 ++ .../ZeroThresholds/comparisonSignals.txt | 6 ++ .../comparisonSignals.txt | 3 + .../comparisonSignals.txt | 3 + .../TestLinearPower/comparisonSignals.txt | 2 + .../comparisonSignals.txt | 26 +++++ .../comparisonSignals.txt | 10 ++ .../QuaternionFromT/comparisonSignals.txt | 97 +++++++++++++++++++ .../Test35/comparisonSignals.txt | 4 + .../Test35/comparisonSignals.txt | 4 + .../comparisonSignals.txt | 5 + .../Test32/comparisonSignals.txt | 5 + .../Test33/comparisonSignals.txt | 5 + .../comparisonSignals.txt | 5 + .../Test32/comparisonSignals.txt | 5 + .../Test33/comparisonSignals.txt | 5 + .../Test89/comparisonSignals.txt | 3 + 17 files changed, 196 insertions(+) create mode 100644 ModelicaTest/Blocks/Exponentiation/comparisonSignals.txt create mode 100644 ModelicaTest/Blocks/ZeroThresholds/comparisonSignals.txt create mode 100644 ModelicaTest/Electrical/Machines/DCPM_CurrentControlled/comparisonSignals.txt create mode 100644 ModelicaTest/Electrical/Machines/DCPM_SpeedControlled/comparisonSignals.txt create mode 100644 ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower/comparisonSignals.txt create mode 100644 ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck/comparisonSignals.txt create mode 100644 ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck2/comparisonSignals.txt create mode 100644 ModelicaTest/MultiBody/Frames/QuaternionFromT/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable1Ds/Test35/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable1Dv/Test35/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable2Ds/OneSidedDerivative2D/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable2Ds/Test32/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable2Ds/Test33/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable2Dv/OneSidedDerivative2D/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable2Dv/Test32/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTable2Dv/Test33/comparisonSignals.txt create mode 100644 ModelicaTest/Tables/CombiTimeTable/Test89/comparisonSignals.txt diff --git a/ModelicaTest/Blocks/Exponentiation/comparisonSignals.txt b/ModelicaTest/Blocks/Exponentiation/comparisonSignals.txt new file mode 100644 index 000000000..7f32a937e --- /dev/null +++ b/ModelicaTest/Blocks/Exponentiation/comparisonSignals.txt @@ -0,0 +1,8 @@ +time +evenExponent.y +oddExponent.y +oneExponent.y +zeroExponent.y +nonInteger.y +sqrtExponent.y +inverse.y diff --git a/ModelicaTest/Blocks/ZeroThresholds/comparisonSignals.txt b/ModelicaTest/Blocks/ZeroThresholds/comparisonSignals.txt new file mode 100644 index 000000000..0438bcf2a --- /dev/null +++ b/ModelicaTest/Blocks/ZeroThresholds/comparisonSignals.txt @@ -0,0 +1,6 @@ +time +ramp.y +greaterThreshold.y +greaterEqualThreshold.y +lessThreshold.y +lessEqualThreshold.y diff --git a/ModelicaTest/Electrical/Machines/DCPM_CurrentControlled/comparisonSignals.txt b/ModelicaTest/Electrical/Machines/DCPM_CurrentControlled/comparisonSignals.txt new file mode 100644 index 000000000..5c157ab18 --- /dev/null +++ b/ModelicaTest/Electrical/Machines/DCPM_CurrentControlled/comparisonSignals.txt @@ -0,0 +1,3 @@ +time +dcpm.iA +dcpm.w diff --git a/ModelicaTest/Electrical/Machines/DCPM_SpeedControlled/comparisonSignals.txt b/ModelicaTest/Electrical/Machines/DCPM_SpeedControlled/comparisonSignals.txt new file mode 100644 index 000000000..5c157ab18 --- /dev/null +++ b/ModelicaTest/Electrical/Machines/DCPM_SpeedControlled/comparisonSignals.txt @@ -0,0 +1,3 @@ +time +dcpm.iA +dcpm.w diff --git a/ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower/comparisonSignals.txt b/ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower/comparisonSignals.txt new file mode 100644 index 000000000..be59cc0a3 --- /dev/null +++ b/ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower/comparisonSignals.txt @@ -0,0 +1,2 @@ +time +p diff --git a/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck/comparisonSignals.txt b/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck/comparisonSignals.txt new file mode 100644 index 000000000..59ec10a9c --- /dev/null +++ b/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck/comparisonSignals.txt @@ -0,0 +1,26 @@ +time +pipeAV_B2.state_a.h +pipeAV_B2.state_b.h +pipeAV_B3.state_a.h +pipeAV_B3.state_b.h +pipeAV_B4.state_a.h +pipeAV_B4.state_b.h +pipeA_VB2.state_a.h +pipeA_VB2.state_b.h +pipeA_VB3.state_a.h +pipeA_VB3.state_b.h +pipeA_VB4.state_a.h +pipeA_VB4.state_b.h +pipeAV_VB2.state_a.h +pipeAV_VB2.state_b.h +pipeAV_VB3.state_a.h +pipeAV_VB3.state_b.h +pipeAV_VB4.state_a.h +pipeAV_VB4.state_b.h +pipeA_V_B2.state_a.h +pipeA_V_B2.state_b.h +pipeA_V_B3.state_a.h +pipeA_V_B3.state_b.h +pipeA_V_B4.state_a.h +pipeA_V_B4.state_b.h + diff --git a/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck2/comparisonSignals.txt b/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck2/comparisonSignals.txt new file mode 100644 index 000000000..a71ea99bc --- /dev/null +++ b/ModelicaTest/Fluid/TestComponents/Pipes/DynamicPipeEnergyConservationCheck2/comparisonSignals.txt @@ -0,0 +1,10 @@ +time +total_AV_B_a +total_AV_B_b +total_A_VB_a +total_A_VB_b +total_AV_VB_a +total_AV_VB_b +total_A_V_B_a +total_A_V_B_b + diff --git a/ModelicaTest/MultiBody/Frames/QuaternionFromT/comparisonSignals.txt b/ModelicaTest/MultiBody/Frames/QuaternionFromT/comparisonSignals.txt new file mode 100644 index 000000000..de17a0250 --- /dev/null +++ b/ModelicaTest/MultiBody/Frames/QuaternionFromT/comparisonSignals.txt @@ -0,0 +1,97 @@ +time +Q1[1] +Q1[2] +Q1[3] +Q1[4] +Q2[1] +Q2[2] +Q2[3] +Q2[4] +Q3[1] +Q3[2] +Q3[3] +Q3[4] +Q4[1] +Q4[2] +Q4[3] +Q4[4] +Q5[1] +Q5[2] +Q5[3] +Q5[4] +Q6[1] +Q6[2] +Q6[3] +Q6[4] +Q7[1] +Q7[2] +Q7[3] +Q7[4] +Q8[1] +Q8[2] +Q8[3] +Q8[4] +Q9[1] +Q9[2] +Q9[3] +Q9[4] +Q10[1] +Q10[2] +Q10[3] +Q10[4] +Q11[1] +Q11[2] +Q11[3] +Q11[4] +Q12[1] +Q12[2] +Q12[3] +Q12[4] +Q13[1] +Q13[2] +Q13[3] +Q13[4] +Q14[1] +Q14[2] +Q14[3] +Q14[4] +Q15[1] +Q15[2] +Q15[3] +Q15[4] +Q16[1] +Q16[2] +Q16[3] +Q16[4] +Q17[1] +Q17[2] +Q17[3] +Q17[4] +Q18[1] +Q18[2] +Q18[3] +Q18[4] +Q19[1] +Q19[2] +Q19[3] +Q19[4] +Q20[1] +Q20[2] +Q20[3] +Q20[4] +Q21[1] +Q21[2] +Q21[3] +Q21[4] +Q22[1] +Q22[2] +Q22[3] +Q22[4] +Q23[1] +Q23[2] +Q23[3] +Q23[4] +Q24[1] +Q24[2] +Q24[3] +Q24[4] diff --git a/ModelicaTest/Tables/CombiTable1Ds/Test35/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable1Ds/Test35/comparisonSignals.txt new file mode 100644 index 000000000..35f27d0a1 --- /dev/null +++ b/ModelicaTest/Tables/CombiTable1Ds/Test35/comparisonSignals.txt @@ -0,0 +1,4 @@ +time +t_new.y[1] +d_t_new.y +clock.y diff --git a/ModelicaTest/Tables/CombiTable1Dv/Test35/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable1Dv/Test35/comparisonSignals.txt new file mode 100644 index 000000000..35f27d0a1 --- /dev/null +++ b/ModelicaTest/Tables/CombiTable1Dv/Test35/comparisonSignals.txt @@ -0,0 +1,4 @@ +time +t_new.y[1] +d_t_new.y +clock.y diff --git a/ModelicaTest/Tables/CombiTable2Ds/OneSidedDerivative2D/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Ds/OneSidedDerivative2D/comparisonSignals.txt new file mode 100644 index 000000000..b9fd9b625 --- /dev/null +++ b/ModelicaTest/Tables/CombiTable2Ds/OneSidedDerivative2D/comparisonSignals.txt @@ -0,0 +1,5 @@ +time +der1.y +der2.y +der3.y +der4.y diff --git a/ModelicaTest/Tables/CombiTable2Ds/Test32/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Ds/Test32/comparisonSignals.txt new file mode 100644 index 000000000..74eccb62c --- /dev/null +++ b/ModelicaTest/Tables/CombiTable2Ds/Test32/comparisonSignals.txt @@ -0,0 +1,5 @@ +time +t_new.y +d_t_new.y +clock1.y +clock2.y diff --git a/ModelicaTest/Tables/CombiTable2Ds/Test33/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Ds/Test33/comparisonSignals.txt new file mode 100644 index 000000000..9ae6e986a --- /dev/null +++ b/ModelicaTest/Tables/CombiTable2Ds/Test33/comparisonSignals.txt @@ -0,0 +1,5 @@ +time +t_new.y +d_t_new.y +trapezoid1.y +trapezoid2.y diff --git a/ModelicaTest/Tables/CombiTable2Dv/OneSidedDerivative2D/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Dv/OneSidedDerivative2D/comparisonSignals.txt new file mode 100644 index 000000000..b9fd9b625 --- /dev/null +++ b/ModelicaTest/Tables/CombiTable2Dv/OneSidedDerivative2D/comparisonSignals.txt @@ -0,0 +1,5 @@ +time +der1.y +der2.y +der3.y +der4.y diff --git a/ModelicaTest/Tables/CombiTable2Dv/Test32/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Dv/Test32/comparisonSignals.txt new file mode 100644 index 000000000..1b908bc79 --- /dev/null +++ b/ModelicaTest/Tables/CombiTable2Dv/Test32/comparisonSignals.txt @@ -0,0 +1,5 @@ +time +t_new.y[1] +d_t_new.y +clock1.y +clock2.y diff --git a/ModelicaTest/Tables/CombiTable2Dv/Test33/comparisonSignals.txt b/ModelicaTest/Tables/CombiTable2Dv/Test33/comparisonSignals.txt new file mode 100644 index 000000000..b69b0a0b0 --- /dev/null +++ b/ModelicaTest/Tables/CombiTable2Dv/Test33/comparisonSignals.txt @@ -0,0 +1,5 @@ +time +t_new.y[1] +d_t_new.y +trapezoid1.y +trapezoid2.y diff --git a/ModelicaTest/Tables/CombiTimeTable/Test89/comparisonSignals.txt b/ModelicaTest/Tables/CombiTimeTable/Test89/comparisonSignals.txt new file mode 100644 index 000000000..e96bf91b3 --- /dev/null +++ b/ModelicaTest/Tables/CombiTimeTable/Test89/comparisonSignals.txt @@ -0,0 +1,3 @@ +time +t_new.y[1] +d_t_new.y