[Getfem-commits] (no subject)

[Yves Renard]

branch: master
commit fb3a2e86e4b3d663fc1a25aaf52784a45d6dd209
Author: Matthias Bussonnier <bussonniermatthias@gmail.com>
AuthorDate: Wed Dec 13 16:26:43 2023 +0100

    Typo and UTF-8
    
    It look like there is a typo in the conditional include, I guessing you
    want to include only if not defined, but there is not the same number of
    underscore in define.
    
    Also one of the files are in ISO-8859 (latin1) I guess, which make clang
    show warnings for `é` and a few other character, do not change content
    but change to utf8, it seems to fix the warning. This has the side
    effect of making the diff show the correct characters instead of
    mojibake.
---
 src/getfem/getfem_fourth_order.h |  2 +-
 src/getfem/getfem_im_list.h      |  2 +-
 tests/plate.cc                   | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/getfem/getfem_fourth_order.h b/src/getfem/getfem_fourth_order.h
index 1c06e324..1d3d81a7 100644
--- a/src/getfem/getfem_fourth_order.h
+++ b/src/getfem/getfem_fourth_order.h
@@ -35,7 +35,7 @@
    @date January 6, 2006.
    @brief assembly procedures and bricks for fourth order pdes.
 */
-#ifndef GETFEM_FOURTH_ORDER_H_
+#ifndef GETFEM_FOURTH_ORDER_H__
 #define GETFEM_FOURTH_ORDER_H__
 
 #include "getfem_models.h"
diff --git a/src/getfem/getfem_im_list.h b/src/getfem/getfem_im_list.h
index a86ee4f5..0b145355 100644
--- a/src/getfem/getfem_im_list.h
+++ b/src/getfem/getfem_im_list.h
@@ -2,7 +2,7 @@
 
 /*===========================================================================
 
- Copyright (C) 2002-2022 Yves Renard
+ Copyright (C) 2002-2023 Yves Renard
 
  This file is a part of GetFEM++
 
diff --git a/tests/plate.cc b/tests/plate.cc
index 6273a3cd..455b59aa 100644
--- a/tests/plate.cc
+++ b/tests/plate.cc
@@ -1,6 +1,6 @@
 /*===========================================================================
 
- Copyright (C) 2002-2020 Yves Renard, Michel Sala�n.
+ Copyright (C) 2002-2020 Yves Renard, Michel Salaün.
 
  This file is a part of GetFEM
 
@@ -65,8 +65,8 @@ struct plate_problem {
   getfem::mesh_fem mf_theta;
   getfem::mesh_fem mf_rhs;   /* mesh_fem for the right hand side (f(x),..)   */
   getfem::mesh_fem mf_coef;  /* mesh_fem used to represent pde coefficients  */
-  scalar_type lambda, mu;    /* Lam� coefficients.                           */
-  scalar_type E, nu;    /* Lam� coefficients.                           */
+  scalar_type lambda, mu;    /* Lamé coefficients.                           */
+  scalar_type E, nu;    /* Lamé coefficients.                           */
   scalar_type epsilon;       /* thickness of the plate.                      */
   scalar_type pressure;
   scalar_type residual;      /* max residual for the iterative solvers         
*/
@@ -75,7 +75,7 @@ struct plate_problem {
   int sol_ref;               // sol_ref = 0 : simple support on the vertical 
edges
                              // sol_ref = 1 : homogeneous on the vertical edges
                              // sol_ref = 2 : homogeneous on the 4 vertical
-                             //       edges with solution u3 = sin�(x)*sin�(y)
+                             //       edges with solution u3 = sin²(x)*sin²(y)
   scalar_type eta;           // useful only if sol_ref == 2 :
                              // eta = 0 => Kirchhoff-Love
                             // eta = small => Mindlin 
@@ -153,8 +153,8 @@ void plate_problem::init(void) {
     
   LX = PARAM.real_value("LX");
   LY = PARAM.real_value("LY");
-  mu = PARAM.real_value("MU", "Lam� coefficient mu");
-  lambda = PARAM.real_value("LAMBDA", "Lam� coefficient lambda");
+  mu = PARAM.real_value("MU", "Lamé coefficient mu");
+  lambda = PARAM.real_value("LAMBDA", "Lamé coefficient lambda");
   epsilon = PARAM.real_value("EPSILON", "thickness of the plate");
   pressure = PARAM.real_value("PRESSURE",
                              "pressure on the top surface of the plate.");
@@ -171,7 +171,7 @@ void plate_problem::init(void) {
      cout << "bord en appuis simple\n" ; 
      cout << "nombre de terme pour calcul sol exacte : " << N_Four << " \n" ;
      // Calcul des coeeficients de Fourier de la solution exacte :
-     // Cas o� le chargement est seulement vertical (pas de moment appliqu�)
+     // Cas où le chargement est seulement vertical (pas de moment appliqué)
      gmm::resize( theta1_Four, N_Four, N_Four) ;
      gmm::resize( theta2_Four, N_Four, N_Four) ;
      gmm::resize( u3_Four, N_Four, N_Four) ;
@@ -196,7 +196,7 @@ void plate_problem::init(void) {
           Jmn(2, 2) = A * A + B * B ;
           gmm::scale(Jmn,  - E*(epsilon/2.) / (1. + nu) ) ;
           
-          // calcul du d�veloppement de Fourrier du chargement :
+          // calcul du développement de Fourrier du chargement :
           if ( ( (i + 1) % 2 == 1 ) && ( (j + 1) % 2 == 1) ) {
              Pmn =  16. * pressure / ( scalar_type(i + 1) * scalar_type(j + 1) 
* M_PI * M_PI) ; }
           else {
@@ -347,7 +347,7 @@ scalar_type plate_problem::u3_exact(base_node P) {
             }
        return (u3_local) ;
        break ; 
-  default : GMM_ASSERT1(false, "indice de solution de r�f�rence incorrect");
+  default : GMM_ASSERT1(false, "indice de solution de référence incorrect");
   }
 }
 
@@ -446,8 +446,8 @@ bool plate_problem::solve(plain_vector &Ut, plain_vector 
&U3, plain_vector &THET
 
   // Defining the surface source term.
   if (study_flag == 1 ){
-     cout << "Attention : l'intensit� de la pression verticale " ;
-     cout << "a �t� choisie pour que le d�placement maximal soit unitaire." ;
+     cout << "Attention : l'intensité de la pression verticale " ;
+     cout << "a été choisie pour que le déplacement maximal soit unitaire." ;
      cout << "Pour annuler cette option, faire STUDY_FLAG = 0\n" ;
      switch(sol_ref) {
            case 0 :