Merge from V6_main (04/10/2012)

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

diff --git a/src/HEXABLOCK/HexElements_ter.cxx b/src/HEXABLOCK/HexElements_ter.cxx
index a56e79ec367f012a0a8f4f6de7bf046262a53ae7..cf1a35ef194d17407095de80c82148e32861b189 100755 (executable)
--- a/src/HEXABLOCK/HexElements_ter.cxx
+++ b/src/HEXABLOCK/HexElements_ter.cxx
@@ -386,12 +386,13 @@ void Elements::assoSphere (Vertex* ori, Edge* t_edge[], Quad* t_quad[])
 // ====================================================== makeSphericalGrid
 int Elements::makeSphericalGrid (Vertex* c, double rayon, int nb, double  k)
 {
-   resize (GR_SPHERIC, nb);
-
-   if (nb<0) 
-      return HERR;
-   else if (rayon <=ZEROR)
+   if (nb<=0 || rayon <=Epsil || k <= Epsil || BadElement (c))
+      {
+      setError ();
       return HERR;
+      }
+
+   resize (GR_SPHERIC, nb);
 
    Vertex* i_node [HV_MAXI];    // Les noeuds de l'hexa englobant
    Edge*   i_edge [HE_MAXI];    // Les noeuds de l'hexa englobant