Merge V9_dev branch into master

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

diff --git a/src/HEXABLOCK/HexElements.cxx b/src/HEXABLOCK/HexElements.cxx
index 5dd09d3bf14e849f453e3761038f5269267e6ec8..51ffae5e1d5ba4a6081ec5169db6d7acc72dade8 100755 (executable)
--- 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-2016  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)
 {