diff --git a/libsrc/include/nginterface_v2.hpp b/libsrc/include/nginterface_v2.hpp index d06c7de9..4c28670b 100644 --- a/libsrc/include/nginterface_v2.hpp +++ b/libsrc/include/nginterface_v2.hpp @@ -389,7 +389,7 @@ namespace netgen // also added from nginterface.h, still 1-based, need redesign void HPRefinement (int levels, double parameter = 0.125, bool setorders = true,bool ref_level = false); - void SplitAlefeld (); + void SplitAlfeld (); size_t GetNP() const; int GetSurfaceElementSurfaceNumber (size_t ei) const; diff --git a/libsrc/interface/nginterface_v2.cpp b/libsrc/interface/nginterface_v2.cpp index c2f295bb..f7c92194 100644 --- a/libsrc/interface/nginterface_v2.cpp +++ b/libsrc/interface/nginterface_v2.cpp @@ -1229,11 +1229,11 @@ namespace netgen ::netgen::HPRefinement (*mesh, &ref, SPLIT_HP, levels, parameter, setorders, ref_level); } - void Ngx_Mesh::SplitAlefeld () + void Ngx_Mesh::SplitAlfeld () { NgLock meshlock (mesh->MajorMutex(), true); Refinement & ref = const_cast (mesh->GetGeometry()->GetRefinement()); - ::netgen::HPRefinement (*mesh, &ref, SPLIT_ALEFELD, 1, 0.5, true, true); + ::netgen::HPRefinement (*mesh, &ref, SPLIT_ALFELD, 1, 0.5, true, true); } diff --git a/libsrc/meshing/hpref_trig.hpp b/libsrc/meshing/hpref_trig.hpp index 890d79ff..52f3582e 100644 --- a/libsrc/meshing/hpref_trig.hpp +++ b/libsrc/meshing/hpref_trig.hpp @@ -787,34 +787,34 @@ HPRef_Struct reftrig_3singedges = // HP_TRIG_3SINGEDGES -int reftrig_Alefeld_splitedges[][3] = +int reftrig_Alfeld_splitedges[][3] = { { 0, 0, 0 } }; -int reftrig_Alefeld_splitfaces[][4] = +int reftrig_Alfeld_splitfaces[][4] = { { 1, 2, 3, 4 }, { 0, 0, 0, 0 } }; -HPREF_ELEMENT_TYPE reftrig_Alefeld_newelstypes[] = +HPREF_ELEMENT_TYPE reftrig_Alfeld_newelstypes[] = { HP_TRIG, HP_TRIG, HP_TRIG, HP_NONE, }; -int reftrig_Alefeld_newels[][8] = +int reftrig_Alfeld_newels[][8] = { { 1, 2, 4 }, { 2, 3, 4 }, { 3, 1, 4 }, }; -HPRef_Struct reftrig_Alefeld = +HPRef_Struct reftrig_Alfeld = { HP_TRIG, - reftrig_Alefeld_splitedges, - reftrig_Alefeld_splitfaces, + reftrig_Alfeld_splitedges, + reftrig_Alfeld_splitfaces, 0, - reftrig_Alefeld_newelstypes, - reftrig_Alefeld_newels + reftrig_Alfeld_newelstypes, + reftrig_Alfeld_newels }; diff --git a/libsrc/meshing/hprefinement.cpp b/libsrc/meshing/hprefinement.cpp index 22db74d8..ecb6505b 100644 --- a/libsrc/meshing/hprefinement.cpp +++ b/libsrc/meshing/hprefinement.cpp @@ -174,8 +174,8 @@ namespace netgen case HP_TRIG_3SINGEDGES: hps = &reftrig_3singedges; break; - case HP_TRIG_ALEFELD: - hps = &reftrig_Alefeld; break; + case HP_TRIG_ALFELD: + hps = &reftrig_Alfeld; break; case HP_QUAD: @@ -1846,7 +1846,7 @@ bool CheckSingularities(Mesh & mesh, INDEX_2_HASHTABLE & edges, INDEX_2_HAS cornerpoint, edgepoint, faces, face_edges, surf_edges, facepoint, levels, act_ref); - if (act_ref == 1 && split == SPLIT_ALEFELD) + if (act_ref == 1 && split == SPLIT_ALFELD) sing = true; if(sing==0) return(sing); @@ -1900,7 +1900,7 @@ bool CheckSingularities(Mesh & mesh, INDEX_2_HASHTABLE & edges, INDEX_2_HAS hpel.type = ClassifyTrig(hpel, edges, edgepoint_dom, cornerpoint, edgepoint, faces, face_edges, surf_edges, facepoint, dim, fd); else - hpel.type = HP_TRIG_ALEFELD; + hpel.type = HP_TRIG_ALFELD; dd = 2; break; diff --git a/libsrc/meshing/hprefinement.hpp b/libsrc/meshing/hprefinement.hpp index 3095a38b..5d1e498a 100644 --- a/libsrc/meshing/hprefinement.hpp +++ b/libsrc/meshing/hprefinement.hpp @@ -41,7 +41,7 @@ enum HPREF_ELEMENT_TYPE { HP_TRIG_SINGEDGES23, HP_TRIG_3SINGEDGES = 40, - HP_TRIG_ALEFELD, + HP_TRIG_ALFELD, HP_QUAD = 50, HP_QUAD_SINGCORNER, @@ -313,7 +313,7 @@ public: }; -enum SplittingType { SPLIT_HP, SPLIT_ALEFELD }; +enum SplittingType { SPLIT_HP, SPLIT_ALFELD }; DLL_HEADER extern void HPRefinement (Mesh & mesh, Refinement * ref, SplittingType split, int levels, double fac1=0.125, bool setorders=true, bool ref_level = false);