Skip to content

Commit 5e3b097

Browse files
author
Marcus Walther
committed
Merge remote-tracking branch 'originMW/master' into masterMW
Conflicts: openmodelica/cppruntime/hpcom/Modelica.Electrical.Analog.Examples.CauerLowPassSC_level_omp.mos openmodelica/cppruntime/hpcom/Modelica.Electrical.Analog.Examples.CauerLowPassSC_levelfix_memory.mos openmodelica/cppruntime/hpcom/Modelica.Electrical.Spice3.Examples.CoupledInductors_level.mos
2 parents 5824e7b + bc2c184 commit 5e3b097

File tree

180 files changed

+67205
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+67205
-0
lines changed

‎Makefile~‎

Lines changed: 615 additions & 0 deletions
Large diffs are not rendered by default.

‎bootstrapping.log‎

Lines changed: 295 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,295 @@
1+
make[1]: Verzeichnis »/home/marcus/workspace/openmodelica/openmodelica/OpenModelica-testsuite/openmodelica/bootstrapping« wird betreten
2+
3+
Running tests...
4+
5+
OPENMODELICAHOME= /home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build
6+
+ DumpTest ... execution failed
7+
8+
==== Log /tmp/omc-rtest-marcus/openmodelica/bootstrapping/log-DumpTest.mos
9+
"
10+
"
11+
""
12+
true
13+
""
14+
true
15+
true
16+
"DumpGraphviz.dump"
17+
graph AST {
18+
GVNOD0[label="ROOT"];GVNOD1[label="PURE FUNCTION"];GVNOD1 -- GVNOD0;
19+
}
20+
+ SimplifyOperator ... execution failed
21+
22+
==== Log /tmp/omc-rtest-marcus/openmodelica/bootstrapping/log-ExpressionTest.mos
23+
+ GraphTest ... execution failed
24+
25+
==== Log /tmp/omc-rtest-marcus/openmodelica/bootstrapping/log-GraphTest.mos
26+
+ HashTable Unit Testing ... ok [time:14]
27+
+ PriorityQueue ... execution failed
28+
29+
==== Log /tmp/omc-rtest-marcus/openmodelica/bootstrapping/log-PriorityQueue.mos
30+
"
31+
"
32+
""
33+
true
34+
""
35+
{}
36+
""
37+
{record PriorityQueue.Tree.NODE
38+
elt = (1,{}),
39+
rank = 0,
40+
trees = {}
41+
end PriorityQueue.Tree.NODE;}
42+
""
43+
(1,{})
44+
""
45+
{record PriorityQueue.Tree.NODE
46+
elt = (1,{}),
47+
rank = 1,
48+
trees = {record PriorityQueue.Tree.NODE
49+
elt = (3,{}),
50+
rank = 0,
51+
trees = {}
52+
end PriorityQueue.Tree.NODE;}
53+
end PriorityQueue.Tree.NODE;}
54+
""
55+
(1,{})
56+
""
57+
{record PriorityQueue.Tree.NODE
58+
elt = (2,{}),
59+
rank = 0,
60+
trees = {}
61+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
62+
elt = (1,{}),
63+
rank = 1,
64+
trees = {record PriorityQueue.Tree.NODE
65+
elt = (3,{}),
66+
rank = 0,
67+
trees = {}
68+
end PriorityQueue.Tree.NODE;}
69+
end PriorityQueue.Tree.NODE;}
70+
""
71+
(1,{})
72+
""
73+
{record PriorityQueue.Tree.NODE
74+
elt = (1,{}),
75+
rank = 2,
76+
trees = {record PriorityQueue.Tree.NODE
77+
elt = (2,{}),
78+
rank = 1,
79+
trees = {record PriorityQueue.Tree.NODE
80+
elt = (4,{}),
81+
rank = 0,
82+
trees = {}
83+
end PriorityQueue.Tree.NODE;}
84+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
85+
elt = (3,{}),
86+
rank = 0,
87+
trees = {}
88+
end PriorityQueue.Tree.NODE;}
89+
end PriorityQueue.Tree.NODE;}
90+
""
91+
(1,{})
92+
""
93+
{record PriorityQueue.Tree.NODE
94+
elt = (7,{}),
95+
rank = 0,
96+
trees = {}
97+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
98+
elt = (1,{}),
99+
rank = 2,
100+
trees = {record PriorityQueue.Tree.NODE
101+
elt = (2,{}),
102+
rank = 1,
103+
trees = {record PriorityQueue.Tree.NODE
104+
elt = (4,{}),
105+
rank = 0,
106+
trees = {}
107+
end PriorityQueue.Tree.NODE;}
108+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
109+
elt = (3,{}),
110+
rank = 0,
111+
trees = {}
112+
end PriorityQueue.Tree.NODE;}
113+
end PriorityQueue.Tree.NODE;}
114+
""
115+
(1,{})
116+
""
117+
{record PriorityQueue.Tree.NODE
118+
elt = (-2,{}),
119+
rank = 1,
120+
trees = {record PriorityQueue.Tree.NODE
121+
elt = (7,{}),
122+
rank = 0,
123+
trees = {}
124+
end PriorityQueue.Tree.NODE;}
125+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
126+
elt = (1,{}),
127+
rank = 2,
128+
trees = {record PriorityQueue.Tree.NODE
129+
elt = (2,{}),
130+
rank = 1,
131+
trees = {record PriorityQueue.Tree.NODE
132+
elt = (4,{}),
133+
rank = 0,
134+
trees = {}
135+
end PriorityQueue.Tree.NODE;}
136+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
137+
elt = (3,{}),
138+
rank = 0,
139+
trees = {}
140+
end PriorityQueue.Tree.NODE;}
141+
end PriorityQueue.Tree.NODE;}
142+
""
143+
(-2,{})
144+
""
145+
{record PriorityQueue.Tree.NODE
146+
elt = (11,{}),
147+
rank = 0,
148+
trees = {}
149+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
150+
elt = (-2,{}),
151+
rank = 1,
152+
trees = {record PriorityQueue.Tree.NODE
153+
elt = (7,{}),
154+
rank = 0,
155+
trees = {}
156+
end PriorityQueue.Tree.NODE;}
157+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
158+
elt = (1,{}),
159+
rank = 2,
160+
trees = {record PriorityQueue.Tree.NODE
161+
elt = (2,{}),
162+
rank = 1,
163+
trees = {record PriorityQueue.Tree.NODE
164+
elt = (4,{}),
165+
rank = 0,
166+
trees = {}
167+
end PriorityQueue.Tree.NODE;}
168+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
169+
elt = (3,{}),
170+
rank = 0,
171+
trees = {}
172+
end PriorityQueue.Tree.NODE;}
173+
end PriorityQueue.Tree.NODE;}
174+
""
175+
(-2,{})
176+
""
177+
{record PriorityQueue.Tree.NODE
178+
elt = (-2,{}),
179+
rank = 3,
180+
trees = {record PriorityQueue.Tree.NODE
181+
elt = (1,{}),
182+
rank = 2,
183+
trees = {record PriorityQueue.Tree.NODE
184+
elt = (2,{}),
185+
rank = 1,
186+
trees = {record PriorityQueue.Tree.NODE
187+
elt = (4,{}),
188+
rank = 0,
189+
trees = {}
190+
end PriorityQueue.Tree.NODE;}
191+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
192+
elt = (3,{}),
193+
rank = 0,
194+
trees = {}
195+
end PriorityQueue.Tree.NODE;}
196+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
197+
elt = (11,{}),
198+
rank = 1,
199+
trees = {record PriorityQueue.Tree.NODE
200+
elt = (35,{}),
201+
rank = 0,
202+
trees = {}
203+
end PriorityQueue.Tree.NODE;}
204+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
205+
elt = (7,{}),
206+
rank = 0,
207+
trees = {}
208+
end PriorityQueue.Tree.NODE;}
209+
end PriorityQueue.Tree.NODE;}
210+
""
211+
(-2,{})
212+
""
213+
{record PriorityQueue.Tree.NODE
214+
elt = (26,{}),
215+
rank = 0,
216+
trees = {}
217+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
218+
elt = (-2,{}),
219+
rank = 3,
220+
trees = {record PriorityQueue.Tree.NODE
221+
elt = (1,{}),
222+
rank = 2,
223+
trees = {record PriorityQueue.Tree.NODE
224+
elt = (2,{}),
225+
rank = 1,
226+
trees = {record PriorityQueue.Tree.NODE
227+
elt = (4,{}),
228+
rank = 0,
229+
trees = {}
230+
end PriorityQueue.Tree.NODE;}
231+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
232+
elt = (3,{}),
233+
rank = 0,
234+
trees = {}
235+
end PriorityQueue.Tree.NODE;}
236+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
237+
elt = (11,{}),
238+
rank = 1,
239+
trees = {record PriorityQueue.Tree.NODE
240+
elt = (35,{}),
241+
rank = 0,
242+
trees = {}
243+
end PriorityQueue.Tree.NODE;}
244+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
245+
elt = (7,{}),
246+
rank = 0,
247+
trees = {}
248+
end PriorityQueue.Tree.NODE;}
249+
end PriorityQueue.Tree.NODE;}
250+
""
251+
(-2,{})
252+
""
253+
{record PriorityQueue.Tree.NODE
254+
elt = (1,{}),
255+
rank = 3,
256+
trees = {record PriorityQueue.Tree.NODE
257+
elt = (7,{}),
258+
rank = 2,
259+
trees = {record PriorityQueue.Tree.NODE
260+
elt = (11,{}),
261+
rank = 1,
262+
trees = {record PriorityQueue.Tree.NODE
263+
elt = (35,{}),
264+
rank = 0,
265+
trees = {}
266+
end PriorityQueue.Tree.NODE;}
267+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
268+
elt = (26,{}),
269+
rank = 0,
270+
trees = {}
271+
end PriorityQueue.Tree.NODE;}
272+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
273+
elt = (2,{}),
274+
rank = 1,
275+
trees = {record PriorityQueue.Tree.NODE
276+
elt = (4,{}),
277+
rank = 0,
278+
trees = {}
279+
end PriorityQueue.Tree.NODE;}
280+
end PriorityQueue.Tree.NODE;,record PriorityQueue.Tree.NODE
281+
elt = (3,{}),
282+
rank = 0,
283+
trees = {}
284+
end PriorityQueue.Tree.NODE;}
285+
end PriorityQueue.Tree.NODE;}
286+
""
287+
+ SimCodeTest ... execution failed
288+
289+
==== Log /tmp/omc-rtest-marcus/openmodelica/bootstrapping/log-SimCodeTest.mos
290+
+ SimplifyTest ... ok [time:24]
291+
+ SusanTest ... ok [time:26]
292+
+ System ... ok [time:0]
293+
+ UtilTest ... ok [time:4]
294+
295+
== 5 out of 10 tests failed [openmodelica/bootstrapping, time: 102]

