// C++ : Classe Document : Methodes internes 2011
-// 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
#include "HexAnaQuads.hxx"
#include "HexElements.hxx"
#include "HexCramer.hxx"
+#include "HexGlobale.hxx"
BEGIN_NAMESPACE_HEXA
return clone;
}
-// ----------------------------------------------------------------------------
-// ======================================================== countUsedHexa
-int Document::countUsedHexa ()
-{
- if (count_modified)
- renumeroter ();
-
- return nbr_used_hexas;
-}
-// ======================================================== countUsedQuad
-int Document::countUsedQuad ()
-{
- if (count_modified)
- renumeroter ();
-
- return nbr_used_quads;
-}
-// ======================================================== countUsedEdge
-int Document::countUsedEdge ()
-{
- if (count_modified)
- renumeroter ();
-
- return nbr_used_edges;
-}
-// ======================================================== countUsedVertex
-int Document::countUsedVertex ()
-{
- if (count_modified)
- renumeroter ();
-
- return nbr_used_vertex;
-}
-
-// ======================================================== getUsedHexa
-Hexa* Document::getUsedHexa (int nro)
-{
- if (count_modified)
- renumeroter ();
-
- if (nro<0 || nro >= nbr_used_hexas)
- return NULL;
-
- return doc_used_hexas [nro];
-}
-// ======================================================== getUsedQuad
-Quad* Document::getUsedQuad (int nro)
-{
- if (count_modified)
- renumeroter ();
-
- if (nro<0 || nro >= nbr_used_quads)
- return NULL;
-
- return doc_used_quads [nro];
-}
-// ======================================================== getUsedEdge
-Edge* Document::getUsedEdge (int nro)
-{
- if (count_modified)
- renumeroter ();
-
- if (nro<0 || nro >= nbr_used_edges)
- return NULL;
-
- return doc_used_edges [nro];
-}
-// ======================================================== getUsedVertex
-Vertex* Document::getUsedVertex (int nro)
-{
- if (count_modified)
- renumeroter ();
-
- if (nro<0 || nro >= nbr_used_vertex)
- return NULL;
-
- return doc_used_vertex [nro];
-}
-// ======================================================== renumeroter
-void Document::renumeroter ()
-{
- count_modified = false;
- // -- 1) Raz numerotation precedente
- markAll (NO_COUNTED);
-
- doc_used_hexas .clear ();
- doc_used_quads .clear ();
- doc_used_edges .clear ();
- doc_used_vertex.clear ();
-
- for (EltBase* elt = doc_first_elt[EL_HEXA]->next (); elt!=NULL;
- elt = elt->next())
- {
- if (elt!=NULL && elt->isHere())
- {
- Hexa* cell = static_cast <Hexa*> (elt);
- doc_used_hexas.push_back (cell);
- for (int nb=0 ; nb<HQ_MAXI ; nb++)
- cell->getQuad (nb)->setMark (IS_USED);
-
- for (int nb=0 ; nb<HE_MAXI ; nb++)
- cell->getEdge (nb)->setMark (IS_USED);
-
- for (int nb=0 ; nb<HV_MAXI ; nb++)
- cell->getVertex (nb)->setMark (IS_USED);
- }
- }
-
- for (EltBase* elt = doc_first_elt[EL_QUAD]->next (); elt!=NULL;
- elt = elt->next())
- {
- if (elt!=NULL && elt->isHere() && elt->getMark()==IS_USED)
- {
- Quad* cell = static_cast <Quad*> (elt);
- doc_used_quads.push_back (cell);
- }
- }
-
- for (EltBase* elt = doc_first_elt[EL_EDGE]->next (); elt!=NULL;
- elt = elt->next())
- {
- if (elt!=NULL && elt->isHere() && elt->getMark()==IS_USED)
- {
- Edge* cell = static_cast <Edge*> (elt);
- doc_used_edges.push_back (cell);
- }
- }
-
- for (EltBase* elt = doc_first_elt[EL_VERTEX]->next (); elt!=NULL;
- elt = elt->next())
- {
- if (elt!=NULL && elt->isHere() && elt->getMark()==IS_USED)
- {
- Vertex* cell = static_cast <Vertex*> (elt);
- doc_used_vertex.push_back (cell);
- }
- }
-
- nbr_used_hexas = doc_used_hexas .size ();
- nbr_used_quads = doc_used_quads .size ();
- nbr_used_edges = doc_used_edges .size ();
- nbr_used_vertex = doc_used_vertex .size ();
-}
// ---------------------------------------------------------------
// ============================================================== addHexa2quads
Hexa* Document::addHexa2Quads (Quad* q1, Quad* q2)
{
+ DumpStart ("addHexa2Quads", q1 << q2);
AnaQuads ana_quads (q1, q2);
Hexa* hexa = NULL;
else if (ana_quads.nbr_aretes == 1)
hexa = addHexaQuadsAC (ana_quads);
+ DumpReturn (hexa);
return hexa;
}
// ============================================================= addHexa3quads
Hexa* Document::addHexa3Quads (Quad* q1, Quad* q2, Quad* q3)
{
+ DumpStart ("addHexa3Quads", q1 << q2 << q3);
AnaQuads ana_quads (q1, q2, q3);
Hexa* hexa = NULL;
else if (ana_quads.nbr_aretes == 3)
hexa = addHexaQuadsACE (ana_quads);
+ DumpReturn (hexa);
return hexa;
}
// ============================================================= addHexa4quads
Hexa* Document::addHexa4Quads (Quad* q1, Quad* q2, Quad* q3, Quad* q4)
{
+ DumpStart ("addHexa4Quads", q1 << q2 << q3 << q4);
AnaQuads ana_quads (q1, q2, q3, q4);
Hexa* hexa = NULL;
else if (ana_quads.nbr_aretes == 5)
hexa = addHexaQuadsACDE (ana_quads);
+ DumpReturn (hexa);
return hexa;
}
// ============================================================== addHexa5quads
Hexa* Document::addHexa5Quads (Quad* q1, Quad* q2, Quad* q3, Quad* q4, Quad* q5)
{
+ DumpStart ("addHexa5Quads", q1 << q2 << q3 << q4 << q5);
AnaQuads ana_quads (q1, q2, q3, q4, q5);
if (ana_quads.status != HOK)
return NULL;
Quad* q_a = ana_quads.tab_quads[qbase];
Quad* q_b = new Quad (tedge[0], tedge[1], tedge[2], tedge[3]);
Hexa* hexa = new Hexa (q_a, q_b, tquad[0], tquad[2], tquad[1], tquad[3]);
+
+ DumpReturn (hexa);
return hexa;
}
// ---------------------------------------------------------------
Hexa* hexa = new Hexa (q_a, q_b, q_c, q_d, q_e, q_f);
return hexa;
}
-// ======================================================== revolutionQuads
-Elements* Document::revolutionQuads (Quads& start, Vertex* center, Vector* axis,
- RealVector &angles)
-{
- if (center==NULL) return NULL;
- if (axis ==NULL) return NULL;
- if (angles.size()==0) return NULL;
- if (start .size()==0) return NULL;
-
- Elements* prisme = new Elements (this);
- prisme->revolutionQuads (start, center, axis, angles);
- return prisme;
-}
-// ======================================================== makeCylindricals
-Elements* Document::makeCylindricals (Vertex* c, Vector* b, Vector* h,
- RealVector& tdr, RealVector& tda, RealVector& tdl, bool fill)
+// ========================================================= replaceHexa
+Elements* Document::replaceHexa (Quads pattern, Vertex* p1, Vertex* c1,
+ Vertex* p2, Vertex* c2, Vertex* p3, Vertex* c3)
{
- Elements* grille = new Elements (this);
- grille->makeCylindricalGrid (c, b, h, tdr, tda, tdl, fill);
- return grille;
+ DumpStart ("replaceHexa", pattern << p1 << c1 << p2 << c2 << p3 << c3);
+
+ Elements* t_hexas = new Elements (this);
+ Mess << " **** This syntax is deprecated" ;
+ t_hexas->setError (HERR);
+
+ DumpReturn (t_hexas);
+ return t_hexas;
}
// ========================================================= replace
-Elements* Document::replace (Quads& pattern, Vertex* p1, Vertex* c1,
- Vertex* p2, Vertex* c2, Vertex* p3, Vertex* c3)
+Elements* Document::replace (Quads motif, Quads cible, Vertex* p1, Vertex* c1, Vertex* p2, Vertex* c2)
{
+ DumpStart ("replace", motif << cible << p1 << c1 << p2 << c2);
+
Elements* t_hexas = new Elements (this);
- int ier = t_hexas->replaceHexas (pattern, p1, c1, p2, c2, p3, c3);
+ int ier = t_hexas->replaceHexas (motif, cible, p1, c1, p2, c2);
+
if (ier!=HOK)
{
- cout << " **** Error in Document::replace\n" << endl;
- t_hexas->setError (ier);
+ Mess << " **** Error in Document::replace" ;
+ t_hexas->setError (HERR);
}
- return t_hexas;
+
+ DumpReturn (t_hexas);
+ return t_hexas;
}
// ========================================================= print_replace
void print_replace (Edge* zig, Edge* zag)
thexas[nh]->replaceVertex (node, par);
}
// ========================================================= disconnectEdges
-Elements* Document::disconnectEdges (Hexas& thexas, Edges& tedges)
+Elements* Document::disconnectEdges (Hexas thexas, Edges tedges)
{
- int nbedges = tedges.size();
- int nbhexas = thexas.size();
-
+ DumpStart ("disconnectEdges", thexas << tedges);
+
if (db)
cout << " +++ Disconnect Edges" << endl;
+ Elements* grid = new Elements (this);
+
+ grid->checkDisco (thexas, tedges);
+
+ int nbedges = tedges.size();
+ int nbhexas = thexas.size();
+
if (nbhexas != nbedges)
{
cout << " **** Error in Document::disconnectEdges\n" << endl;
}
else if (nbhexas==1)
{
- Elements* grille = disconnectEdge (thexas[0], tedges[0]);
- return grille;
+ update ();
+ thexas[0]->disconnectEdge (tedges[0], grid);
+ return grid;
}
for (int nro=0 ; nro<nbedges ; nro++)
#define VertexIsNew(v) (it_vertex=new_vertex.find(v))!=new_vertex.end()
- Elements* nouveaux = new Elements (this);
Vertex* node1 = NULL;
for (int nro=0 ; nro<=nbedges ; nro++)
{
Vertex* node0 = node1;
node1 = new Vertex (tvertex[nro]);
- nouveaux->addVertex (node1);
+ grid->addVertex (node1);
new_vertex [tvertex[nro]] = node1;
if (db)
{
if (nro>0)
{
Edge* edge = new Edge (node0, node1);
- nouveaux->addEdge (edge);
+ grid->addEdge (edge);
new_edge [tedges[nro-1]] = edge;
state_edge [tedges[nro-1]] = REPLACED;
if (db)
{
Edge* arete = new Edge (v1, v2);
new_edge [edge] = arete;
- nouveaux->addEdge (arete);
+ grid->addEdge (arete);
if (db)
print_replace (edge, arete);
}
{
Quad* face = new Quad (ted[0], ted[1], ted[2], ted[3]);
new_quad [quad] = face;
- nouveaux->addQuad (face);
+ grid->addQuad (face);
}
state_quad [quad] = etat;
}
center1[nc] = (center0[nc] + center1[nc])/2;
}
- Vertex* node = nouveaux->getVertex (nro);
+ Vertex* node = grid->getVertex (nro);
matrix.defScale (center1, 0.55);
matrix.perform (node);
}
- return nouveaux;
+ DumpReturn (grid);
+ return grid;
}
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
