Update copyrights

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

diff --git a/src/HEXABLOCK/HexElements.cxx b/src/HEXABLOCK/HexElements.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 3489152..087d093
--- a/src/HEXABLOCK/HexElements.cxx
+++ b/src/HEXABLOCK/HexElements.cxx
@@ -1,12 +1,12 @@
 
 // C++ : Grilles
 
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2019  CEA/DEN, EDF R&D
 //
 // 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
@@ -31,10 +31,10 @@
 #include <cmath>
 #include <map>
 
-static bool db=false;
-
 BEGIN_NAMESPACE_HEXA
 
+static bool db=on_debug();
+
 // ====================================================== Constructeur
 Elements::Elements (Document* doc) : EltBase (doc, EL_GRID)
 {
@@ -475,17 +475,6 @@ int Elements::coupler (int nquad, Quad* dest, StrOrient* orient)
        }
    return HOK;
 }
-// ====================================================== makeCylindricalNodes
-int Elements::makeCylindricalNodes (Vertex* orig, Vector* base, Vector* haut,
-            double dr, double da, double dl, int nr, int na, int nl, bool fill)
-{
-   int ier = makeBasicCylinder (dr, da, dl, nr, na, nl, fill);
-   if (ier!=HOK)
-       return ier;
-
-   transfoVertices  (orig,  base, haut);
-   return HOK;
-}
 // ====================================================== transform
 int Elements::transform (Matrix* matrice)
 {
@@ -798,5 +787,18 @@ int Elements::findVertex (double vx, double vy, double vz)
        }
    return NOTHING;
 }
+// ============================================================ findQuad
+Quad* Elements::findQuad (Edge* e1, Edge* e2)
+{
+   int nbre = tab_quad.size();
+   for (int nro=0 ; nro<nbre ; nro++)
+       {
+       Quad* quad = tab_quad [nro];
+       if (quad != NULL && quad->isHere ()
+                        && quad->definedBy (e1, e2))
+              return quad;
+       }
+   return NULL;
+}
 
 END_NAMESPACE_HEXA