‎openmodelica/cppruntime/BouncingBall.def‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
EXPORTS
2+
BouncingBall_fmiCompletedIntegratorStep @1
3+
BouncingBall_fmiEventUpdate @2
4+
BouncingBall_fmiFreeModelInstance @3
5+
BouncingBall_fmiGetBoolean @4
6+
BouncingBall_fmiGetContinuousStates @5
7+
BouncingBall_fmiGetDerivatives @6
8+
BouncingBall_fmiGetEventIndicators @7
9+
BouncingBall_fmiGetInteger @8
10+
BouncingBall_fmiGetModelTypesPlatform @9
11+
BouncingBall_fmiGetNominalContinuousStates @10
12+
BouncingBall_fmiGetReal @11
13+
BouncingBall_fmiGetStateValueReferences @12
14+
BouncingBall_fmiGetString @13
15+
BouncingBall_fmiGetVersion @14
16+
BouncingBall_fmiInitialize @15
17+
BouncingBall_fmiInstantiateModel @16
18+
BouncingBall_fmiSetBoolean @17
19+
BouncingBall_fmiSetContinuousStates @18
20+
BouncingBall_fmiSetDebugLogging @19
21+
BouncingBall_fmiSetExternalFunction @20
22+
BouncingBall_fmiSetInteger @21
23+
BouncingBall_fmiSetReal @22
24+
BouncingBall_fmiSetString @23
25+
BouncingBall_fmiSetTime @24
26+
BouncingBall_fmiTerminate @25

