simulate
(0 files, 0 lines)
[root]/testsuite/libraries/msl31/media
simulate
(0 files, 0 lines)
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| Totals | 710 (100.0%) | 61559 (100.0%) | 86.7 |
| perost | 283 (39.9%) | 41119 (66.8%) | 145.2 |
| adrpo | 211 (29.7%) | 16539 (26.9%) | 78.3 |
| sjoelund.se | 162 (22.8%) | 3853 (6.3%) | 23.7 |
| mahge930 | 1 (0.1%) | 31 (0.1%) | 31.0 |
| Frenkel TUD | 16 (2.3%) | 17 (0.0%) | 1.0 |
| alash325 | 37 (5.2%) | 0 (0.0%) | 0.0 |
-- testsuite/3rdparty/AVM + testsuite/3rdparty/ThermoSysPro are temporarily moved to testsuite directory + testsiuite/Libraries + testsuite/mofiles + testsuite/3rdparty are deleted from SVN
0 lines of code changed in 37 files:
- Changed Util.swap to work as expected (i.e. swap on true).
18 lines of code changed in 6 files:
- Expected output
70 lines of code changed in 8 files:
#1801
- Fix problem with matrix-vector operations being converted into array-multiplication of vector and scalar
- All tests that worked still work except for one: ./libraries/msl31/simulate/Modelica.Mechanics.MultiBody.Examples.Elementary.PointGravityWithPointMasses2.mos, presumably because of a better solution now
18 lines of code changed in 6 files:
- Fixed MSL 3.1 warning from not-yet-commited changes for #1776
* [IF97_Utilities.mo:4942:9-4959:18:writable] Warning: found was used before it was defined (given a value). Additional such uses may exist for the variable, but some messages were suppressed.
6 lines of code changed in 6 files:
- Removed space after first parenthesis when dumping asserts in DAEDump, to ease
the transition to a template based dumper.
238 lines of code changed in 11 files:
Fix for bug #1774:
- Better sorting of elements in Inst.instElementList by considering qualified crefs.
- Added testcase Modelica.StateGraph.Examples.ControlledTanks.
- Enabled the forgotten Modelica.Blocks.Continuous testcase.
213 lines of code changed in 25 files:
- Updated MSL 3.1 to latest SIunits.mo; disabled Modelica.Thermal.FluidHeatFlow.Examples.TwoMass.mos due to simulation failing to solve a nonlinear equation now
2520 lines of code changed in 35 files:
- move libraries_msl31_media_simulate.Modelica.Media.Examples.SimpleLiquidWater.mos failing test because failed because medium.T is not as potential state marked and as state selected, so a function call has to be solved implicit
1 lines of code changed in 1 file:
- move linearize.test_01.mos to failing test because failed to generated derived algorithm because algorithm outputs not equal and known variables are assigned in algorithm
- move 3rdParty_PlanarMechanics.PlanarMechanicsForTesting.Examples.KinematicLoop.mos failing test because failed because of wrong initial values
- move libraries_msl31_media_simulate.Modelica.Media.Examples.SimpleLiquidWater.mos failing test because failed because medium.T is not as potential state marked and as state selected, so a function call has to be solved implicit
- move libraries_msl31_simulate.Modelica.Mechanics.Translational.Examples.Friction.mos failing test until it is fixed
2 lines of code changed in 1 file:
#1764
- Improve sorting of package.order elements
+ Actually sorted now
+ Handle MSL 3.2-style Math.mo where elements may be inserted in the middle of the package.mo
0 lines of code changed in 2 files:
- Removed Absyn.ELEMENT.name (redundant and wrong)
#1764
- Changed ClassLoader to respect package.order
+ This means most packages are parsed differently than before and many tests (especially Media) changed
12 lines of code changed in 2 files:
#1767
- Marked strings for translation in Error.mo
- Removed some useless whitespace from a few error-messages
0 lines of code changed in 2 files:
- fix tests
12 lines of code changed in 12 files:
- fix tests
2 lines of code changed in 2 files:
- Implemented a new template based expression dumping.
- Updated test suite.
3114 lines of code changed in 30 files:
Fix for bug #1731:
- Fixed connection of arrays with subscripts.
- Updated testsuit due to changed equation order for connects.
15 lines of code changed in 1 file:
- Fixed correct types on array-scalar and scalar-array operations.
- Updated test cases due to changed operation order.
956 lines of code changed in 29 files:
- Changed the Dependency+SCode+Inst calls everywhere to:
+ CevalScript.runFrontEnd(...), which does more error-checking
- Removed Inst.{instantiate,instProgram} as they are not needed (they were used to inst the last class of the program; which can be performed by asking for the last class of the program and instantiating that)
14 lines of code changed in 5 files:
- MAKE CLEAN is highly recommended!
Modelica.Media:
- fix some Modelica.Media code generation issues in CodegenC.expTypeFlag.
- fix a Modelica.Media bug in the library, see ticket: https://trac.modelica.org/Modelica/ticket/710
in libraries/Modelica 3.1/Media/IdealGases/Common/package.mo and updated libraries/README.
- add 2 more models that simulate now to the testsuite/libraries/msl31/media/simulate/Makefile (1 more to have full Modelica.Media)
Bootstrapping:
- collect inputs/outputs temps into tmpMeta.
- added System.tmpTickIndexReserve to get the index and reserve N.
- some preliminary changes to the GC (not ON yet), more updates to come.
- circumvent MinGW GCC 4.4.0 -O2/-O3 optimization issues via making the for iterator in matchcontinue be float (see meta_modelica.h)
note that if you use -O3 you will also need -fno-inline-functions (see testsuite/bootstrapping/LinkMain.makefile.mingw)
11 lines of code changed in 4 files:
- replace array constants with their binding (maybe we should only do that for package constants).
- added testsuite/3rdParty/TestMedia [from Francesco Casella] which now works to simulate too.
- 17 more Modelica.Media models now work, 3 left.
NOTE HOWEVER that simulation fails in some cases due to
divisions by zero or other issues, but at
least the models compile.
98 lines of code changed in 12 files:
- expected output.
3 lines of code changed in 3 files:
- expected output
1 lines of code changed in 1 file:
- expected output
- 3 media/simulate models fail now!
2 lines of code changed in 2 files:
+ The test-suite makefile now contain DEPENDENCIES. This are the files that are needed for the test cases.
+ "make clean" or (make -j clean) will clean the test-suite. i.e. all files that are not listed as DEPENDENCIES will be cleaned.
For OMDEV/MINGW ppl (linux already has partest)
+ "make threaded" will clean and then run the test-suite with 5 threads (my pc has 4 cores so :) ). (or just use "make -jN")
- 'msl31simulation.log' and 'msl31mediasimulation.log' still give problems with multiple threads. Very strange problem since the
output matches exactly with the expected but for some reason it is compared with outputs from another file. But For now this might help a bit.
Normal test-suite operation is not affected in anyway as far as I can tell. (Just some additions)
31 lines of code changed in 1 file:
- Added rule exp[] => exp (ASUB'ing nothing does nothing)
Finds diff like the following for Modelica.Media
- 190.56[],0.01604246[],9.86e-05[],0.011[],0.0[]
+ 190.56,0.01604246,0.0000986,0.011,0.0
39 lines of code changed in 2 files:
- Set svn-eol-style on a few files
37 lines of code changed in 37 files:
- Avoid failure to reach fixpoint for some simplifications
6 lines of code changed in 2 files:
HUGE update to SVN with *a lot* of changes: DO MAKE CLEAN!
==========================================================
- The DAE.ExpType is *no more*
- The BackendDAE.Type is *no more*
Both got replaced by DAE.Type!
- The DAE.ExpVar is *no more*
It got replaced by DAE.Var!
Now we have *ONLY ONE* type in the compiler: DAE.Type!
Just to know why I got this done:
BEFORE, the model HumMod took 6m51 seconds to instantiate
adrpo@ida-liu050 ~/dev/OpenModelica/doc/performance/benchmarks/tests
$ time /c/OpenModelica1.8.0-r10584/bin/omc instHumMod.mos > trace.txt 2>&1
real 6m51.354s
user 0m0.000s
sys 0m0.015s
AFTER, the model HumMod takes 47 seconds to instantiate
adrpo@ida-liu050 ~/dev/OpenModelica/doc/performance/benchmarks/tests
$ time ../../../../build/bin/omc instHumMod.mos > mytrace.txt 2>&1
real 0m47.248s
user 0m0.000s
sys 0m0.000s
Is about 8,74468085106383 times faster now.
Basically, before, we were doing DAE.T_*
-> DAE.ET_* translation for 6 minutes!
I started this work on Friday after the OpenModelica 1.8.0
got released, so for 4+ days of work I think the result is
quite OK.
Crash course into the new types (actually old ones from DAE.Type):
==================================================================
1. DAE.Type is not a tuple anymore, instead the optional path
became DAE.TypeSource which is a list of paths and is now
part of *all* the records in DAE.Type.
The needed types from DAE.ExpType got merged into DAE.Type:
DAE.ET_METATYPE -> DAE.T_METATYPE
DAE.ET_FUNCTION_REFERENCE_VAR -> DAE.T_FUNCTION_REFERENCE_VAR
DAE.ET_FUNCTION_REFERENCE_FUNC -> DAE.T_FUNCTION_REFERENCE_FUNC
Some DAE.Type types got split:
DAE.T_COMPLEX split into DAE.T_COMPLEX for types not extending
basic types and DAE.T_SUBTYPE_BASIC is now used for types
extending basic types.
Some DAE.Type types changed name:
DAE.T_NOTYPE -> DAE.T_UNKNOWN
Renamed also the meta-types a bit to make them more homogeneous.
Some DAE.ExpType are gone:
DAE.ET_OTHER is gone, use DAE.T_UNKNOWN instead!
Some DAE.Type types changed structure (besides the DAE.TypeSource addition):
(DAE.T_ARRAY(dim, ty), optPath) -> DAE.T_ARRAY(ty, list<dim>, list<Path>)
so we now have similar structure for DAE.T_ARRAY and the previous DAE.ET_ARRAY.
2. In cases, when matching:
Instead of | Use now:
-------------------------------------------------------
DAE.ET_INT() | DAE.T_INTEGER(source = _)
DAE.ET_REAL() | DAE.T_REAL(source = _)
DAE.ET_BOOL() | DAE.T_BOOL(source = _)
DAE.ET_STRING() | DAE.T_STRING(source = _)
DAE.ET_ENUMERATION(...) | DAE.T_ENUMERATION(...)
DAE.ET_COMPLEX(...) | DAE.T_COMPLEX(...)
DAE.ET_OTHER(...) | DAE.T_UNKNOWN(source = _)
DAE.ET_ARRAY(...) | DAE.T_ARRAY(...)
-------------------------------------------------------
3. When constructing values, in the then part or in right
hand side in equations:
Instead of | Use now:
-------------------------------------------------------
DAE.ET_INT() | DAE.T_INTEGER_DEFAULT
DAE.ET_REAL() | DAE.T_REAL_DEFAULT
DAE.ET_BOOL() | DAE.T_BOOL_DEFAULT
DAE.ET_STRING() | DAE.T_STRING_DEFAULT
DAE.ET_ENUMERATION(...) | DAE.T_ENUMERATION(...)
DAE.ET_COMPLEX(...) | DAE.T_COMPLEX(...)
DAE.ET_OTHER(...) | DAE.T_UNKNOWN(source = _)
DAE.ET_ARRAY(...) | DAE.T_ARRAY(...)
-------------------------------------------------------
4. Types.elabType got renamed to Types.simplifyType
and does some type simplification (instead of the
previous DAE.T_* -> DAE.ET_* translation).
Feel free to ask me anything if something is unclear.
The code can be further improved (we need better handling
of DAE.T_ARRAY that has several dimensions instead of one)
by getting rid of Types.simplifyType/Types.expTypetoTypesType,
but for now is good enough. Also, functionality for the old
DAE.ET_* handling from Expression*.mo can be merged with the
DAE.T_ handling from Types so we can get rid of duplicate
code too.
24 lines of code changed in 3 files:
- Expected output
493 lines of code changed in 34 files:
- ExpressionSimplify: Added new rules:
- a^e*b^e => (a*b)^e
- a^e/b^e => (a/b)^e
242 lines of code changed in 5 files:
- Changed nX to : in some functions in PartialTwoPhaseMedium to make them work
as intended.
261 lines of code changed in 4 files:
Error.mo
- typo fix
DAEUtil.mo
- better error messages
Inst.mo
- sort innerouter after the element dependency analysis
- add record constructors that are function inputs to the DAE (IdealGasH2O now compiles but has dassl issues)
- speedup Inst.makeFullyQualified a bit
InstExtends.mo
- more fix* calls which were missed
Interactive.mo
- use System.get/setPartialInst instead of RTOpts debug flags as they are REALLY slow
- this will speed up the MSL query for qt & java clients a bit.
SimCodeC.tpl
- use -O0 when running the testsuite.
Derive.mo
- better printout for derivative function error message
testsuite/
- update tests (more record constructors now)
- add one more to Media simulation and 2 more to Fluid flattening
mingw makefiles
- use wget (will be replaced by svn put into OMDev later)
to fetch revision number and put it part of the OMC version
660 lines of code changed in 21 files:
- include the modifiers and dimensions in the dependency analysis in Inst.instElementList
- move annotation checking functions from DAEUtil to SCode.
- convert type of the Value in the binding if needed (to get rid of things like min = 0, instead of min = 0.0)
- in partial instantiation disregard parameters, instantiate only constants.
- rename the really bad name "subs" to restCref in Static.elabCrefSubs.
- clear errors when loadingFileInteractiveQualified API and parseFile API
- added vaporizing.mo test
- a LOT of tests have changed
- small fixes to tools/validatetest/validatetest.pl
3868 lines of code changed in 35 files:
- Ceval the cref without subscripts if we have variable subscripts
176 lines of code changed in 4 files:
- Fixed spelling in testcases too.
10 lines of code changed in 2 files:
- re-enable the SCode.DERIVED case in the Inst.instClassdef2 as it gives way better function names (correct environment) and error locations.
also, we would have a function name clash in the function tree if we have two short class definitions with the same
name, same base class, but different modifiers!
- for SCode.DERIVED elaborate the modifiers in the parent scope both for full and partial inst!
this fixes the error for derived functions with modifiers.
- better location in call to Inst.matchModificationToComponents.
- get rid of some commented unused code.
1399 lines of code changed in 35 files:
Fix for function modifiers:
- Added source info to unbound parameter warning in Static.elabCref2, since it
doesn't cause any real problems anymore.
- Added a case to DAEUtil.bindingExp to use the evaluated expression if it's
available.
- Commented out the case for derived classes without array dims in
Inst.instClassdef2, since it solves some problems and makes the compiler
faster.
- Added test case mofiles/ModifyFunction1 to test function modifiers.
- Updated test suite.
3998 lines of code changed in 16 files:
- do not evaluate functions if we do partial instantiation
- handle smooth in Derive.mo (needed for Modelica.Media)
- replace constant with binding even if you cannot constant evaluate
- BackEnd/BackendDAECreate.mo (fixes to make some Media models simulate)
+ force inline of record = functionCall(...) in complex equations
+ handle normal equations in extendRecordEqns (as we have a recursive call)
- split function evaluation/generation outside of Ceval.cevalCallFunction
to be easier to manage.
- FUTURE: we should treat the constant evaluation of subscripts and constant evaluation of component reference
separately in Static.elabCref1 to be sure we always replace constants with their bindings (this will
get Modelica.Electrical.Digital going and maybe others).
144 lines of code changed in 21 files:
- chain the redeclares.
3924 lines of code changed in 20 files:
(21 more)