Skip to content

Commit

Permalink
Update download links in examples, UI and tests [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
t-sommer committed Nov 13, 2018
1 parent 91bddae commit ee8e8ac
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

```
Expand Down
8 changes: 4 additions & 4 deletions docs/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

```
Expand Down
2 changes: 1 addition & 1 deletion fmpy/gui/MainWindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def __init__(self, parent=None):
self.ui.actionOpenFMI1SpecCS.triggered.connect(lambda: QDesktopServices.openUrl(QUrl('https://svn.modelica.org/fmi/branches/public/specifications/v1.0/FMI_for_CoSimulation_v1.0.1.pdf')))
self.ui.actionOpenFMI1SpecME.triggered.connect(lambda: QDesktopServices.openUrl(QUrl('https://svn.modelica.org/fmi/branches/public/specifications/v1.0/FMI_for_ModelExchange_v1.0.1.pdf')))
self.ui.actionOpenFMI2Spec.triggered.connect(lambda: QDesktopServices.openUrl(QUrl('https://svn.modelica.org/fmi/branches/public/specifications/v2.0/FMI_for_ModelExchange_and_CoSimulation_v2.0.pdf')))
self.ui.actionOpenTestFMUs.triggered.connect(lambda: QDesktopServices.openUrl(QUrl('https://trac.fmi-standard.org/browser/branches/public/Test_FMUs')))
self.ui.actionOpenTestFMUs.triggered.connect(lambda: QDesktopServices.openUrl(QUrl('https://github.com/modelica/fmi-cross-check/tree/master/fmus')))
self.ui.actionOpenWebsite.triggered.connect(lambda: QDesktopServices.openUrl(QUrl('https://github.com/CATIA-Systems/FMPy')))
self.ui.actionShowReleaseNotes.triggered.connect(lambda: QDesktopServices.openUrl(QUrl('https://fmpy.readthedocs.io/en/latest/changelog/')))
self.ui.actionCompilePlatformBinary.triggered.connect(self.compilePlatformBinary)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_common_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def test_common_functions(self):
model_name = 'BooleanNetwork1'
filename = model_name + '.fmu'

download_test_file(fmi_version, 'CoSimulation', 'Dymola', '2017', model_name, filename)
download_test_file(fmi_version, 'cs', 'Dymola', '2017', model_name, filename)

model_description = read_model_description(filename)
unzipdir = extract(filename)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_extracted_fmu.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class ExtractedFMUTest(unittest.TestCase):
def test_extracted_fmu(self):
""" Simulate an extracted FMU """

download_test_file('2.0', 'CoSimulation', 'MapleSim', '2016.2', 'CoupledClutches', 'CoupledClutches.fmu')
download_test_file('2.0', 'cs', 'MapleSim', '2016.2', 'CoupledClutches', 'CoupledClutches.fmu')

# extract the FMU
tempdir = extract('CoupledClutches.fmu')
Expand Down
2 changes: 1 addition & 1 deletion tests/test_fmu_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class FMUInfoTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
# download the FMU
download_test_file('2.0', 'ModelExchange', 'MapleSim', '2016.2', 'CoupledClutches', 'CoupledClutches.fmu')
download_test_file('2.0', 'me', 'MapleSim', '2016.2', 'CoupledClutches', 'CoupledClutches.fmu')

def test_illegal_fmi_type(self):
with self.assertRaises(Exception) as context:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_output_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def test_step_size(self):

# download the FMU and input file
for filename in ['CoupledClutches.fmu', 'CoupledClutches_in.csv']:
download_test_file('2.0', 'ModelExchange', 'MapleSim', '2016.2', 'CoupledClutches', filename)
download_test_file('2.0', 'me', 'MapleSim', '2016.2', 'CoupledClutches', filename)

# load the input
input = np.genfromtxt('CoupledClutches_in.csv', delimiter=',', names=True)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_serialize_fmu_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def test_serialize_fmu_state(self):
fmu_filename = 'Rectifier.fmu'

# download the FMU
download_test_file('2.0', 'CoSimulation', 'MapleSim', '2016.2', 'Rectifier', fmu_filename)
download_test_file('2.0', 'cs', 'MapleSim', '2016.2', 'Rectifier', fmu_filename)

# read the model description
model_description = read_model_description(fmu_filename)
Expand Down

0 comments on commit ee8e8ac

Please sign in to comment.