Removed JModelica mentionings

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

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
 -------------------

doc/sphinx/source/_templates/index.html

@@ -9,9 +9,6 @@ <h1>Welcome</h1>
 	<p>
 	Assimulo is created in a collaboration between the <a target="_parent" href="http://www.maths.lth.se/na/">Department of Numerical Analysis</a> and the <a target="_parent" href="http://www.control.lth.se/">Department of Automatic Control</a> at Lund University together with the company <a target="_parent" href="http://www.modelon.se/">Modelon AB</a>. The main contributors have been <em>Christian Winther (Andersson)</em>, <em>Claus Führer</em>, <em>Johan Åkesson</em> and <em>Magnus Gäfvert</em>. For citing Assimulo, see <a href="{{ pathto("citation") }}">citation</a>.
 	</p>
-	<p>
-    Assimulo is currently under development and the progress can be followed from our trac-site <a target="_parent" href="https://trac.jmodelica.org/assimulo/wiki">https://trac.jmodelica.org/assimulo/wiki</a>.
-    </p>
 
 <p>    
      The following solvers are present,
@@ -78,8 +75,8 @@ <h2>Documentation</h2>
     <td width="50%">
       <p class="biglink"><a class="biglink" href="{{ pathto("usage") }}">Usage</a><br/>
          <span class="linkdescr">overview of the attributes</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("jmodelica") }}">JModelica.org</a><br/>
-         <span class="linkdescr">Assimulo for JModelica.org users</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("pyfmi") }}">PyFMI</a><br/>
+         <span class="linkdescr">Assimulo for PyFMI users</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("search") }}">Search page</a><br/>
          <span class="linkdescr">search the documentation</span></p>
     </td><td width="50%">
@@ -99,17 +96,14 @@ <h2>Download</h2>
     Assimulo is available for download <a href="{{ pathto("download") }}">here</a>. For installation instructions, see <a href="{{ pathto("installation") }}">here</a>.
   </p>
   <p>The code can be found at
-    <a target="_parent" href="https://trac.jmodelica.org/assimulo/wiki">https://trac.jmodelica.org/assimulo/wiki</a>.</p>
+    <a target="_parent" href="https://github.com/modelon-community/Assimulo">https://github.com/modelon-community/Assimulo</a>.</p>
 
 
-  <h2>Contact</h2>
-  <p>
-  Contact us preferably through the <a target="_parent" href="http://www.jmodelica.org/forum">forum</a>. 
-  </p>
+
 
   <h2>Contribute</h2>
   <p>
-  If you like to contribute to the Assimulo project please take a look at the <a target="_parent" href="http://www.jmodelica.org/page/14">contribution</a> license. 
+    For information about contributing, see <a target="_parent" href="https://github.com/modelon-community/contributing">https://github.com/modelon-community/contributing</a>.
   </p>
 
 

doc/sphinx/source/contact.rst

@@ -4,4 +4,4 @@
 Contact
 =============
 
-If you have any questions or comments, contact us preferably through the `forum <http://www.jmodelica.org/forum>`_ .
+If you have any questions or comments, contact us preferably through `github <https://github.com/modelon-community/Assimulo/issues>`_ .

doc/sphinx/source/contents.rst

@@ -16,7 +16,7 @@ Contents
 
    usage
    examples
-   jmodelica
+   pyfmi
    download
    installation
    code

doc/sphinx/source/download.rst

@@ -4,26 +4,17 @@
 Download
 =============
 
-Current version:
+The recommended way to install Assimulo is through `conda <https://anaconda.org/channels/conda-forge/packages/assimulo/overview>`_::
 
-    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 <http://conda.pydata.org/docs/index.html>`_::
+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
 

doc/sphinx/source/pyfmi.rst

@@ -0,0 +1,19 @@
+
+
+================================
+Assimulo for PyFMI users
+================================
+
+
+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.
+
+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,
+                        final_time=1.0,
+                        input=(),
+                        algorithm='AssimuloAlg', 
+                        options={}):
+
+A list of the different solver specific parameters can be found in the :doc:`usage` section.

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.