diff --git a/README.md b/README.md index 8f0ab662..51bfcf67 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,6 @@ PyFMI is tested daily in several different ways: * Extensive external testing within the `Optimica Compiler Toolkit` (OCT) provided by [Modelon](https://help.modelon.com/latest/reference/oct/) using all models in Modelon Modelica libraries (7000+ models), exported as FMUs. * Unit tests from the `tests` directory. These use FMUs generated by * OCT - * JModelica.org * FMUs in the example directory are generated via FMU SDK by Qtronic, more information is available in related `README.txt` for these FMUs with proper license text. * PyFMI is the default execution engine for [Modelon Impact](https://modelon.com/modelon-impact/). * Testing with FMUs from [FMI Cross Check](https://github.com/modelica/fmi-cross-check) and commit [55c6704](https://github.com/modelica/fmi-cross-check/commit/55c6704bbcaed3e0f4f788a02af0aba08b7faa4a): diff --git a/doc/sphinx/source/_templates/index.html b/doc/sphinx/source/_templates/index.html index 58891e0a..339e886e 100644 --- a/doc/sphinx/source/_templates/index.html +++ b/doc/sphinx/source/_templates/index.html @@ -8,11 +8,11 @@

Welcome

PyFMI is a package for loading and interacting with Functional Mock-Up Units (FMUs) both for Model Exchange and Co-Simulation, which are compiled dynamic models compliant with the Functional Mock-Up Interface (FMI), see here for more information.

-FMI is a standard that enables tool independent exchange of dynamic models on binary format. Several industrial simulation platforms supports export of FMUs, including, Dymola, JModelica.org, OpenModelica and SimulationX, see here for a complete list. PyFMI offers a Python interface for interacting with FMUs and enables for example loading of FMU models, setting of model parameters and evaluation of model equations. +FMI is a standard that enables tool independent exchange of dynamic models on binary format. Several industrial simulation platforms supports export of FMUs, including, Modelon Impact, Dymola, OpenModelica and SimulationX, see here for a complete list. PyFMI offers a Python interface for interacting with FMUs and enables for example loading of FMU models, setting of model parameters and evaluation of model equations.

-PyFMI is available as a stand-alone package or as part of the JModelica.org distribution. Using PyFMI together with the Python simulation package Assimulo adds industrial grade simulation capabilities of FMUs to Python. +PyFMI is available as a stand-alone package. Using PyFMI together with the Python simulation package Assimulo adds industrial grade simulation capabilities of FMUs to Python.

-The latest version is available for download here +The latest version can be found here

diff --git a/doc/sphinx/source/tutorial.rst b/doc/sphinx/source/tutorial.rst index 4f3b1c45..b37725f8 100644 --- a/doc/sphinx/source/tutorial.rst +++ b/doc/sphinx/source/tutorial.rst @@ -4,8 +4,6 @@ Tutorial This tutorial is intended to give a short introduction on how to use the PyFMI package to load an FMU into Python and to simulate the given model. -For a more detailed description on how to use PyFMI, see the user's documentation in `JModelica.org `_ - Loading an FMU into Python ============================ diff --git a/src/common/__init__.py b/src/common/__init__.py index 7d2d2e27..35dbb806 100644 --- a/src/common/__init__.py +++ b/src/common/__init__.py @@ -14,10 +14,6 @@ # # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see . -""" -The JModelica.org Python package for common classes -and functions. -""" __all__ = ['algorithm_drivers', 'core', 'diagnostics', 'io', 'plotting'] diff --git a/src/common/core.py b/src/common/core.py index 3e2969a6..948a3c8d 100644 --- a/src/common/core.py +++ b/src/common/core.py @@ -393,7 +393,7 @@ def create_temp_dir(): """ Create a temporary directory for extracting an FMU in or similar """ - # create JModelica directory for temporary files (if not already created) + # create directory for temporary files (if not already created) if not os.path.exists(tmp_location): try: #Account for race conditions os.makedirs(tmp_location) @@ -410,7 +410,7 @@ def create_temp_file(): """ Create a temporary file. """ - # create JModelica directory for temporary files (if not already created) + # create directory for temporary files (if not already created) if not os.path.exists(tmp_location): os.makedirs(tmp_location) diff --git a/src/common/plotting/plot_gui.py b/src/common/plotting/plot_gui.py index 5a951793..8f1f422e 100644 --- a/src/common/plotting/plot_gui.py +++ b/src/common/plotting/plot_gui.py @@ -35,7 +35,6 @@ except ImportError: print("WX-Python not found. The GUI will not work.") -#JModelica related imports from pyfmi.common.io import ResultDymolaTextual from pyfmi.common.io import ResultDymolaBinary from pyfmi.common.io import ResultCSVTextual @@ -88,7 +87,7 @@ class MainGUI(wx.Frame): def __init__(self, parent, ID, filename=None): - self.title = "JModelica.org Plot GUI" + self.title = "PyFMI Plot GUI" wx.Frame.__init__(self, parent, ID, self.title, wx.DefaultPosition, wx.Size(self.sizeHeightDefault, self.sizeLengthDefault)) @@ -260,7 +259,7 @@ def OnMenuExit(self, event): self.Destroy() #Close the GUI def OnMenuAbout(self, event): - dlg = wx.MessageDialog(self, 'JModelica.org Plot GUI.\n', 'About', + dlg = wx.MessageDialog(self, 'PyFMI Plot GUI.\n', 'About', wx.OK | wx.ICON_INFORMATION) dlg.ShowModal() dlg.Destroy() diff --git a/src/pyfmi/__init__.py b/src/pyfmi/__init__.py index 52aa8faf..aafb79f9 100644 --- a/src/pyfmi/__init__.py +++ b/src/pyfmi/__init__.py @@ -14,9 +14,6 @@ # # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see . -""" -The JModelica.org Python package for working with FMI -""" __all__ = ['fmi_algorithm_drivers', 'examples', 'fmi', 'common'] diff --git a/src/pyfmi/examples/fmi20_bouncing_ball_native.py b/src/pyfmi/examples/fmi20_bouncing_ball_native.py index 22fc59fc..e988b243 100644 --- a/src/pyfmi/examples/fmi20_bouncing_ball_native.py +++ b/src/pyfmi/examples/fmi20_bouncing_ball_native.py @@ -27,7 +27,7 @@ def run_demo(with_plots=True): """ - This example shows how to use the raw (JModelica.org) FMI interface for + This example shows how to use the raw FMI interface for simulation of an FMU. FMU = bouncingBall.fmu diff --git a/src/pyfmi/examples/fmi_bouncing_ball.py b/src/pyfmi/examples/fmi_bouncing_ball.py index d7b4b658..fcaba692 100644 --- a/src/pyfmi/examples/fmi_bouncing_ball.py +++ b/src/pyfmi/examples/fmi_bouncing_ball.py @@ -27,7 +27,7 @@ def run_demo(with_plots=True, version="2.0"): """ - Demonstrates how to use JModelica.org for simulation of + Demonstrates how to use PyFMI / Assimulo for simulation of ME FMUs version 1.0 and 2.0. """ if version == '1.0': diff --git a/src/pyfmi/examples/fmi_bouncing_ball_native.py b/src/pyfmi/examples/fmi_bouncing_ball_native.py index b1dd78ef..a021bde4 100644 --- a/src/pyfmi/examples/fmi_bouncing_ball_native.py +++ b/src/pyfmi/examples/fmi_bouncing_ball_native.py @@ -28,7 +28,7 @@ def run_demo(with_plots=True): """ - This example shows how to use the raw (JModelica.org) FMI interface for + This example shows how to use the raw FMI interface for simulation of an FMU. FMU = bouncingBall.fmu