From 1ec71661a6628c84fe5cdbc14f7b0979fbf9734d Mon Sep 17 00:00:00 2001 From: Christian Winther Date: Wed, 21 Jan 2026 08:53:05 +0100 Subject: [PATCH 1/2] Removed JModelica mentionings --- INSTALL | 3 --- README.md | 11 +++++++---- doc/sphinx/source/_templates/index.html | 16 +++++----------- doc/sphinx/source/contact.rst | 2 +- doc/sphinx/source/download.rst | 21 ++++++--------------- doc/sphinx/source/jmodelica.rst | 13 ++++--------- setup.py | 7 ++----- 7 files changed, 25 insertions(+), 48 deletions(-) diff --git a/INSTALL b/INSTALL index ba1c985e..8630926c 100644 --- a/INSTALL +++ b/INSTALL @@ -21,6 +21,3 @@ Installation is performed using the command: Assimulo is then installed under Python dist-packages. To test the installation, run "pytest". - -For more information regarding Assimulo and the installation procedure, -please visit: http://www.jmodelica.org/assimulo diff --git a/README.md b/README.md index edad502d..ab31008b 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,6 @@ The package comes with a Problem specifications class and subclasses correspondi To define and solve a problem, first import the solver of choice and the appropriate `Implicit`/`Explicit` class. Furthermore, define your function $f$ and the initial conditions to pass to the problem class constructor. Then, create your solver, set the attributes (method, absolute/relative tolerance etc.) and use the simulate method to simulate. -For more information about Assimulo, documentation tutorial etc, see -the docs from the older [JModelica](http://www.jmodelica.org/assimulo) website. - Sundials Compliance ------------------- Current Assimulo development aims for compliancy with Sundials [v2.7.0](https://github.com/LLNL/sundials/releases/tag/v2.7.0). @@ -23,7 +20,13 @@ Some optional features in `Assimulo>=3.4.1`` are built on the modified Sundials Installation ------------------- -See the INSTALL file or the installation page on http://www.jmodelica.org/assimulo. +The recommended way to install Assimulo is through CONDA. + +`conda install conda-forge::assimulo` + +For installing from source, see the INSTALL file. + +Note that currently the releases on PYPI is outdated. Contributing ------------------- diff --git a/doc/sphinx/source/_templates/index.html b/doc/sphinx/source/_templates/index.html index bd47cfdf..e6f66a6e 100644 --- a/doc/sphinx/source/_templates/index.html +++ b/doc/sphinx/source/_templates/index.html @@ -9,9 +9,6 @@

Welcome

Assimulo is created in a collaboration between the Department of Numerical Analysis and the Department of Automatic Control at Lund University together with the company Modelon AB. The main contributors have been Christian Winther (Andersson), Claus Führer, Johan Åkesson and Magnus Gäfvert. For citing Assimulo, see citation.

-

- Assimulo is currently under development and the progress can be followed from our trac-site https://trac.jmodelica.org/assimulo/wiki. -

The following solvers are present, @@ -78,8 +75,8 @@

Documentation

- + @@ -99,17 +96,14 @@

Download

Assimulo is available for download here. For installation instructions, see here.

The code can be found at - https://trac.jmodelica.org/assimulo/wiki.

+ https://github.com/modelon-community/Assimulo.

-

Contact

-

- Contact us preferably through the forum. -

+

Contribute

- If you like to contribute to the Assimulo project please take a look at the contribution license. + For information about contributing, see https://github.com/modelon-community/contributing.

