Index: /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h =================================================================== --- /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h (revision 21486) +++ /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h (revision 21487) @@ -2,23 +2,26 @@ #define ADAPTIVEMESHREFINEMENT +/*Common includes*/ +/*{{{*/ #include #include #include -#include "pzsave.h" -#include "pzgmesh.h" -#include "pzreal.h" -#include "pzvec.h" -#include "pzeltype.h" +/*NeoPZ includes*/ +#include +#include +#include +#include +#include -#include "TPZRefPatternTools.h" -#include "TPZRefPatternDataBase.h" -#include "TPZRefPattern.h" +#include +#include +#include -#include "tpzchangeel.h" -#include "TPZGeoElement.h" -#include "pzreftriangle.h" -#include "tpzgeoelrefpattern.h" -#include "TPZRefPattern.h" +#include +#include +#include +#include +/*}}}*/ class AdaptiveMeshRefinement : public TPZSaveable { @@ -28,41 +31,41 @@ /*Public methods*/ /* Constructor, destructor etc*/ - AdaptiveMeshRefinement(); // Default constructor - AdaptiveMeshRefinement(const AdaptiveMeshRefinement &cp); // Copy constructor - AdaptiveMeshRefinement & operator= (const AdaptiveMeshRefinement &cp); // Operator of copy + AdaptiveMeshRefinement(); // Default constructor + AdaptiveMeshRefinement(const AdaptiveMeshRefinement &cp); // Copy constructor + AdaptiveMeshRefinement & operator= (const AdaptiveMeshRefinement &cp); // Operator of copy virtual ~AdaptiveMeshRefinement(); // Destructor /*Savable methods*/ - virtual int ClassId() const; // ClassId to save the class - virtual void Read(TPZStream &buf, void *context); // Read this class - virtual void Write(TPZStream &buf, int withclassid); // Write this class, using ClassId to identify + virtual int ClassId() const; // ClassId to save the class + virtual void Read(TPZStream &buf, void *context); // Read this class + virtual void Write(TPZStream &buf, int withclassid); // Write this class, using ClassId to identify /*General methods*/ - void CleanUp(); //Clean all attributes - void SetHMax(int &h); //Define the max level of refinement - void SetElementWidth(int &width); //Define elements width - void ExecuteRefinement(int &type_process,double *vx, double *vy, double *masklevelset, long &nvertices, long &nelements, long &nsegments, double** x, double** y, double** z, long*** elements, long*** segments=NULL); //A new mesh will be created and refined. This returns the new mesh + void CleanUp(); //Clean all attributes + void SetHMax(int &h); //Define the max level of refinement + void SetElementWidth(int &width); //Define elements width + void ExecuteRefinement(int &type_process,double *vx, double *vy, double *masklevelset, long &nvertices, long &nelements, long &nsegments, double** x, double** y, double** z, long*** elements, long*** segments=NULL); //A new mesh will be created and refined. This returns the new mesh void CreateInitialMesh(long &nvertices, long &nelements, long &nsegments, int &width, double* x, double* y, double* z, long** elements, long** segments=NULL); //Create a NeoPZ geometric mesh by coords and elements - void CheckMesh(long &nvertices, long &nelements, long &nsegments, int &width, double* x, double* y, double* z, long** elements, long** segments=NULL); //Check the consistency of the mesh + void CheckMesh(long &nvertices, long &nelements, long &nsegments, int &width, double* x, double* y, double* z, long** elements, long** segments=NULL); //Check the consistency of the mesh private: /*Private attributes*/ - int elementswidth; // geometric nodes for element: 3 == Tria, 4 == Tetra, 6 == Penta - int hmax; // max level of refinement - TPZGeoMesh *fathermesh; // Father Mesh is the entire mesh without refinement - TPZGeoMesh *previousmesh; // Previous mesh is a refined mesh of last step + int elementswidth; // geometric nodes for element: 3 == Tria, 4 == Tetra, 6 == Penta + int hmax; // max level of refinement + TPZGeoMesh *fathermesh; // Father Mesh is the entire mesh without refinement + TPZGeoMesh *previousmesh; // Previous mesh is a refined mesh of last step /*Private methods*/ - void RefinementProcess(TPZGeoMesh *gmesh,std::vector > &GLvec); // Start the refinement process + void RefinementProcess(TPZGeoMesh *gmesh,std::vector > &GLvec); // Start the refinement process void RefineMesh(TPZGeoMesh *gmesh, std::vector &ElemVec); // Refine the elements in ElemVec - void RefineMeshToAvoidHangingNodes(TPZGeoMesh *gmesh); // Refine the elements to avoid hanging nodes + void RefineMeshToAvoidHangingNodes(TPZGeoMesh *gmesh); // Refine the elements to avoid hanging nodes void SetElementsToRefine(TPZGeoMesh *gmesh,std::vector > &GLvec,int &hlevel, std::vector &ElemVec); //Define wich elements will be refined - void TagAllElements(TPZGeoMesh *gmesh,std::vector &ElemVec); // This tag all elements to be refined, that is, refine all elements - void TagElementsNearGroundingLine(TPZGeoMesh *gmesh,std::vector > &GLvec,int &hlevel,std::vector &ElemVec); //This tag elements near the grounding line - void CalcGroundingLinePosition(double *masklevelset,std::vector > &GLvec);// calculate the grounding line position using previous mesh + void TagAllElements(TPZGeoMesh *gmesh,std::vector &ElemVec); // This tag all elements to be refined, that is, refine all elements + void TagElementsNearGroundingLine(TPZGeoMesh *gmesh,std::vector > &GLvec,int &hlevel,std::vector &ElemVec); //This tag elements near the grounding line + void CalcGroundingLinePosition(double *masklevelset,std::vector > &GLvec); // calculate the grounding line position using previous mesh void GetMesh(TPZGeoMesh *gmesh, long &nvertices, long &nelements, long &nsegments, double** meshX, double** meshY, double** meshZ, long*** elements, long*** segments=NULL); //Return coords and elements in ISSM data structure - inline int GetElemMaterialID(){return 1;} // Return element material ID - inline int GetBoundaryMaterialID(){return 2;} // Return segment (2D boundary) material ID + inline int GetElemMaterialID(){return 1;} // Return element material ID + inline int GetBoundaryMaterialID(){return 2;} // Return segment (2D boundary) material ID };