Merge branch 'release/v0.2.7'

CATIA-Systems · Nov 13, 2018 · 30c17b7 · 30c17b7
2 parents d266f17 + 787c0e4
commit 30c17b7
Show file tree

Hide file tree

Showing 23 changed files with 1,166 additions and 1,112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,10 @@ dist/
 MANIFEST
 *.egg-info
 
+# test artifacts
+tests/IntegerNetwork1/
+tests/Rectifier/
+
 # PyCharm project
 .idea/
 

diff --git a/README.md b/README.md
@@ -33,10 +33,10 @@ You can start the FMPy GUI with `python -m fmpy.gui`
 ## Simulate an FMU in Python
 
 To follow this example download `Rectifier.fmu` for your platform by clicking on the respective link:
-[Linux](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/linux64/MapleSim/2017/Rectifier/Rectifier.fmu),
-[macOS](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/darwin64/MapleSim/2017/Rectifier/Rectifier.fmu),
-[Windows (32-bit)](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/win32/MapleSim/2017/Rectifier/Rectifier.fmu),
-[Windows (64-bit)](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/win64/MapleSim/2017/Rectifier/Rectifier.fmu).
+[Linux](https://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/linux64/MapleSim/2017/Rectifier/Rectifier.fmu),
+[macOS](https://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/darwin64/MapleSim/2017/Rectifier/Rectifier.fmu),
+[Windows (32-bit)](https://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/win32/MapleSim/2017/Rectifier/Rectifier.fmu),
+[Windows (64-bit)](https://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/win64/MapleSim/2017/Rectifier/Rectifier.fmu).
 Change to the folder where you've saved the FMU and open a Python prompt.
 
 ```

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,10 @@
+## v0.2.7 (2018-11-13)
+
+- `FIXED` Test files are now downloaded form GitHub
+- `FIXED` Compilation of model exchange FMUs works now
+- `NEW` --relative-tolerance parameter is now passed to FMI 2.0 co-simulation FMUs
+- `NEW` Platform binary can now be compiled from within the GUI (Help > Compile Platform Binary)
+
 ## v0.2.6 (2018-09-04)
 
 - `NEW` CMake project generation for C code FMUs

diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -7,10 +7,10 @@ You can start the FMPy GUI with `python -m fmpy.gui`
 ## Python
 
 To follow this example download `Rectifier.fmu` for your platform by clicking on the respective link:
-[Linux](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/linux64/MapleSim/2017/Rectifier/Rectifier.fmu),
-[macOS](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/darwin64/MapleSim/2017/Rectifier/Rectifier.fmu),
-[Windows (32-bit)](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/win32/MapleSim/2017/Rectifier/Rectifier.fmu),
-[Windows (64-bit)](https://trac.fmi-standard.org/export/HEAD/branches/public/Test_FMUs/FMI_2.0/CoSimulation/win64/MapleSim/2017/Rectifier/Rectifier.fmu).
+[Linux](https://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/linux64/MapleSim/2017/Rectifier/Rectifier.fmu),
+[macOS](hhttps://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/darwin64/MapleSim/2017/Rectifier/Rectifier.fmu),
+[Windows (32-bit)](https://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/win32/MapleSim/2017/Rectifier/Rectifier.fmu),
+[Windows (64-bit)](https://github.com/modelica/fmi-cross-check/blob/master/fmus/2.0/cs/win64/MapleSim/2017/Rectifier/Rectifier.fmu).
 Change to the folder where you've saved the FMU and open a Python prompt.
 
 ```

diff --git a/fmpy/__init__.py b/fmpy/__init__.py
@@ -5,7 +5,7 @@
 from ctypes import *
 import _ctypes
 
-__version__ = '0.2.6'
+__version__ = '0.2.7'
 
 
 # determine the platform

diff --git a/fmpy/__main__.py b/fmpy/__main__.py
@@ -1,4 +1,4 @@
 
 if __name__ == '__main__':
-    from .command_line import main
+    from fmpy.command_line import main
     main()
diff --git a/fmpy/command_line.py b/fmpy/command_line.py
@@ -35,7 +35,7 @@ def main():
     parser.add_argument('--stop-time', type=float, help="stop time for the simulation")
     parser.add_argument('--solver', choices=['Euler', 'CVode'], default='CVode', help="solver to use for Model Exchange")
     parser.add_argument('--step-size', type=float, help="step size for fixed-step solvers")
-    parser.add_argument('--relative-tolerance', type=float, help="relative tolerance for the 'CVode' solver")
+    parser.add_argument('--relative-tolerance', type=float, help="relative tolerance for the 'CVode' solver and FMI 2.0 co-simulation FMUs")
     parser.add_argument('--dont-record-events', action='store_true', help="dont't record outputs at events (model exchange only)")
     parser.add_argument('--start-values', nargs='+', help="name-value pairs of start values")
     parser.add_argument('--apply-default-start-values', action='store_true', help="apply the start values from the model description")