Skip to content

Tests Co-Simulation with CVODE for FMUs #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnHeuermann merged 2 commits into from
Sep 23, 2025
Merged

Tests Co-Simulation with CVODE for FMUs #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc95de
[WIP] Jenkinsfile updated for CVODE FMU
AnHeuermann Sep 18, 2025
47184fe
Adding flag `--fmuType` to test CS FMUs
AnHeuermann Sep 23, 2025
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
55 changes: 55 additions & 0 deletions .CI/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ pipeline {
booleanParam(name: 'fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)')
booleanParam(name: 'fmi_master', defaultValue: false, description: 'master branch with FMI running OMSimulator (ryzen-5950x-2)')

booleanParam(name: 'cs_fmu_cvode_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
booleanParam(name: 'cs_fmu_cvode_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
booleanParam(name: 'cs_fmu_cvode_master', defaultValue: false, description: 'master branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')

booleanParam(name: 'fmpy_fmi_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch with FMI (ryzen-5950x-2)')
booleanParam(name: 'fmpy_fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)')
booleanParam(name: 'fmpy_fmi_master', defaultValue: false, description: 'master branch with FMI running FMPy (ryzen-5950x-2)')
Expand Down Expand Up @@ -173,6 +177,54 @@ pipeline {
}
}

stage('v1.24 CVODE CS-FMUs with OMSimulator') {
agent {
node {
label 'ryzen-5950x-2-1'
customWorkspace 'ws/OpenModelicaLibraryTestingWork'
}
}
options { skipDefaultCheckout() }
when {
beforeAgent true
expression { params.cs_fmu_cvode_v1_24 }
}
steps {
runRegressiontest('maintenance/v1.24', 'v1.24-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
}
}
stage('v1.25 CVODE CS-FMUs with OMSimulator') {
agent {
node {
label 'ryzen-5950x-2-1'
customWorkspace 'ws/OpenModelicaLibraryTestingWork'
}
}
options { skipDefaultCheckout() }
when {
beforeAgent true
expression { params.cs_fmu_cvode_v1_25 }
}
steps {
runRegressiontest('maintenance/v1.25', 'v1.25-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
}
}
stage('master CVODE CS-FMUs with OMSimulator') {
agent {
node {
label 'ryzen-5950x-2-1'
customWorkspace 'ws/OpenModelicaLibraryTestingWork'
}
}
options { skipDefaultCheckout() }
when {
beforeAgent true
expression { params.cs_fmu_cvode_master }
}
steps {
runRegressiontest('master', 'master-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
}
}

stage('v1.24 FMI with FMPy') {
agent {
Expand Down Expand Up @@ -648,6 +700,9 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
${env.HOME}/saved_omc/OMSimulator/install/bin/OMSimulator --version
"""
FMI_TESTING_FLAG="--fmi=true --fmisimulator=${env.HOME}/saved_omc/OMSimulator/install/bin/OMSimulator --default=ulimitExe=50"
if (name.containts('cvode')) {
FMI_TESTING_FLAG += "--fmuType='cs'"
}
}

if (name.contains('fmpy')) {
Expand Down
4 changes: 3 additions & 1 deletion test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
parser.add_argument('configs', nargs='*')
parser.add_argument('--branch', default='master')
parser.add_argument('--fmi', default=False)
parser.add_argument('--fmuType', default='me', help="FMU type: 'me' for Model Exchange, 'cs' for Co-Simulation.")
parser.add_argument('--basemodelica-mtk-import', action="store_true", default=False, help='Activate Base Modelica export and test import with BaseModelica.jl / ModelingToolkit.jl.')
parser.add_argument('--julia-sys-image', action=argparse.BooleanOptionalAction, default=True, help='Activate pre-compiling Julia system image.')
parser.add_argument('--output', default='')
Expand Down Expand Up @@ -71,6 +72,7 @@
basemodelica_mtk_import = args.basemodelica_mtk_import
julia_sys_image = args.julia_sys_image
allTestsFmi = args.fmi
fmuType = args.fmuType
ulimitMemory = args.ulimitvmem
docker = args.docker
addmsl = args.addmsl
Expand Down Expand Up @@ -620,7 +622,7 @@ def hashReferenceFiles(s):
conf["haveFMI"] = fmiOK_C
conf["haveFMICpp"] = fmiOK_Cpp
conf["fmisimulator"] = fmisimulator
conf["fmuType"] = conf.get("fmuType", "me")
conf["fmuType"] = fmuType
if (not canChangeOptLevel) and "optlevel" in conf:
print("Deleting optlevel")
del conf["optlevel"]
Expand Down
Loading