This is an automated email from the git hooks/post-receive script. renard pushed a commit to branch master in repository getfem.
The following commit(s) were added to refs/heads/master by this push: new 11c409f Change in the web site upload 11c409f is described below commit 11c409fa4616c24afada01cfce57d37191e99096 Author: Yves Renard <yves.ren...@insa-lyon.fr> AuthorDate: Thu Jul 22 20:06:50 2021 +0200 Change in the web site upload --- .gitignore | 1 + bin/upload_html | 7 ------- doc/sphinx/Makefile.am | 5 ++++- src/getfem/getfem_generic_assembly.h | 4 ++-- src/getfem/getfem_global_function.h | 2 +- src/getfem/getfem_im_list.h | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 5ab869d..4c1d784 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ Makefile *~ /sequential/ /parallel/ +/doc/sphinx/getfem_site/ /aclocal.m4 /autom4te.cache/ /compile diff --git a/bin/upload_html b/bin/upload_html index 700b53f..e8ae691 100755 --- a/bin/upload_html +++ b/bin/upload_html @@ -73,10 +73,3 @@ if [ "$do_mrproper" != 0 ]; then # rsync --delete -rlptDv --rsh="ssh" "." "getfe806...@ftp.getfem.org:/$where/" rm -rf /tmp/toto00 fi - -if [ "$f" != "" ]; then - echo "uploading directory $f to download.savannah.nongnu.org:/releases/getfem/$where/" - chmod -R a+rw $f - rsync $options -rlptDv --rsh="ssh" "$f" "$m...@download.savannah.nongnu.org:/releases/getfem/$where/" - (cd $f && rsync $options -rlptDv --rsh="ssh" "." "$m...@cms.math.cnrs.fr:getfem") -fi diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am index ac55e23..e1d3992 100644 --- a/doc/sphinx/Makefile.am +++ b/doc/sphinx/Makefile.am @@ -160,7 +160,10 @@ upload: make html -rm -fr homepage *.tar.gz -mv build/html homepage - (export srcdir=$(srcdir) && $(top_srcdir)/bin/upload_html --delete homepage) + -(export srcdir=$(srcdir) && $(top_srcdir)/bin/upload_html --delete homepage) + -test ! -d "getfem_site" && git clone "git\@plmlab.math.cnrs.fr:renard/getfem_site.git" + -(cd homepage && rsync --delete -rlptDv . ../getfem_site/public) + -(cd getfem_site && git add . && git commit -m "update" && git push origin master) -rm -fr getfem-$(DISTVERSION)-docs-html -mv homepage getfem-$(DISTVERSION)-docs-html tar -cf getfem-$(DISTVERSION)-docs-html.tar getfem-$(DISTVERSION)-docs-html diff --git a/src/getfem/getfem_generic_assembly.h b/src/getfem/getfem_generic_assembly.h index 383bbb6..f9d3951 100644 --- a/src/getfem/getfem_generic_assembly.h +++ b/src/getfem/getfem_generic_assembly.h @@ -590,9 +590,9 @@ namespace getfem { enum class inherit { NONE, ENABLED, ALL }; - ga_workspace(const getfem::model &md_, + explicit ga_workspace(const getfem::model &md_, const inherit var_inherit=inherit::ENABLED); - ga_workspace(const ga_workspace &gaw, // compulsory 2nd arg to avoid + explicit ga_workspace(const ga_workspace &gaw,// compulsory 2nd arg to avoid const inherit var_inherit); // conflict with copy constructor ga_workspace(); ~ga_workspace(); diff --git a/src/getfem/getfem_global_function.h b/src/getfem/getfem_global_function.h index 66b3e56..9d18a8c 100644 --- a/src/getfem/getfem_global_function.h +++ b/src/getfem/getfem_global_function.h @@ -239,7 +239,7 @@ namespace getfem { enum { NOCUTOFF = -1, EXPONENTIAL_CUTOFF = 0, POLYNOMIAL_CUTOFF = 1, - POLYNOMIAL2_CUTOFF=2 }; + POLYNOMIAL2_CUTOFF= 2 }; int fun; scalar_type a4, r1, r0; virtual scalar_type val(scalar_type x, scalar_type y) const; diff --git a/src/getfem/getfem_im_list.h b/src/getfem/getfem_im_list.h index bca3c9c..79aa997 100644 --- a/src/getfem/getfem_im_list.h +++ b/src/getfem/getfem_im_list.h @@ -2,7 +2,7 @@ /*=========================================================================== - Copyright (C) 2002-2020 Yves Renard + Copyright (C) 2002-2021 Yves Renard This file is a part of GetFEM++