Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ add_library(${TARGET_NAME} SHARED
${HEADERS}
${SOURCES}
${MODEL_NAME}/buildDescription.xml
${MODEL_NAME}/FMI${FMI_VERSION}.xml
)

file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fmus)
Expand Down
6 changes: 6 additions & 0 deletions Clocks/FMI3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@
<Output valueReference="2004" dependencies="1001 1002 1003"/>
<Output valueReference="2005" dependencies="1002 2006"/>
<Output valueReference="2007" dependencies="1003"/>
<InitialUnknown valueReference="1005"/>
<InitialUnknown valueReference="2001"/>
<InitialUnknown valueReference="2002"/>
<InitialUnknown valueReference="2003"/>
<InitialUnknown valueReference="2004"/>
<InitialUnknown valueReference="2005"/>
<InitialUnknown valueReference="2007"/>
</ModelStructure>
<!--
time 0 1 2 3 4 5 6 7 8 9
Expand Down
8 changes: 4 additions & 4 deletions Feedthrough/FMI2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,18 @@

<ModelStructure>
<Outputs>
<Unknown index="5" dependencies="2 3 4" dependenciesKind="constant constant constant"/>
<Unknown index="5" dependencies="4" dependenciesKind="constant"/>
<Unknown index="7" dependencies="6" dependenciesKind="constant"/>
<Unknown index="9" dependencies="8" dependenciesKind="constant"/>
<Unknown index="11" dependencies="10 12" dependenciesKind="constant"/>
<Unknown index="11" dependencies="10" dependenciesKind="constant"/>
<Unknown index="13" dependencies="12" dependenciesKind="constant"/>
<Unknown index="15" dependencies="14" dependenciesKind="constant"/>
</Outputs>
<InitialUnknowns>
<Unknown index="5" dependencies="2 3 4" dependenciesKind="constant constant constant"/>
<Unknown index="5" dependencies="4" dependenciesKind="constant"/>
<Unknown index="7" dependencies="6" dependenciesKind="constant"/>
<Unknown index="9" dependencies="8" dependenciesKind="constant"/>
<Unknown index="11" dependencies="10 12" dependenciesKind="constant"/>
<Unknown index="11" dependencies="10" dependenciesKind="constant"/>
<Unknown index="13" dependencies="12" dependenciesKind="constant"/>
<Unknown index="15" dependencies="14" dependenciesKind="constant"/>
</InitialUnknowns>
Expand Down
8 changes: 8 additions & 0 deletions build/merge_binaries.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,14 @@ def get_unit(variable):
os.makedirs(dist_merged / version)
merge_fmus(version)

# validate the merged FMUs
for root_dir, _dirs, files in os.walk(dist_merged):
for file in files:
if file.endswith(".fmu"):
fmu_path = os.path.join(root_dir, file)
print(f"Validating {file}...")
check_call(["fmusim", "validate", fmu_path])

results_dir = root / 'dist-merged' / 'results'

os.makedirs(results_dir, exist_ok=True)
Expand Down