‎openmodelica/cppruntime/BouncingBall.fmu‎

1.84 MB
Binary file not shown.

‎openmodelica/cppruntime/BouncingBall.makefile‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Makefile generated by OpenModelica
2+
OMHOME=/home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build
3+
include $(OMHOME)/include/omc/cpp/ModelicaConfig_gcc.inc
4+
include $(OMHOME)/include/omc/cpp/ModelicaLibraryConfig.inc
5+
# Simulations use -O0 by default
6+
SIM_OR_DYNLOAD_OPT_LEVEL=-O0
7+
CC=gcc
8+
CXX=g++
9+
10+
EXEEXT=
11+
DLLEXT=.so
12+
CFLAGS_BASED_ON_INIT_FILE=
13+
CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -Winvalid-pch $(SYSTEM_CFLAGS) -I"$(OMHOME)/include/omc/cpp/Core" -I"$(OMHOME)/include/omc/cpp/" -I. -I"$(BOOST_INCLUDE)" -I"$(UMFPACK_INCLUDE)"
14+
CFLAGS_STATIC=$(CFLAGS) -I"$(SUNDIALS_INCLUDE)" -I"$(SUNDIALS_INCLUDE)/kinsol" -I"$(SUNDIALS_INCLUDE)/nvector"
15+
16+
MODELICA_EXTERNAL_LIBS=-lModelicaExternalC -lModelicaStandardTables -L$(LAPACK_LIBS) $(LAPACK_LIBRARIES)
17+
LDSYSTEMFLAGS=-L"$(OMHOME)/lib/x86_64-linux-gnu/omc/cpp" $(BASE_LIB) -lOMCppOMCFactory -lOMCppSystem -lOMCppModelicaUtilities -lOMCppMath -Wl,-rpath,"$(OMHOME)/lib/x86_64-linux-gnu/omc/cpp" -lOMCppExtensionUtilities -L"$(BOOST_LIBS)" $(BOOST_LIBRARIES) $(LINUX_LIB_DL)
18+
LDSYSTEMFLAGS_STATIC=$(LIBOMCPPOMCFACTORY) $(LIBOMCPPSIMCONTROLLER) $(LIBOMCPPSIMULATIONSETTINGS) $(LIBOMCPPSYSTEM) $(LIBOMCPPDATAEXCHANGE) $(LIBOMCPPNEWTON) $(LIBOMCPPUMFPACK) $(LIBOMCPPIDA) $(LIBOMCPPKINSOL) $(LIBOMCPPCVODE) $(LIBOMCPPSOLVER) $(LIBOMCPPMATH) $(LIBOMCPPMODELICAUTILITIES) -L$(SUNDIALS_LIB_DIR) $(SUNDIALS_LIBS) $(UMFPACK_LIBS) $(LAPACK_LIBS) $(LDSYSTEMFLAGS)
19+
LDMAINFLAGS=-L"$(OMHOME)/lib/x86_64-linux-gnu/omc/cpp" -L"$(OMHOME)/bin" -lOMCppOMCFactory -lOMCppModelicaUtilities -L"$(BOOST_LIBS)" $(BOOST_LIBRARIES) $(LINUX_LIB_DL) -Wl,-rpath,"$(OMHOME)/lib/x86_64-linux-gnu/omc/cpp" -lOMCppExtensionUtilities
20+
LDMAINFLAGS_STATIC=$(LIBOMCPPOMCFACTORY) $(LIBOMCPPSIMCONTROLLER) $(LIBOMCPPSIMULATIONSETTINGS) $(LIBOMCPPSYSTEM) $(LIBOMCPPDATAEXCHANGE) $(LIBOMCPPNEWTON) $(LIBOMCPPUMFPACK) $(LIBOMCPPIDA) $(LIBOMCPPKINSOL) $(LIBOMCPPCVODE) $(LIBOMCPPSOLVER) $(LIBOMCPPMATH) $(LIBOMCPPMODELICAUTILITIES) -L$(SUNDIALS_LIB_DIR) $(SUNDIALS_LIBS) $(UMFPACK_LIBS) $(LAPACK_LIBS) $(LDMAINFLAGS)
21+
CPPFLAGS = $(CFLAGS)
22+
SYSTEMFILE=OMCppBouncingBall.cpp
23+
MAINFILE = OMCppBouncingBallMain.cpp
24+
MAINOBJ=BouncingBall$(EXEEXT)
25+
SYSTEMOBJ=OMCppBouncingBall$(DLLEXT)
26+
27+
CALCHELPERMAINFILE=OMCppBouncingBallCalcHelperMain.cpp
28+
ALGLOOPSMAINFILE=OMCppBouncingBallAlgLoopMain.cpp
29+
30+
CPPFILES=$(CALCHELPERMAINFILE)
31+
OFILES=$(CPPFILES:.cpp=.o)
32+
33+
.PHONY: BouncingBall $(CPPFILES)
34+
35+
BouncingBall: $(MAINFILE) $(OFILES)
36+
ifeq ($(RUNTIME_STATIC_LINKING),ON)
37+
$(eval CFLAGS=$(CFLAGS_STATIC))
38+
$(eval LDMAINFLAGS=$(LDMAINFLAGS_STATIC))
39+
$(eval LDSYTEMFLAGS=$(LDSYSTEMFLAGS_STATIC))
40+
$(CXX) $(CPPFLAGS) -I. -o $(MAINOBJ) $(OFILES) $(MAINFILE) $(LDMAINFLAGS) $(MODELICA_EXTERNAL_LIBS)
41+
else
42+
$(CXX) -shared -o $(SYSTEMOBJ) $(OFILES) -L"/home/marcus/workspace/openmodelica/openmodelica/OpenModelica-testsuite/openmodelica/cppruntime" $(LDSYSTEMFLAGS) $(MODELICA_EXTERNAL_LIBS)
43+
$(CXX) $(CPPFLAGS) -I. -o $(MAINOBJ) $(MAINFILE) $(LDMAINFLAGS)
44+
endif
45+
46+
chmod +x BouncingBall.sh