diff --git a/doc/sphinx/source/contact.rst b/doc/sphinx/source/contact.rst index 48d4dec0..3d8b4b25 100644 --- a/doc/sphinx/source/contact.rst +++ b/doc/sphinx/source/contact.rst @@ -4,4 +4,4 @@ Contact ============= -If you have any questions or comments, contact us preferably through the `forum `_ . +If you have any questions or comments, contact us preferably through `github `_ . diff --git a/doc/sphinx/source/download.rst b/doc/sphinx/source/download.rst index 7c658359..e4d858c6 100644 --- a/doc/sphinx/source/download.rst +++ b/doc/sphinx/source/download.rst @@ -4,26 +4,17 @@ Download ============= -Current version: +The recommended way to install Assimulo is through `conda `_:: - Available on PyPI, http://pypi.python.org/pypi/Assimulo + conda install conda-forge::assimulo -See :doc:`installation` for instructions on setting up Assimulo. Additionally, Assimulo is available through `conda `_:: +See :doc:`installation` for instructions on installing Assimulo from source. - conda install -c https://conda.binstar.org/chria assimulo - - -To retrieve the latest (develop) version using a subversion software use:: - - svn checkout https://svn.jmodelica.org/assimulo/trunk - - -.. warning:: - - The latest (develop) version may not function properly. +The source code can be found at:: + https://github.com/modelon-community/Assimulo Old versions: - - See, https://trac.jmodelica.org/assimulo/browser/releases + - See, https://github.com/modelon-community/Assimulo/releases diff --git a/doc/sphinx/source/jmodelica.rst b/doc/sphinx/source/jmodelica.rst index 2bad80fa..b65727ee 100644 --- a/doc/sphinx/source/jmodelica.rst +++ b/doc/sphinx/source/jmodelica.rst @@ -1,18 +1,13 @@ ================================ -Assimulo for JModelica.org users +Assimulo for PyFMI users ================================ -Assimulo has been incorporated into the JModelica.org platform as the default simulation package. This has been made possible by extending Assimulo's problem classes where the JModelica.org JMI model and FMU model is modified and adapted to Assimulo. In the Figure below the connection between JModelica.org, Assimulo and -Sundials are displayed. +Assimulo has been incorporated into PyFMI as the default simulation package. This has been made possible by extending Assimulo's problem classes where the FMU model is modified and adapted to Assimulo. -.. image:: AssimuloJModelica.png - :align: center - - -When using Assimulo together with JModelica.org and the new high-level simulation methods, all the parameters passed in the *options*-dict represents parameters for the specific solver used in Assimulo. :: +When using Assimulo together with PyFMI and the new high-level simulation methods, all the parameters passed in the *options*-dict represents parameters for the specific solver used in Assimulo. :: FMUModel(ME1/ME2).simulate(self, start_time=0.0, @@ -21,4 +16,4 @@ When using Assimulo together with JModelica.org and the new high-level simulatio algorithm='AssimuloAlg', options={}): -A list of the different solver specific parameters can be found in the :doc:`usage` section. A more detailed description of the available options and interface between JModelica.org and Assimulo can be found in the JModelica.org users guide. +A list of the different solver specific parameters can be found in the :doc:`usage` section. diff --git a/setup.py b/setup.py index 5b1b5d86..c77fdc8d 100644 --- a/setup.py +++ b/setup.py @@ -659,8 +659,8 @@ def fortran_extensionlists(self): AUTHOR_EMAIL = "christian.winther@modelon.com" VERSION = "3.7.0.dev0" if version_number_arg == "Default" else version_number_arg LICENSE = "LGPL" -URL = "http://www.jmodelica.org/assimulo" -DOWNLOAD_URL = "http://www.jmodelica.org/assimulo" +URL = "https://github.com/modelon-community/Assimulo" +DOWNLOAD_URL = "https://github.com/modelon-community/Assimulo/releases" DESCRIPTION = "A package for solving ordinary differential equations and differential algebraic equations." PLATFORMS = ["Linux", "Windows", "MacOS X"] CLASSIFIERS = [ 'Programming Language :: Python', @@ -685,9 +685,6 @@ def fortran_extensionlists(self): (http://www.unige.ch/~hairer/software.html) codes Radau5, Rodas and Dopri5 are also available. For the full list, see the documentation. -Documentation and installation instructions can be found at: -http://www.jmodelica.org/assimulo . - The package requires Numpy, Scipy and Matplotlib and additionally for compiling from source, Cython >=3, Sundials 2.6/2.7/3.1/4.1, BLAS and LAPACK together with a C-compiler and a FORTRAN-compiler. From 5df86148544d78b1765f47e6f7a0ff9223069df4 Mon Sep 17 00:00:00 2001 From: Christian Winther Date: Wed, 21 Jan 2026 10:34:37 +0100 Subject: [PATCH 2/2] Fixes after review --- doc/sphinx/source/AssimuloJModelica.png | Bin 14840 -> 0 bytes doc/sphinx/source/_templates/index.html | 2 +- doc/sphinx/source/contents.rst | 2 +- doc/sphinx/source/{jmodelica.rst => pyfmi.rst} | 0 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 doc/sphinx/source/AssimuloJModelica.png rename doc/sphinx/source/{jmodelica.rst => pyfmi.rst} (100%) diff --git a/doc/sphinx/source/AssimuloJModelica.png b/doc/sphinx/source/AssimuloJModelica.png deleted file mode 100644 index b1bdc7123624bea638b809c13a45c6f870dc2f08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14840 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 ZF^qguNqoDnL4ZJzq^O)osgS<^{{hFD7sUVo diff --git a/doc/sphinx/source/_templates/index.html b/doc/sphinx/source/_templates/index.html index e6f66a6e..9d46a1fd 100644 --- a/doc/sphinx/source/_templates/index.html +++ b/doc/sphinx/source/_templates/index.html @@ -75,7 +75,7 @@

Documentation

- diff --git a/doc/sphinx/source/contents.rst b/doc/sphinx/source/contents.rst index 3cf75518..32421fbc 100644 --- a/doc/sphinx/source/contents.rst +++ b/doc/sphinx/source/contents.rst @@ -16,7 +16,7 @@ Contents usage examples - jmodelica + pyfmi download installation code diff --git a/doc/sphinx/source/jmodelica.rst b/doc/sphinx/source/pyfmi.rst similarity index 100% rename from doc/sphinx/source/jmodelica.rst rename to doc/sphinx/source/pyfmi.rst