Skip to content

Commit

Permalink
bump libraries (ThermoSysPro) & update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrpo
adrpo committed Nov 25, 2019
1 parent a0f80a0 commit 19bc4e1
Show file tree
Hide file tree
Showing 24 changed files with 1 addition and 135 deletions.
2 changes: 1 addition & 1 deletion libraries
Submodule libraries updated 2 files
+7 −7 Makefile.libs
+1 −1 repos.json
11 changes: 0 additions & 11 deletions .../ThermoSysPro/ThermoSysPro.Examples.CombinedCyclePowerPlant.CombinedCycle_Load_100_50.mos
View file
Expand Up @@ -448,17 +448,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.Combine
// [ThermoSysPro 3.2/Properties/WaterSteam/Common.mo:918:3-971:26:writable] Warning: pro.x was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/C3H3F5/C3H3F5_Ps.mo:2:1-106:14:writable] Warning: props.ddsp was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/C3H3F5/C3H3F5_Ps.mo:2:1-106:14:writable] Warning: props.ddps was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s1sat_P.mo:5:3-5:89:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:6:3-6:22:writable] Warning: Invalid public variable coef1, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:7:3-7:22:writable] Warning: Invalid public variable coef2, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:6:3-6:22:writable] Warning: Invalid public variable coef1, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:7:3-7:22:writable] Warning: Invalid public variable coef2, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Enthalpy/h1_Ps.mo:7:3-7:87:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd1sp_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd1ps_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Enthalpy/h2_Ps.mo:7:3-7:87:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd2sp_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd2ps_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/prop4_Ps.mo:78:3-78:60:writable] Warning: dh1satp was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/prop4_Ps.mo:78:3-78:60:writable] Warning: dh2satp was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
Expand Down
11 changes: 0 additions & 11 deletions ...arty/ThermoSysPro/ThermoSysPro.Examples.CombinedCyclePowerPlant.CombinedCycle_TripTAC.mos
View file
Expand Up @@ -444,17 +444,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.Combine
// [ThermoSysPro 3.2/Properties/WaterSteam/Common.mo:918:3-971:26:writable] Warning: pro.x was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/C3H3F5/C3H3F5_Ps.mo:2:1-106:14:writable] Warning: props.ddsp was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/C3H3F5/C3H3F5_Ps.mo:2:1-106:14:writable] Warning: props.ddps was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s1sat_P.mo:5:3-5:89:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:6:3-6:22:writable] Warning: Invalid public variable coef1, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:7:3-7:22:writable] Warning: Invalid public variable coef2, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:6:3-6:22:writable] Warning: Invalid public variable coef1, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Entropy/s2sat_P.mo:7:3-7:22:writable] Warning: Invalid public variable coef2, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Enthalpy/h1_Ps.mo:7:3-7:87:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd1sp_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd1ps_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Enthalpy/h2_Ps.mo:7:3-7:87:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd2sp_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/dd2ps_Ps.mo:8:3-9:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/prop4_Ps.mo:78:3-78:60:writable] Warning: dh1satp was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/prop4_Ps.mo:78:3-78:60:writable] Warning: dh2satp was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
Expand Down
4 changes: 0 additions & 4 deletions ...aries/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestCentrifugalPump4.mos
View file
Expand Up @@ -74,10 +74,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet$lumpedStraightPipe$C1 is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d1sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d2sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu1_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu2_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/ElectroMechanics/Connectors.mo:3:3-36:24:writable] Warning: Connector .ThermoSysPro.ElectroMechanics.Connectors.MechanichalTorque is not balanced: The number of potential variables (2) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Machines/CentrifugalPump.mo:137:3-139:9:writable] Error: Missing else-clause in if-equation with non-parameter conditions.
// Warning: The model contains alias variables with conflicting start and/or nominal values. It is recommended to resolve the conflicts, because otherwise the system could be hard to solve. To print the conflicting alias sets and the chosen candidates please use -d=aliasConflicts.
Expand Down
4 changes: 0 additions & 4 deletions ...n/libraries/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestCheckValve.mos
View file
Expand Up @@ -79,10 +79,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d1sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d2sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu1_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu2_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
Expand Down
4 changes: 0 additions & 4 deletions .../libraries/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestDynamicDrum.mos
View file
Expand Up @@ -79,10 +79,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet$lumpedStraightPipe$C1 is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d1sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d2sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu1_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu2_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// Warning: The model contains alias variables with conflicting start and/or nominal values. It is recommended to resolve the conflicts, because otherwise the system could be hard to solve. To print the conflicting alias sets and the chosen candidates please use -d=aliasConflicts.
// "
// {"Files Equal!"}
Expand Down
4 changes: 0 additions & 4 deletions ...ies/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestDynamicReliefValve.mos
View file
Expand Up @@ -70,10 +70,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/prop4_Ph.mo:76:3-76:60:writable] Warning: dh2satp was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d1sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d2sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu1_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu2_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
Expand Down
4 changes: 0 additions & 4 deletions ...es/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestDynamicWaterHeating.mos
View file
Expand Up @@ -276,10 +276,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet$PressureLoss_Steam$C1 is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d1sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d2sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu1_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu2_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// Warning: The model contains alias variables with conflicting start and/or nominal values. It is recommended to resolve the conflicts, because otherwise the system could be hard to solve. To print the conflicting alias sets and the chosen candidates please use -d=aliasConflicts.
// "
// {"Files Equal!"}
Expand Down
4 changes: 0 additions & 4 deletions ...raries/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestIdealCheckValve.mos
View file
Expand Up @@ -75,10 +75,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d1sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Density/d2sat_T.mo:6:3-7:73:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu1_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/Properties/WaterSteamSimple/Viscosity/mu2_dT.mo:6:3-6:88:writable] Warning: Invalid public variable coef, function variables that are not input/output must be protected.
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:87:3-127:18:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidOutlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
// [ThermoSysPro 3.2/WaterSteam/Connectors.mo:3:3-43:17:writable] Warning: Connector .ThermoSysPro.WaterSteam.Connectors.FluidInlet is not balanced: The number of potential variables (4) is not equal to the number of flow variables (0).
Expand Down

0 comments on commit 19bc4e1

Please sign in to comment.