[Getfem-commits] [getfem-commits] branch master updated: removing some remaining Getfem++

[Yves Renard]

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 0b83028  removing some remaining Getfem++
0b83028 is described below

commit 0b830289ed6b97fc7b673da922a072a23dbd53cd
Author: Yves Renard <address@hidden>
AuthorDate: Thu Apr 9 16:30:58 2020 +0200

    removing some remaining Getfem++
---
 doc/license.tex                                | 2 +-
 doc/sphinx/source/.templates/indexcontent.html | 8 ++------
 doc/sphinx/source/ACKS.txt                     | 6 +++---
 doc/sphinx/source/conf.py                      | 2 +-
 doc/sphinx/source/contents.rst                 | 6 +++---
 doc/sphinx/source/screenshots/shots.rst        | 6 +++---
 interface/src/python/getfem_python.c           | 4 ++--
 interface/src/python/setup.py.in               | 6 +++---
 8 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/doc/license.tex b/doc/license.tex
index 5467d04..d8a2faf 100644
--- a/doc/license.tex
+++ b/doc/license.tex
@@ -1,5 +1,5 @@
 Copyright (C) 2000-2020 Yves Renard, Julien Pommier.\\
-The program GetFEM++ is free software; you can redistribute it and/or modify
+The program GetFEM 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 along with the GCC Runtime Library
diff --git a/doc/sphinx/source/.templates/indexcontent.html 
b/doc/sphinx/source/.templates/indexcontent.html
index 7bfbd56..f68dc25 100644
--- a/doc/sphinx/source/.templates/indexcontent.html
+++ b/doc/sphinx/source/.templates/indexcontent.html
@@ -10,11 +10,7 @@
 
 <p><strong>NEW</strong> (June 2018): Version 5.3 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>
-
-
-  (June 2018): Version 5.3 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>
 
 
   <p><strong>Parts of the documentation:</strong></p>
@@ -94,7 +90,7 @@
 <p><h1>What is GetFEM<a class="headerlink" href="#what-is-getfem" 
title="Permalink to this headline">¶</a></h1></p>
 
     <p>
-    GetFEM is an open source library based on collaborative development. It 
aims to offer the most flexible framework for solving potentially coupled 
systems of linear and nonlinear partial differential equations with the finite 
element method (see the basic principle in <a class="biglink" 
href="https://hal.archives-ouvertes.fr/hal-02532422/document";> [GetFEM2020]_ 
</a>). GetFEM is interfaced with some script languages (Python, Scilab and 
Matlab) so that almost all of the functionalities [...]
+    GetFEM is an open source library based on collaborative development. It 
aims to offer the most flexible framework for solving potentially coupled 
systems of linear and nonlinear partial differential equations with the finite 
element method (see the basic principle in <a class="biglink" 
href="https://hal.archives-ouvertes.fr/hal-02532422/document";> 
[GetFEM2020]</a>). GetFEM is interfaced with some script languages (Python, 
Scilab and Matlab) so that almost all of the functionalities c [...]
     </p>
 
     <ul>
diff --git a/doc/sphinx/source/ACKS.txt b/doc/sphinx/source/ACKS.txt
index 1418f00..9d694e3 100644
--- a/doc/sphinx/source/ACKS.txt
+++ b/doc/sphinx/source/ACKS.txt
@@ -1,7 +1,7 @@
-Contributors to the GetFEM++ Documentation
-------------------------------------------
+Contributors to the GetFEM Documentation
+----------------------------------------
 
-This section lists people who have contributed in some way to the GetFEM++
+This section lists people who have contributed in some way to the GetFEM
 documentation.  It is probably not complete -- if you feel that you or
 anyone else should be on this list, please let us know (send email to
 address@hidden), and we'll be glad to correct the problem.
diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py
index d653ae2..0414c03 100644
--- a/doc/sphinx/source/conf.py
+++ b/doc/sphinx/source/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# GetFEM++ documentation build configuration file.
+# GetFEM documentation build configuration file.
 #
 # This file is execfile()d with the current directory set to its containing
 # dir.
diff --git a/doc/sphinx/source/contents.rst b/doc/sphinx/source/contents.rst
index 8c538c3..206f4ae 100644
--- a/doc/sphinx/source/contents.rst
+++ b/doc/sphinx/source/contents.rst
@@ -1,6 +1,6 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- GetFEM++ Documentation contents
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ GetFEM Documentation contents
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 .. toctree::
    :maxdepth: 3
diff --git a/doc/sphinx/source/screenshots/shots.rst 
b/doc/sphinx/source/screenshots/shots.rst
index aaaff82..4f01300 100644
--- a/doc/sphinx/source/screenshots/shots.rst
+++ b/doc/sphinx/source/screenshots/shots.rst
@@ -2,9 +2,9 @@
 
 .. _screenshots:
 
-**************************
-GetFEM++ in action ...
-**************************
+***********************
+GetFEM in action ...
+***********************
 
 Generic mesh handling
 ---------------------
diff --git a/interface/src/python/getfem_python.c 
b/interface/src/python/getfem_python.c
index 4f2b5c2..924b931 100644
--- a/interface/src/python/getfem_python.c
+++ b/interface/src/python/getfem_python.c
@@ -775,10 +775,10 @@ getfem_env(PyObject *self, PyObject *args) {
   PyObject* word_out;
 
   if (strcmp(word_in,"project") == 0) {
-    word_out = PyString_FromString("GetFEM++");
+    word_out = PyString_FromString("GetFEM");
   } else if (strcmp(word_in,"copyright") == 0) {
     word_out = PyString_FromString
-    ("2004-2018 GetFEM++ project");
+    ("2004-2018 GetFEM project");
   } else if (strcmp(word_in,"authors") == 0) {
     word_out = PyString_FromString
     ("Yves Renard, Julien Pommier, Konstantinos Poulios");
diff --git a/interface/src/python/setup.py.in b/interface/src/python/setup.py.in
index 10453f2..f0bed8d 100644
--- a/interface/src/python/setup.py.in
+++ b/interface/src/python/setup.py.in
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Python GetFEM++ interface
+# Python GetFEM interface
 #
 # Copyright (C) 2004-2020 Julien Pommier.
 #
-# This file is a part of GetFEM++
+# This file is a part of GetFEM
 #
-# GetFEM++  is  free software;  you  can  redistribute  it  and/or modify it
+# GetFEM  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 along with the GCC Runtime Library