Skip to content

Commit c00ae19

Browse files
HansOlssonHansOlsson
committed
Merge remote-tracking branch 'origin/AddDerCheck' into AddDerCheck
2 parents 88e863a + e070734 commit c00ae19

23 files changed

Lines changed: 150 additions & 167 deletions

File tree

‎.CI/Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,14 @@ def allAutotools() {
197197
def autotools(CC, CPPFLAGS, config, nostatic, dotest) {
198198
sh label: "Build $CC $CPPFLAGS", script: """
199199
export CC=$CC
200-
export CPPFLAGS="$CPPFLAGS -I${WORKSPACE}/.CI/Test"
200+
export CPPFLAGS=$CPPFLAGS
201201
export CFLAGS="-Os -fPIC"
202202
rm -rf Modelica/Resources/Library/*
203203
mkdir -p Modelica/Resources/Library/\$LIBDIR
204204
cd Modelica/Resources/BuildProjects/autotools
205205
git clean -fdx .
206206
./autogen.sh
207-
./configure --libdir="${WORKSPACE}/Modelica/Resources/Library/\$LIBDIR" $config
207+
./configure --libdir="\$PWD/../../Library/\$LIBDIR" $config
208208
make --output-sync -j${numPhysicalCPU()}
209209
make install
210210
"""
@@ -223,7 +223,7 @@ def makefile(CC, dotest) {
223223
rm -rf Modelica/Resources/Library/*
224224
mkdir -p "Modelica/Resources/Library/$LIBDIR"
225225
cd Modelica/Resources/BuildProjects/gcc
226-
make --output-sync -j${numPhysicalCPU()} TARGETDIR="$LIBDIR" CPPFLAGS="-I${WORKSPACE}/.CI/Test"
226+
make --output-sync -j${numPhysicalCPU()} TARGETDIR="$LIBDIR"
227227
"""
228228
sh label: "Test $CC", script: """
229229
export CC=$CC

‎.CI/Test/Common.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ModelicaUtilities.h"
1+
#include "../../Modelica/Resources/C-Sources/ModelicaUtilities.h"
22
#include <assert.h>
33
#include <stdlib.h>
44
#include <stdio.h>

‎.github/workflows/checkCI.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
pushd Modelica/Resources/BuildProjects/autotools
2626
git clean -fdx .
2727
./autogen.sh
28-
./configure --libdir="$PWD/../../Library/$LIBDIR" --enable-static --disable-shared --enable-static-zlib --disable-hdf5 CPPFLAGS="-I${GITHUB_WORKSPACE}/.CI/Test"
28+
./configure --libdir="$PWD/../../Library/$LIBDIR" --enable-static --disable-shared --enable-static-zlib --disable-hdf5
2929
popd
3030
env:
3131
LIBDIR: linux64
@@ -79,15 +79,14 @@ jobs:
7979
- name: Configure
8080
run: |
8181
if [ "${{ matrix.compiler }}" == "msvc" ]; then
82-
cmake -S "$SRCDIR" -B build -DMODELICA_UTILITIES_INCLUDE_DIR="$TESTDIR" -DMODELICA_DEBUG_TIME_EVENTS=ON
82+
cmake -S "$SRCDIR" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON
8383
elif [ "${{ matrix.compiler }}" == "mingw" ]; then
84-
cmake -S "$SRCDIR" -B build -DMODELICA_UTILITIES_INCLUDE_DIR="$TESTDIR" -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -G "MinGW Makefiles"
84+
cmake -S "$SRCDIR" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -G "MinGW Makefiles"
8585
else
86-
cmake -S "$SRCDIR" -B build -DMODELICA_UTILITIES_INCLUDE_DIR="$TESTDIR" -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DCMAKE_C_FLAGS="-std=c89 -Wall -Wextra"
86+
cmake -S "$SRCDIR" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DCMAKE_C_FLAGS="-std=c89 -Wall -Wextra"
8787
fi
8888
env:
8989
SRCDIR: ${{ github.workspace }}/Modelica/Resources
90-
TESTDIR: ${{ github.workspace }}/.CI/Test
9190
- name: Build with ${{ matrix.compiler }}
9291
run: |
9392
if [ "${{ matrix.compiler }}" == "msvc" ]; then
@@ -120,12 +119,11 @@ jobs:
120119
- name: Configure
121120
run: |
122121
export PATH=/usr/bin:$PATH
123-
cmake -S "$(cygpath ${SRCDIR})" -B build -DMODELICA_UTILITIES_INCLUDE_DIR="$(cygpath ${TESTDIR})" -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=Debug -G Ninja
122+
cmake -S "$(cygpath ${SRCDIR})" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=Debug -G Ninja
124123
shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
125124
env:
126125
CYGWIN_NOWINPATH: 1
127126
SRCDIR: ${{ github.workspace }}/Modelica/Resources
128-
TESTDIR: ${{ github.workspace }}/.CI/Test
129127
- name: Build with gcc
130128
run: |
131129
export PATH=/usr/bin:$PATH

‎Modelica/Fluid/Sensors.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ through the sensor is allowed.
696696
extends Sensors.BaseClasses.PartialRelativeSensor;
697697

698698
Modelica.Blocks.Interfaces.RealOutput T_rel(final quantity="ThermodynamicTemperature",
699-
final unit = "K", displayUnit = "degC", min=0)
699+
final unit = "K", displayUnit = "degC")
700700
"Relative temperature signal" annotation (Placement(
701701
transformation(
702702
origin={0,-90},

‎Modelica/Fluid/Vessels.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ of the modeller. Increase nPorts to add an additional port.
307307
end for;
308308
// Check for correct solution
309309
assert(fluidLevel <= fluidLevel_max, "Vessel is overflowing (fluidLevel > fluidLevel_max = " + String(fluidLevel) + ")");
310-
assert(fluidLevel > -1e-6*fluidLevel_max, "Fluid level (= " + String(fluidLevel) + ") is below zero meaning that the solution failed.");
310+
assert(fluidLevel > 0, "Fluid level is too small, the tank cannot be completely empty otherwise the energy balance equation becomes singular.");
311311

312312
// Boundary conditions
313313

‎Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50A.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ record M400_50A "M400-50A"
6868
1.80182103074219; 8000,1.82045219174860; 8500,1.83870653811386; 9000,
6969
1.85653503322130; 9500,1.87395783314220; 12500,1.97103027714719; 25000,
7070
2.24590928827217; 37500,2.39119879383466; 50000,2.40689879383466],
71-
sigma=3.22e6);
71+
sigma=2.22e6);
7272

7373
annotation (Documentation(info="<html>
7474
<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\">

‎Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_YD.mo‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ model IMC_YD "Induction machine with squirrel cage starting Y-D"
9898
TsOperational=293.15,
9999
effectiveStatorTurns=imcData.effectiveStatorTurns,
100100
alpha20r=imcData.alpha20r,
101-
TrOperational=293.15)
101+
TrOperational=293.15,
102+
stator(zeroInductor(i0(nominal=10))))
102103
annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
103104
Modelica.Electrical.Machines.Sensors.CurrentQuasiRMSSensor
104105
currentQuasiRMSSensor annotation (Placement(transformation(extent={{-10,10},{10,-10}}, rotation=270,

‎Modelica/Media/Air/ReferenceMoistAir.mo‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,15 +2820,15 @@ for region 2.
28202820
if (T >= 773.15) then
28212821
cp := X[1]*
28222822
Modelica.Media.Air.ReferenceMoistAir.Utilities.IF97_new.cp_pT(pd,
2823-
T) + X[2]*Modelica.Media.Air.ReferenceAir.Air_Utilities.cp_pT(pl,
2823+
T) + (1 - X[1])*Modelica.Media.Air.ReferenceAir.Air_Utilities.cp_pT(pl,
28242824
T) + Modelica.Media.Air.ReferenceMoistAir.Utilities.cp_dis_pTX(
28252825
p,
28262826
T,
28272827
X);
28282828
else
28292829
cp := X[1]*
28302830
Modelica.Media.Air.ReferenceMoistAir.Utilities.IF97_new.cp_pT(pd,
2831-
T) + X[2]*Modelica.Media.Air.ReferenceAir.Air_Utilities.cp_pT(pl,
2831+
T) + (1 - X[1])*Modelica.Media.Air.ReferenceAir.Air_Utilities.cp_pT(pl,
28322832
T);
28332833
end if;
28342834
else
@@ -2866,7 +2866,7 @@ for region 2.
28662866
if ((xw <= xws) or (xws == -1)) then
28672867
cv := X[1]*
28682868
Modelica.Media.Air.ReferenceMoistAir.Utilities.IF97_new.cv_pT(pd, T)
2869-
+ X[2]*Modelica.Media.Air.ReferenceAir.Air_Utilities.cv_pT(pl, T);
2869+
+ (1 - X[1])*Modelica.Media.Air.ReferenceAir.Air_Utilities.cv_pT(pl, T);
28702870
else
28712871
cv := -1;
28722872
end if;
@@ -2952,7 +2952,7 @@ for region 2.
29522952
if (useDissociation == false) then
29532953
u := 0;
29542954
else
2955-
massFraction := {X[1],X[2]*Xi_Air[1],X[2]*Xi_Air[2],X[2]*Xi_Air[3]};
2955+
massFraction := {X[1],(1 - X[1])*Xi_Air[1],(1 - X[1])*Xi_Air[2],(1 - X[1])*Xi_Air[3]};
29562956
for i in 1:4 loop
29572957
invMMX[i] := 1/MMX[i];
29582958
end for;
@@ -3113,7 +3113,7 @@ for region 2.
31133113
if (useDissociation == false) then
31143114
u := 0;
31153115
else
3116-
massFraction := {X[1],X[2]*Xi_Air[1],X[2]*Xi_Air[2],X[2]*Xi_Air[3]};
3116+
massFraction := {X[1],(1 - X[1])*Xi_Air[1],(1 - X[1])*Xi_Air[2],(1 - X[1])*Xi_Air[3]};
31173117
for i in 1:4 loop
31183118
invMMX[i] := 1/MMX[i];
31193119
end for;
@@ -3189,7 +3189,7 @@ for region 2.
31893189
if (useDissociation == false) then
31903190
u := 0;
31913191
else
3192-
massFraction := {X[1],X[2]*Xi_Air[1],X[2]*Xi_Air[2],X[2]*Xi_Air[3]};
3192+
massFraction := {X[1],(1 - X[1])*Xi_Air[1],(1 - X[1])*Xi_Air[2],(1 - X[1])*Xi_Air[3]};
31933193
for i in 1:4 loop
31943194
invMMX[i] := 1/MMX[i];
31953195
end for;
@@ -3549,9 +3549,9 @@ for region 2.
35493549
//u := 0;
35503550
u_der := 0;
35513551
else
3552-
massFraction := {X[1],X[2]*Xi_Air[1],X[2]*Xi_Air[2],X[2]*Xi_Air[3]};
3553-
massFraction_der := {X_der[1],X_der[2]*Xi_Air[1],X_der[2]*Xi_Air[2],
3554-
X_der[2]*Xi_Air[3]};
3552+
massFraction := {X[1],(1 - X[1])*Xi_Air[1],(1 - X[1])*Xi_Air[2],(1 - X[1])*Xi_Air[3]};
3553+
massFraction_der := {X_der[1],-X_der[1]*Xi_Air[1],-X_der[1]*Xi_Air[2],
3554+
-X_der[1]*Xi_Air[3]};
35553555
for i in 1:4 loop
35563556
invMMX[i] := 1/MMX[i];
35573557
end for;

‎Modelica/Resources/BuildProjects/CMake/options.cmake‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,11 @@ option(
2121

2222
# Option whether to install ModelicaExternalC
2323
option(MODELICA_INSTALL_EXTC "Install ModelicaExternalC library" OFF)
24+
25+
# Option to enable testsuite
26+
option(MODELICA_BUILD_TESTING "Build testing" ON)
27+
28+
set(BUILD_TESTING OFF)
29+
if(MODELICA_BUILD_TESTING)
30+
set(BUILD_TESTING ON)
31+
endif()

‎Modelica/Resources/BuildProjects/CMake/test.cmake‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
include(CTest)
2-
3-
if(BUILD_TESTING)
1+
if(MODELICA_BUILD_TESTING)
42
set(MODELICA_TEST_DIR_AUX "${MODELICA_RESOURCES_DIR}/../../.CI/Test")
53
get_filename_component(MODELICA_TEST_DIR "${MODELICA_TEST_DIR_AUX}" ABSOLUTE)
64
if(EXISTS "${MODELICA_TEST_DIR}")
5+
enable_testing()
76
set(MODELICA_TESTS
87
FileSystem
98
ModelicaStrings
@@ -14,32 +13,34 @@ if(BUILD_TESTING)
1413
TablesFromTxtFile
1514
TablesNoUsertab
1615
)
17-
foreach(TEST ${MODELICA_TESTS})
18-
add_executable(Test${TEST} "${MODELICA_TEST_DIR}/${TEST}.c")
19-
target_link_libraries(Test${TEST}
16+
foreach(test_file ${MODELICA_TESTS})
17+
set(TEST_EXECUTABLE Test${test_file})
18+
add_executable(${TEST_EXECUTABLE} "${MODELICA_TEST_DIR}/${test_file}.c")
19+
target_link_libraries(${TEST_EXECUTABLE}
2020
ModelicaExternalC
2121
ModelicaStandardTables
2222
ModelicaIO
2323
ModelicaMatIO
2424
)
2525
if(MODELICA_BUILD_ZLIB)
26-
target_link_libraries(Test${TEST} zlib)
26+
target_link_libraries(${TEST_EXECUTABLE} zlib)
2727
else()
28-
target_link_libraries(Test${TEST} z)
28+
target_link_libraries(${TEST_EXECUTABLE} z)
2929
endif()
3030
if(UNIX)
31-
target_link_libraries(Test${TEST} m)
31+
target_link_libraries(${TEST_EXECUTABLE} m)
3232
endif()
33+
set_target_properties(${TEST_EXECUTABLE} PROPERTIES FOLDER "Test")
3334
add_test(
34-
NAME Test${TEST}
35-
COMMAND Test${TEST}
35+
NAME ${TEST_EXECUTABLE}
36+
COMMAND ${TEST_EXECUTABLE}
3637
WORKING_DIRECTORY "${MODELICA_TEST_DIR}"
3738
)
3839
endforeach()
3940
else()
4041
message(WARNING
4142
" Testsuite not found in \"${MODELICA_TEST_DIR}\"."
42-
" Set BUILD_TESTING to OFF to silence this warning."
43+
" Set MODELICA_BUILD_TESTING to OFF to silence this warning."
4344
)
4445
endif()
4546
endif()

0 commit comments

Comments
 (0)