[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Yves Renard |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Wed, 22 Apr 2020 08:59:54 -0400 (EDT) |
branch: master
commit 1ac276d624142884b73afe270045ead4f465b661
Author: Yves Renard <address@hidden>
AuthorDate: Wed Apr 22 14:29:47 2020 +0200
Preparing for 5. release, minor further adptations
---
Makefile.am | 1 +
doc/sphinx/Makefile.am | 6 +++---
doc/sphinx/source/.templates/indexcontent.html | 2 +-
doc/sphinx/source/conf.py | 4 ++--
doc/sphinx/source/whatsnew/5.4.rst | 4 ++--
interface/src/scilab/Makefile.am | 3 ++-
interface/tests/matlab-octave/Makefile.am | 4 ++--
interface/tests/python/Makefile.am | 2 +-
interface/tests/python/demo_wave_equation.py | 9 ---------
src/Makefile.am | 2 +-
10 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 87c125b..95b0d91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,5 +24,6 @@ EXTRA_DIST = GNU_LGPL_V3 GNU_GPL_V3 GNU_GCC_RUNTIME_EXCEPTION
GNU_FDL_V3
CLEANFILES = so_locations _configs.sed
+# DISTCHECK_CONFIGURE_FLAGS = --enable-matlab --enable-octave
bin_SCRIPTS=getfem-config
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 0d0c165..ac55e23 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -147,7 +147,7 @@ clean:
-rm -f $(srcdir)/source/python/cmdref.rst
$(srcdir)/source/matlab_octave/cmdref.rst : $(top_srcdir)/interface/src/*.cc
$(top_srcdir)/bin/extract_doc $(top_srcdir)/bin/split_cmdref
- ($(top_srcdir)/bin/extract_doc $(top_srcdir)/interface/src
matlab_octave-doc > $(srcdir)/source/matlab_octave/cmdref.rst &&
$(top_srcdir)/bin/split_cmdref $(srcdir)/source/matlab_octave) || (rm -f
$(srcdir)/source/matlab_octave/cmdref.rst; /bin/false )
+ ($(top_srcdir)/bin/extract_doc $(top_srcdir)/interface/src matlab-doc >
$(srcdir)/source/matlab_octave/cmdref.rst && $(top_srcdir)/bin/split_cmdref
$(srcdir)/source/matlab_octave) || (rm -f
$(srcdir)/source/matlab_octave/cmdref.rst; /bin/false )
$(srcdir)/source/scilab/cmdref.rst : $(top_srcdir)/interface/src/*.cc
$(top_srcdir)/bin/extract_doc $(top_srcdir)/bin/split_cmdref
($(top_srcdir)/bin/extract_doc $(top_srcdir)/interface/src
scilab-doc-rst > $(srcdir)/source/scilab/cmdref.rst &&
$(top_srcdir)/bin/split_cmdref $(srcdir)/source/scilab) || (rm -f
$(srcdir)/source/scilab/cmdref.rst; /bin/false )
@@ -181,6 +181,6 @@ upload:
EXTRA_DIST = \
source/userdoc/images/Makefile \
source/project/images/Makefile \
- source/matlab_octave/images/Makefile \
- source/python/images/Makefile \
+ source/matlab_octave/images/Makefile \
+ source/python/images/Makefile \
source/scilab/images/Makefile
diff --git a/doc/sphinx/source/.templates/indexcontent.html
b/doc/sphinx/source/.templates/indexcontent.html
index f483928..b2ce8c5 100644
--- a/doc/sphinx/source/.templates/indexcontent.html
+++ b/doc/sphinx/source/.templates/indexcontent.html
@@ -8,7 +8,7 @@
<div style="text-align:center;"><img src="{{ pathto('_static/logogetfem.png',
1) }}" alt="the GetFEM logo"><br/> An open-source finite element library </div>
<br/><br/>
-<p><strong>NEW</strong> (June 2020): Version 5.4 has been released.<br/></p>
+<p><strong>NEW</strong> (April 2020): Version 5.4 has been released.<br/></p>
<p>Thank you for citing <a class="biglink"
href="https://hal.archives-ouvertes.fr/hal-02532422/document";> [GetFEM2020]</a>
in scientific work using GetFEM.<br/></p>
diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py
index 0414c03..08c6230 100644
--- a/doc/sphinx/source/conf.py
+++ b/doc/sphinx/source/conf.py
@@ -252,8 +252,8 @@ latex_documents = [
'Tutorial', _stdauthor, 'manual', False),
('python/index', 'python_interface.tex',
'Python Interface', 'Luis Saavedra', 'manual', False),
- ('matlab/index', 'matlab_interface.tex',
- 'Matlab Interface', _stdauthor, 'manual', False),
+ ('matlab_octave/index', 'matlab_octave_interface.tex',
+ 'Matlab-Octave Interface', _stdauthor, 'manual', False),
('scilab/index', 'scilab_interface.tex',
'Scilab Interface', 'Yann Colette, ' + _stdauthor, 'manual', False),
('userdoc/index', 'getfem_userdoc.tex',
diff --git a/doc/sphinx/source/whatsnew/5.4.rst
b/doc/sphinx/source/whatsnew/5.4.rst
index 647e30c..4fa085f 100644
--- a/doc/sphinx/source/whatsnew/5.4.rst
+++ b/doc/sphinx/source/whatsnew/5.4.rst
@@ -6,7 +6,7 @@
The main contribution of this version is a fully functional scripting language
interface to Octave and support for definition and condensation of internal
variables.
-Released version, 2020/04/21.
+Released version, 2020/04/22.
The main changes are:
@@ -16,7 +16,7 @@ The main changes are:
* Support for (internal) variables defined at integration points
* Full support for the automatic condensation of internal variables by
- local equations expressed in the generice weal form language. Useful
+ local equations expressed in the generic weak form language. Useful
for instance in the implementation of plasticity models.
* The use of Python 3 instead of Python 2.7 by default
diff --git a/interface/src/scilab/Makefile.am b/interface/src/scilab/Makefile.am
index 221845e..db8ff51 100644
--- a/interface/src/scilab/Makefile.am
+++ b/interface/src/scilab/Makefile.am
@@ -264,10 +264,11 @@ EXTRA_DIST=builddoc.sce \
sci_gateway/loader_gateway.sce \
sci_gateway/c/builder_gateway_c.sce \
sci_gateway/c/cleaner.sce \
+ sci_gateway/c/stream_redirect.h \
sci_gateway/c/gfm_common.c \
sci_gateway/c/gfm_common.h \
sci_gateway/c/gfm_scilab.cpp \
- sci_gateway/c/libscigetfem_c.c \
+ sci_gateway/c/libscigetfem_c.cpp \
sci_gateway/c/libscigetfem_c.so \
sci_gateway/c/loader.sce \
sci_gateway/c/sci_cgne.c \
diff --git a/interface/tests/matlab-octave/Makefile.am
b/interface/tests/matlab-octave/Makefile.am
index c208232..d8c12a6 100644
--- a/interface/tests/matlab-octave/Makefile.am
+++ b/interface/tests/matlab-octave/Makefile.am
@@ -18,13 +18,13 @@
SUBDIRS = private
if BUILDMEX
-TESTSM = $(abs_srcdir)/check_all_matlab.sh
+TESTSM = check_all_matlab.sh
else
TESTSM =
endif
if BUILDOCTAVE
-TESTSO = $(abs_srcdir)/check_all_octave.sh
+TESTSO = check_all_octave.sh
else
TESTSO =
endif
diff --git a/interface/tests/python/Makefile.am
b/interface/tests/python/Makefile.am
index 840de44..a8e02a4 100644
--- a/interface/tests/python/Makefile.am
+++ b/interface/tests/python/Makefile.am
@@ -82,4 +82,4 @@ AM_TESTS_ENVIRONMENT = \
LOG_COMPILER = $(PYTHON)
endif
-CLEANFILES = *.vtk *.dx *.pyc tank_3D* tripod* plate* *.pos *.dx
+CLEANFILES = *.vtk *.dx *.pyc tank_3D* tripod* plate* *.pos *.dx results/*
diff --git a/interface/tests/python/demo_wave_equation.py
b/interface/tests/python/demo_wave_equation.py
index f2224c1..5a5e437 100644
--- a/interface/tests/python/demo_wave_equation.py
+++ b/interface/tests/python/demo_wave_equation.py
@@ -99,11 +99,6 @@ mf.export_to_vtk('results/acceleration_0.vtk', A0)
A0 = 0.*U0
-os.system('mkdir results1');
-mf.export_to_vtk('results1/displacement_0.vtk', U0)
-mf.export_to_vtk('results1/velocity_0.vtk', V0)
-mf.export_to_vtk('results1/acceleration_0.vtk', A0)
-
## Iterations
n = 1;
for t in np.arange(0.,T,dt):
@@ -121,10 +116,6 @@ for t in np.arange(0.,T,dt):
V = md.variable('Dot_u1')
A = md.variable('Dot2_u1')
- mf.export_to_vtk('results1/displacement_%d.vtk' % n, U)
- mf.export_to_vtk('results1/velocity_%d.vtk' % n, V)
- mf.export_to_vtk('results1/acceleration_%d.vtk' % n, A)
-
n += 1
md.shift_variables_for_time_integration()
diff --git a/src/Makefile.am b/src/Makefile.am
index 018a943..5d377e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -253,6 +253,6 @@ libgetfem_la_LDFLAGS = ${LIBTOOL_VERSION_INFO}
libgetfem_la_LIBADD = @SUPERLU_LIBS@ @MUMPS_LIBS@
AM_CPPFLAGS = -I$(top_srcdir)/src -I../src -I$(top_srcdir)
-CLEANFILES = ii_files/* *.o.d gmm_arch_config.h
+CLEANFILES = ii_files/* *.o.d gmm/gmm_arch_config.h
DISTCLEANFILES = getfem/getfem_im_list.h getfem/getfem_arch_config.h