‎openmodelica/cppruntime/BouncingBall.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
exec ./BouncingBall -s 0.0 -e 1.0 -f 0.002 -v 500 -y 1e-06 -i dassl -r /home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build/lib/x86_64-linux-gnu/omc/cpp/ -m /home/marcus/workspace/openmodelica/openmodelica/OpenModelica-testsuite/openmodelica/cppruntime/ -R /home/marcus/workspace/openmodelica/openmodelica/OpenModelica-testsuite/openmodelica/cppruntime//BouncingBall_res.mat -o mat $*

‎openmodelica/cppruntime/BouncingBall_FMU.libs‎

Whitespace-only changes.

‎openmodelica/cppruntime/BouncingBall_FMU.log‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
g++ -Winvalid-pch -O0 -g -DNDEBUG -fPIC -DBOOST_ALL_DYN_LINK -DRUNTIME_PROFILING -DOMC_BUILD -DUSE_INTEL_TBB -DUSE_PUGI_XML -DUSE_PAPI -DUSE_BOOST_LOG -DUSE_BOOST_THREAD -DSUNDIALS_MAJOR_VERSION=2 -DSUNDIALS_MINOR_VERSION=5 -DPMC_USE_SUNDIALS -DUSE_UMFPACK -I"/home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build/include/omc/cpp" -I"/usr/local/include" -I"/home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build/include/omc/cpp/Core" -I"/home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build/include/omc/cpp/SimCoreFactory" -I"/usr/include" -c -o OMCppBouncingBallCalcHelperMain.o OMCppBouncingBallCalcHelperMain.cpp
2+
g++ -shared -o BouncingBall.so OMCppBouncingBallCalcHelperMain.o -L"/home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build/lib/x86_64-linux-gnu/omc/cpp" -L"/usr/lib/x86_64-linux-gnu" -lOMCppSystem_FMU -lOMCppDataExchange_static -lOMCppOMCFactory -lOMCppMath_static -Wl,-rpath,"/home/marcus/workspace/openmodelica/openmodelica/OMCompiler/build/lib/x86_64-linux-gnu/omc/cpp" -lModelicaExternalC -lModelicaStandardTables -L/usr/lib -llapack -lf77blas -latlas -lboost_system -lboost_filesystem -lboost_program_options -ldl
3+
rm -rf binaries
4+
mkdir -p "binaries/"linux64""
5+
cp BouncingBall.so "binaries/"linux64"/"
6+
rm -f BouncingBall.fmu
7+
zip -r "BouncingBall.fmu" modelDescription.xml binaries
8+
adding: modelDescription.xml (deflated 78%)
9+
adding: binaries/ (stored 0%)
10+
adding: binaries/linux64/ (stored 0%)
11+
adding: binaries/linux64/BouncingBall.so (deflated 71%)
12+
rm -rf binaries

0 commit comments

Comments
 (0)