Updated copyright comment

[modules/hexablock.git] / src / HEXABLOCK / hexa_utils.cxx

diff --git a/src/HEXABLOCK/hexa_utils.cxx b/src/HEXABLOCK/hexa_utils.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 7188589..7b0cfd7
--- a/src/HEXABLOCK/hexa_utils.cxx
+++ b/src/HEXABLOCK/hexa_utils.cxx
@@ -1,12 +1,12 @@
 
 // C++ : Fonctions utilitaires de Hexa
 
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2024  CEA, EDF
 //
 // This library 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 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,6 +25,7 @@
 #include <cstdlib>
 #include <cmath>
 #include <ctime>
+#include <algorithm>
 #include <sys/stat.h>
 
 BEGIN_NAMESPACE_HEXA
@@ -63,7 +64,7 @@ bool in_test ()
 
 }
 // ======================================================== set_minus
-void set_minus (string& chaine)
+void set_minus (std::string& chaine)
 {
    int lg = chaine.size();
    for (int nc=0 ; nc<lg ; nc++)
@@ -104,6 +105,13 @@ double calc_distance  (double v1[], double v2[])
    Real3 vv = { v2[dir_x]-v1[dir_x], v2[dir_y]-v1[dir_y], v2[dir_z]-v1[dir_z] };
    return calc_norme (vv);
 }
+// ======================================================== calc_d2
+double calc_d2  (double v1[], double v2[])
+{
+   double dd = carre (v2[dir_x]-v1[dir_x]) + carre (v2[dir_y]-v1[dir_y]) 
+             + carre (v2[dir_z]-v1[dir_z]);
+   return dd;
+}
 // ========================================================= calc_vecteur
 void calc_vecteur  (double pta[], double ptb[], double vab[])
 {
@@ -243,7 +251,7 @@ char* read_file (cpchar filename, int& size)
    return buffer;
 }
 // ====================================================== get_time
-cpchar get_time (string& buffer)
+cpchar get_time (std::string& buffer)
 {
    char   quand[24];
    time_t tps;
@@ -270,7 +278,7 @@ bool requals (const double* lun, const double* lautre)
           && requals (lun [1], lautre [1]) && requals (lun [2], lautre [2]) ;
 }
 // ======================================================== make_basename
-int make_basename (cpchar filename, string& base)
+int make_basename (cpchar filename, std::string& base)
 {
    const char slash = '/';
    const char antis = '\\';