diff --git a/VERSION b/VERSION
index 6161878..c0943d3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2
\ No newline at end of file
+2.3
\ No newline at end of file
diff --git a/rrompy/solver/fenics/fenics_la.py b/rrompy/solver/fenics/fenics_la.py
index ba66db7..5c544c4 100644
--- a/rrompy/solver/fenics/fenics_la.py
+++ b/rrompy/solver/fenics/fenics_la.py
@@ -1,51 +1,51 @@
# Copyright (C) 2018 by the RROMPy authors
#
# This file is part of RROMPy.
#
# RROMPy is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# RROMPy is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with RROMPy. If not, see .
#
from numpy import array, complex
from scipy.sparse import csr_matrix
import fenics as fen
from rrompy.utilities.base.types import Np2D, FenBC, FenExpr
__all__ = ['fenics2Sparse', 'fenics2Vector']
def fenics2Sparse(expr:FenExpr, formCompPars : dict = {}, DBC : FenBC = None,
BCType : int = -1, dtype = complex) -> Np2D:
assembled = fen.assemble(expr, form_compiler_parameters = formCompPars)
loglvl = fen.get_log_level()
fen.set_log_level(40)
if BCType == 0:
DBC.zero(assembled)
elif BCType >= 1:
DBC.apply(assembled)
fen.set_log_level(loglvl)
emat = fen.as_backend_type(assembled).mat()
er, ec, ev = emat.getValuesCSR()
return csr_matrix((ev, ec, er), shape = emat.size, dtype = dtype)
def fenics2Vector(expr:FenExpr, formCompPars : dict = {}, DBC : FenBC = None,
BCType : int = -1, dtype = complex) -> Np2D:
assembled = fen.assemble(expr, form_compiler_parameters = formCompPars)
loglvl = fen.get_log_level()
fen.set_log_level(40)
if BCType == 0:
DBC.zero(assembled)
elif BCType >= 1:
DBC.apply(assembled)
fen.set_log_level(loglvl)
- return array(assembled[:], dtype = dtype)
+ return array(assembled, dtype = dtype)
diff --git a/setup.py b/setup.py
index 1daff55..efda160 100644
--- a/setup.py
+++ b/setup.py
@@ -1,52 +1,52 @@
# Copyright (C) 2018 by the RROMPy authors
#
# This file is part of RROMPy.
#
# RROMPy is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# RROMPy is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with RROMPy. If not, see .
#
import os
from setuptools import find_packages, setup
rrompy_directory = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
#rrompy_directory = os.path.join(rrompy_directory, 'rrompy')
setup(name="RROMPy",
description="Rational reduced order modelling in Python",
long_description="Rational reduced order modelling in Python",
author="Davide Pradovera",
author_email="davide.pradovera@epfl.ch",
- version="2.2",
+ version="2.3",
license="GNU Library or Lesser General Public License (LGPL)",
classifiers=[
"Development Status :: 1 - Planning"
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
"Topic :: Scientific/Engineering :: Mathematics",
"Topic :: Software Development :: Libraries :: Python Modules",
],
packages=find_packages(rrompy_directory),
setup_requires=[
"pytest-runner"
],
tests_require=[
"pytest"
],
zip_safe=False
)