Skip to content

Commit

Permalink
Update test results
Browse files Browse the repository at this point in the history
  - Initial unknowns from OpenModelica FMUs are now correct.
    Removed warnings from reference results.
  • Loading branch information
AnHeuermann committed Mar 29, 2021
1 parent 083af48 commit de06f9b
Show file tree
Hide file tree
Showing 15 changed files with 7 additions and 75 deletions.
18 changes: 0 additions & 18 deletions testsuite/OMSimulator/PI_Controller.lua
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,6 @@ oms_terminate("PI_Controller")
oms_delete("PI_Controller")

-- Result:
-- warning: [P: resources/0002_P.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [P: resources/0002_P.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [gainPI: resources/0006_gainPI.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [gainPI: resources/0006_gainPI.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [limiter: resources/0007_limiter.fmu] The FMU lists 0 initial unknowns but actually contains 5 initial unknowns as per the variable definitions.
-- info: [limiter: resources/0007_limiter.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [gainTrack: resources/0009_gainTrack.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [gainTrack: resources/0009_gainTrack.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [limiter: resources/0007_limiter.fmu] The FMU lists 0 initial unknowns but actually contains 5 initial unknowns as per the variable definitions.
-- info: [limiter: resources/0007_limiter.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [gainTrack: resources/0009_gainTrack.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [gainTrack: resources/0009_gainTrack.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [gainPI: resources/0006_gainPI.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [gainPI: resources/0006_gainPI.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [P: resources/0002_P.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [P: resources/0002_P.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- info: Parameter settings
-- info: PI_Controller.co_sim.addP.k1: 1.0
-- info: PI_Controller.co_sim.addP.k2: -1.0
Expand All @@ -137,6 +121,4 @@ oms_delete("PI_Controller")
-- info: Simulation
-- info: limiter.u: -10.146734070551
-- info: limiter.y: -10.146734070551
-- info: 8 warnings
-- info: 0 errors
-- endResult
4 changes: 1 addition & 3 deletions testsuite/OMSimulator/deleteConnector.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ print(src)


-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- <?xml version="1.0"?>
-- <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="deleteConnector" version="1.0">
-- <ssd:System name="Root">
Expand Down Expand Up @@ -276,6 +274,6 @@ print(src)
-- </ssd:DefaultExperiment>
-- </ssd:SystemStructureDescription>
--
-- info: 3 warnings
-- info: 2 warnings
-- info: 0 errors
-- endResult
4 changes: 1 addition & 3 deletions testsuite/OMSimulator/deleteStartValues.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ src = oms_list("deleteStartValues")
print(src)

-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- <?xml version="1.0"?>
-- <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="deleteStartValues" version="1.0">
-- <ssd:System name="Root">
Expand Down Expand Up @@ -285,6 +283,6 @@ print(src)
-- </ssd:DefaultExperiment>
-- </ssd:SystemStructureDescription>
--
-- info: 3 warnings
-- info: 2 warnings
-- info: 0 errors
-- endResult
4 changes: 1 addition & 3 deletions testsuite/OMSimulator/deleteStartValuesInSSV.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ oms_delete("deleteStartValuesInSSV")


-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- <?xml version="1.0"?>
-- <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="deleteStartValuesInSSV" version="1.0">
-- <ssd:System name="Root">
Expand Down Expand Up @@ -133,6 +131,6 @@ oms_delete("deleteStartValuesInSSV")
-- warning: failed to delete start value "deleteStartValuesInSSV.Root.C3:start" because the identifier couldn't be resolved to any system signal
-- warning: failed to delete start value "deleteStartValuesInSSV.Root.System1.C4:start" because the identifier couldn't be resolved to any system signal
-- warning: failed to delete start value "deleteStartValuesInSSV.Root.System1.Gain.j:start" because the identifier couldn't be resolved to any component signal
-- info: 4 warnings
-- info: 3 warnings
-- info: 0 errors
-- endResult
4 changes: 0 additions & 4 deletions testsuite/OMSimulator/exportConnectorsToResultFile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ oms_terminate("exportConnectors")
oms_delete("exportConnectors")

-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- info: Before Setting Start Values
-- info: exportConnectors.Root.C1 : 0.0
-- info: exportConnectors.Root.C3 : 0.0
Expand Down Expand Up @@ -170,6 +168,4 @@ oms_delete("exportConnectors")
-- </ssd:DefaultExperiment>
-- </ssd:SystemStructureDescription>
--
-- info: 1 warnings
-- info: 0 errors
-- endResult
4 changes: 0 additions & 4 deletions testsuite/OMSimulator/exportSSMTemplate.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ readFile("gain1.ssm")


-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- <?xml version="1.0" encoding="UTF-8"?>
-- <ssm:ParameterMapping xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" version="1.0">
-- <ssm:MappingEntry source="" target="add.u2" />
Expand All @@ -61,6 +59,4 @@ readFile("gain1.ssm")
-- <ssm:MappingEntry source="" target="Gain.k" />
-- </ssm:ParameterMapping>
--
-- info: 1 warnings
-- info: 0 errors
-- endResult
4 changes: 0 additions & 4 deletions testsuite/OMSimulator/exportSSMTemplate.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ def readFile(filename):


## Result:
## warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
## info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
## <?xml version="1.0" encoding="UTF-8"?>
## <ssm:ParameterMapping xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" version="1.0">
## <ssm:MappingEntry source="" target="add.u2" />
Expand All @@ -64,6 +62,4 @@ def readFile(filename):
## <ssm:MappingEntry source="" target="Gain.k" />
## </ssm:ParameterMapping>
##
## info: 1 warnings
## info: 0 errors
## endResult
4 changes: 0 additions & 4 deletions testsuite/OMSimulator/exportSSVTemplate.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ readFile("gain.ssv")


-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- <?xml version="1.0" encoding="UTF-8"?>
-- <ssv:ParameterSet xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" version="1.0" name="modelDescriptionStartValues">
-- <ssv:Parameters>
Expand Down Expand Up @@ -90,6 +88,4 @@ readFile("gain.ssv")
-- </ssv:Parameters>
-- </ssv:ParameterSet>
--
-- info: 1 warnings
-- info: 0 errors
-- endResult
6 changes: 1 addition & 5 deletions testsuite/OMSimulator/import_export_parameters_inline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ oms_terminate("import_export_parameters")
oms_delete("import_export_parameters")

-- Result:
-- warning: [P: resources/0002_P.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [P: resources/0002_P.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- error: [addConnection] Connector addP.k1 is already connected to k_cref
-- <?xml version="1.0"?>
-- <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="import_export_parameters" version="1.0">
Expand Down Expand Up @@ -310,8 +308,6 @@ oms_delete("import_export_parameters")
-- </ssd:DefaultExperiment>
-- </ssd:SystemStructureDescription>
--
-- warning: [P: resources/0002_P.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [P: resources/0002_P.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- info: model doesn't contain any continuous state
-- info: Parameter settings
-- info: import_export_parameters.co_sim.addP.k1 : 10.0
Expand Down Expand Up @@ -350,6 +346,6 @@ oms_delete("import_export_parameters")
-- info: import_export_parameters.co_sim.k_cref : 30.0
-- info: import_export_parameters.co_sim.Output_cref : -600.0
-- info: import_export_parameters.co_sim.foo.F_cref : 40.0
-- info: 2 warnings
-- info: 0 warnings
-- info: 1 errors
-- endResult
6 changes: 1 addition & 5 deletions testsuite/OMSimulator/import_export_parameters_to_ssv.lua
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ oms_terminate("import_export_parameters")
oms_delete("import_export_parameters")

-- Result:
-- warning: [P: resources/0002_P.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [P: resources/0002_P.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- error: [addConnection] Connector addP.k1 is already connected to k_cref
-- <?xml version="1.0"?>
-- <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="import_export_parameters" version="1.0">
Expand Down Expand Up @@ -252,8 +250,6 @@ oms_delete("import_export_parameters")
-- </ssd:DefaultExperiment>
-- </ssd:SystemStructureDescription>
--
-- warning: [P: resources/0002_P.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [P: resources/0002_P.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- info: model doesn't contain any continuous state
-- info: Parameter settings
-- info: import_export_parameters.co_sim.addP.k1 : 10.0
Expand Down Expand Up @@ -292,6 +288,6 @@ oms_delete("import_export_parameters")
-- info: import_export_parameters.co_sim.k_cref : 30.0
-- info: import_export_parameters.co_sim.Output_cref : -600.0
-- info: import_export_parameters.co_sim.foo.F_cref : 40.0
-- info: 2 warnings
-- info: 0 warnings
-- info: 1 errors
-- endResult
6 changes: 0 additions & 6 deletions testsuite/OMSimulator/import_export_signalFilter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ oms_delete("model")


-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- <?xml version="1.0"?>
-- <oms:snapshot
-- partial="false">
Expand Down Expand Up @@ -280,6 +276,4 @@ oms_delete("model")
-- "time", "model.root.Gain.u", "model.root.System2.Input_1", "model.root.Gain.k"
-- 0, 0, 30, 1
--
-- info: 2 warnings
-- info: 0 errors
-- endResult
4 changes: 0 additions & 4 deletions testsuite/OMSimulator/setExternalInputs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ oms_terminate("setExternalInputs")
oms_delete("setExternalInputs")

-- Result:
-- warning: [Gain: resources/0001_Gain.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [Gain: resources/0001_Gain.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- info: Result file: setExternalInputs_res.mat (bufferSize=10)
-- info: setExternalInputs.Root.Gain.u at time 1.0: 0.0
-- info: setExternalInputs.Root.Gain.u at time 3.0: 5.0
Expand Down Expand Up @@ -87,6 +85,4 @@ oms_delete("setExternalInputs")
-- </ssd:DefaultExperiment>
-- </ssd:SystemStructureDescription>
--
-- info: 1 warnings
-- info: 0 errors
-- endResult
6 changes: 1 addition & 5 deletions testsuite/api/test03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ oms_delete("test")
-- </ssd:DefaultExperiment>
-- </ssd:SystemStructureDescription>
--
-- warning: [source: resources/0002_source.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [source: resources/0002_source.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- warning: [source: resources/0001_source.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
-- info: [source: resources/0001_source.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
-- error: [getResourceNode] Failed to find node "resources/signalFilter.xml"
-- status: [correct] ok
-- <?xml version="1.0"?>
Expand Down Expand Up @@ -173,6 +169,6 @@ oms_delete("test")
-- </ssd:SystemStructureDescription>
--
-- info: Result file: test_res.mat (bufferSize=10)
-- info: 3 warnings
-- info: 0 warnings
-- info: 1 errors
-- endResult
6 changes: 1 addition & 5 deletions testsuite/api/test03.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@ def printStatus(status, expected):
## </ssd:DefaultExperiment>
## </ssd:SystemStructureDescription>
##
## warning: [source: resources/0002_source.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
## info: [source: resources/0002_source.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
## warning: [source: resources/0001_source.fmu] The FMU lists 0 initial unknowns but actually contains 1 initial unknowns as per the variable definitions.
## info: [source: resources/0001_source.fmu] The FMU contains bad initial unknowns. This might cause problems, e.g. wrong simulation results.
## error: [getResourceNode] Failed to find node "resources/signalFilter.xml"
## status: [correct] ok
## <?xml version="1.0"?>
Expand Down Expand Up @@ -165,6 +161,6 @@ def printStatus(status, expected):
## </ssd:SystemStructureDescription>
##
## info: Result file: test_res.mat (bufferSize=10)
## info: 3 warnings
## info: 0 warnings
## info: 1 errors
## endResult
2 changes: 0 additions & 2 deletions testsuite/tlm/tlmsignals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,4 @@ end
-- wc1.out is equal
-- wc2.out is equal
-- info: Logging information has been saved to "tlmsignals.log"
-- info: 4 warnings
-- info: 0 errors
-- endResult

0 comments on commit de06f9b

Please sign in to comment.