From c5acbacadb6ba5fc3fef20a1d9ae5206b29e8a38 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Tue, 9 Jul 2019 18:00:12 +0200 Subject: [PATCH] Rename ArrayMem to NgArrayMem --- libsrc/csg/csgeom.cpp | 2 +- libsrc/csg/specpoin.cpp | 2 +- libsrc/general/ngarray.hpp | 8 ++--- libsrc/gprim/adtree.cpp | 4 +-- libsrc/interface/nginterface.cpp | 12 ++++---- libsrc/interface/nginterface_v2.cpp | 2 +- libsrc/meshing/adfront2.cpp | 4 +-- libsrc/meshing/adfront3.cpp | 2 +- libsrc/meshing/clusters.cpp | 2 +- libsrc/meshing/curvedelems.cpp | 48 ++++++++++++++--------------- libsrc/meshing/curvedelems.hpp | 2 +- libsrc/meshing/improve3.cpp | 4 +-- libsrc/meshing/localh.cpp | 12 ++++---- libsrc/meshing/meshtype.cpp | 2 +- libsrc/meshing/netrule3.cpp | 6 ++-- libsrc/meshing/refine.cpp | 14 ++++----- libsrc/meshing/ruler2.cpp | 14 ++++----- libsrc/meshing/ruler3.cpp | 18 +++++------ libsrc/meshing/topology.cpp | 6 ++-- libsrc/stlgeom/stltool.cpp | 2 +- libsrc/visualization/vssolution.cpp | 18 +++++------ 21 files changed, 92 insertions(+), 92 deletions(-) diff --git a/libsrc/csg/csgeom.cpp b/libsrc/csg/csgeom.cpp index bc1c3539..2d222ce5 100644 --- a/libsrc/csg/csgeom.cpp +++ b/libsrc/csg/csgeom.cpp @@ -1148,7 +1148,7 @@ namespace netgen //return; int pinds[6]; - ArrayMem surfused(GetNSurf()); + NgArrayMem surfused(GetNSurf()); ReducePrimitiveIterator rpi(box); UnReducePrimitiveIterator urpi; diff --git a/libsrc/csg/specpoin.cpp b/libsrc/csg/specpoin.cpp index 1bdd5015..9069f36c 100644 --- a/libsrc/csg/specpoin.cpp +++ b/libsrc/csg/specpoin.cpp @@ -211,7 +211,7 @@ namespace netgen bool surecrossp = 0, sureexp = 0; // sure ... // static NgArray locsurf; // attention: array is static - ArrayMem locsurf; + NgArrayMem locsurf; // static int cntbox = 0; // cntbox++; diff --git a/libsrc/general/ngarray.hpp b/libsrc/general/ngarray.hpp index 9637e50f..e819fcc2 100644 --- a/libsrc/general/ngarray.hpp +++ b/libsrc/general/ngarray.hpp @@ -458,7 +458,7 @@ namespace netgen template - class ArrayMem : public NgArray + class NgArrayMem : public NgArray { using NgArray::size; using NgArray::data; @@ -469,7 +469,7 @@ namespace netgen // double mem[(S*sizeof(T)+7) / 8]; public: /// Generate array of logical and physical size asize - explicit ArrayMem(size_t asize = 0) + explicit NgArrayMem(size_t asize = 0) : NgArray (S, static_cast (static_cast(&mem[0]))) { size = asize; @@ -481,14 +481,14 @@ namespace netgen // SetSize (asize); } - ArrayMem & operator= (const T & val) + NgArrayMem & operator= (const T & val) { NgArray::operator= (val); return *this; } /// array copy - ArrayMem & operator= (const NgFlatArray & a2) + NgArrayMem & operator= (const NgFlatArray & a2) { this->SetSize (a2.Size()); for (size_t i = 0; i < size; i++) diff --git a/libsrc/gprim/adtree.cpp b/libsrc/gprim/adtree.cpp index 78cd43f2..9e4fc5e3 100644 --- a/libsrc/gprim/adtree.cpp +++ b/libsrc/gprim/adtree.cpp @@ -1704,7 +1704,7 @@ namespace netgen { // static NgArray stack(10000); // stack.SetSize (10000); - ArrayMem stack(10000); + NgArrayMem stack(10000); pis.SetSize(0); stack[0].node = root; @@ -1924,7 +1924,7 @@ namespace netgen { // static NgArray stack(10000); // stack.SetSize (10000); - ArrayMem,10000> stack(10000); + NgArrayMem,10000> stack(10000); pis.SetSize(0); stack[0].node = root; diff --git a/libsrc/interface/nginterface.cpp b/libsrc/interface/nginterface.cpp index a8ff165b..1896583a 100644 --- a/libsrc/interface/nginterface.cpp +++ b/libsrc/interface/nginterface.cpp @@ -1581,7 +1581,7 @@ int Ng_GetSurfaceElement_Face (int selnr, int * orient) int Ng_GetFace_Vertices (int fnr, int * vert) { const MeshTopology & topology = mesh->GetTopology(); - ArrayMem ia; + NgArrayMem ia; topology.GetFaceVertices (fnr, ia); for (int i = 0; i < ia.Size(); i++) vert[i] = ia[i]; @@ -1593,7 +1593,7 @@ int Ng_GetFace_Vertices (int fnr, int * vert) int Ng_GetFace_Edges (int fnr, int * edge) { const MeshTopology & topology = mesh->GetTopology(); - ArrayMem ia; + NgArrayMem ia; topology.GetFaceEdges (fnr, ia); for (int i = 0; i < ia.Size(); i++) edge[i] = ia[i]; @@ -1928,7 +1928,7 @@ int Ng_IsRunning() int Ng_GetVertex_Elements( int vnr, int* elems ) { const MeshTopology& topology = mesh->GetTopology(); - ArrayMem indexArray; + NgArrayMem indexArray; topology.GetVertexElements( vnr, indexArray ); for( int i=0; iGetTopology(); - ArrayMem indexArray; + NgArrayMem indexArray; topology.GetVertexSurfaceElements( vnr, indexArray ); for( int i=0; iGetTopology(); - ArrayMem indexArray; + NgArrayMem indexArray; topology.GetVertexElements( vnr, indexArray ); return indexArray.Size(); @@ -1991,7 +1991,7 @@ int Ng_GetVertex_NSurfaceElements( int vnr ) case 3: { const MeshTopology& topology = mesh->GetTopology(); - ArrayMem indexArray; + NgArrayMem indexArray; topology.GetVertexSurfaceElements( vnr, indexArray ); return indexArray.Size(); } diff --git a/libsrc/interface/nginterface_v2.cpp b/libsrc/interface/nginterface_v2.cpp index 68618f54..1d8f9366 100644 --- a/libsrc/interface/nginterface_v2.cpp +++ b/libsrc/interface/nginterface_v2.cpp @@ -756,7 +756,7 @@ namespace netgen Ng_BufferMS Ngx_Mesh::GetFaceEdges (int fnr) const { const MeshTopology & topology = mesh->GetTopology(); - ArrayMem ia; + NgArrayMem ia; topology.GetFaceEdges (fnr+1, ia); Ng_BufferMS res(ia.Size()); for (size_t i = 0; i < ia.Size(); i++) diff --git a/libsrc/meshing/adfront2.cpp b/libsrc/meshing/adfront2.cpp index 0eb86f11..e4e6bda2 100644 --- a/libsrc/meshing/adfront2.cpp +++ b/libsrc/meshing/adfront2.cpp @@ -290,8 +290,8 @@ namespace netgen loclines.Append(lines[baselineindex].L()); lindex.Append(baselineindex); - ArrayMem nearlines(0); - ArrayMem nearpoints(0); + NgArrayMem nearlines(0); + NgArrayMem nearpoints(0); // dominating costs !! linesearchtree.GetIntersecting (p0 - Vec3d(xh, xh, xh), diff --git a/libsrc/meshing/adfront3.cpp b/libsrc/meshing/adfront3.cpp index 8a3021f4..506c8660 100644 --- a/libsrc/meshing/adfront3.cpp +++ b/libsrc/meshing/adfront3.cpp @@ -845,7 +845,7 @@ int AdFront3 :: SameSide (const Point<3> & lp1, const Point<3> & lp2, pmin.SetToMin (lp2); pmax.SetToMax (lp2); - ArrayMem aprif; + NgArrayMem aprif; aprif.SetSize(0); if (!testfaces) diff --git a/libsrc/meshing/clusters.cpp b/libsrc/meshing/clusters.cpp index 32c43c71..86045061 100644 --- a/libsrc/meshing/clusters.cpp +++ b/libsrc/meshing/clusters.cpp @@ -141,7 +141,7 @@ namespace netgen (tm, nse, [&] (size_t begin, size_t end) { - ArrayMem nnums, ednums; + NgArrayMem nnums, ednums; for (int i = begin+1; i <= end; i++) { const Element2d & el = mesh.SurfaceElement(i); diff --git a/libsrc/meshing/curvedelems.cpp b/libsrc/meshing/curvedelems.cpp index 3040846f..77a06f72 100644 --- a/libsrc/meshing/curvedelems.cpp +++ b/libsrc/meshing/curvedelems.cpp @@ -1216,7 +1216,7 @@ namespace netgen // if (el.GetType() == TRIG && order >= 3) if (top.GetFaceType(facenr+1) == TRIG && order >= 3) { - ArrayMem verts(3); + NgArrayMem verts(3); top.GetFaceVertices (facenr+1, verts); int fnums[] = { 0, 1, 2 }; @@ -1467,10 +1467,10 @@ namespace netgen info.ndof += edgeorder[info.edgenr]-1; } - ArrayMem,100> coefs(info.ndof); - ArrayMem shapes_mem(info.ndof); + NgArrayMem,100> coefs(info.ndof); + NgArrayMem shapes_mem(info.ndof); TFlatVector shapes(info.ndof, &shapes_mem[0]); - ArrayMem dshapes_mem(info.ndof); + NgArrayMem dshapes_mem(info.ndof); TFlatVector dshapes(info.ndof, &dshapes_mem[0]); @@ -1778,10 +1778,10 @@ namespace netgen } - ArrayMem,100> coefs(info.ndof); - ArrayMem shapes_mem(info.ndof); + NgArrayMem,100> coefs(info.ndof); + NgArrayMem shapes_mem(info.ndof); TFlatVector shapes(info.ndof, &shapes_mem[0]); - ArrayMem dshapes_mem(2*info.ndof); + NgArrayMem dshapes_mem(2*info.ndof); MatrixFixWidth<2> dshapes(info.ndof, &dshapes_mem[0]); @@ -2175,7 +2175,7 @@ namespace netgen { -1, 1 } }; // double hshapes[20], hdshapes[20]; - ArrayMem hshapes(order+1), hdshapes(order+1); + NgArrayMem hshapes(order+1), hdshapes(order+1); int ii = 4; const ELEMENT_EDGE * edges = MeshTopology::GetEdges1 (QUAD); @@ -2588,9 +2588,9 @@ namespace netgen } } - ArrayMem mem(info.ndof); + NgArrayMem mem(info.ndof); TFlatVector shapes(info.ndof, &mem[0]); - ArrayMem dshapes_mem(info.ndof*3); + NgArrayMem dshapes_mem(info.ndof*3); MatrixFixWidth<3> dshapes(info.ndof, &dshapes_mem[0]); CalcElementShapes (info, xi, shapes); @@ -3248,7 +3248,7 @@ namespace netgen vi1 = vi1 % 3; vi2 = vi2 % 3; - ArrayMem shapei_mem(order+1); + NgArrayMem shapei_mem(order+1); TFlatVector shapei(order+1, &shapei_mem[0]); CalcScaledEdgeShapeDxDt<3> (order, lami[vi1]-lami[vi2], lami[vi1]+lami[vi2], &dshapes(ii,0) ); CalcScaledEdgeShape(order, lami[vi1]-lami[vi2], lami[vi1]+lami[vi2], &shapei(0) ); @@ -3331,8 +3331,8 @@ namespace netgen if(el[fav[1]] > el[fav[2]]) swap(fav[1],fav[2]); if(el[fav[0]] > el[fav[1]]) swap(fav[0],fav[1]); - ArrayMem dshapei_mem(ndf); - ArrayMem shapei_mem(ndf); + NgArrayMem dshapei_mem(ndf); + NgArrayMem shapei_mem(ndf); MatrixFixWidth<2,T> dshapei(ndf, &dshapei_mem[0]); TFlatVector shapei(ndf, &shapei_mem[0]); @@ -3472,7 +3472,7 @@ namespace netgen int vi1 = (edges[i][0]-1), vi2 = (edges[i][1]-1); if (el[vi1] > el[vi2]) swap (vi1, vi2); - ArrayMem shapei_mem(eorder+1); + NgArrayMem shapei_mem(eorder+1); TFlatVector shapei(eorder+1,&shapei_mem[0]); CalcScaledEdgeShapeDxDt<3> (eorder, sigma[vi1]-sigma[vi2], 1-z, &dshapes(ii,0) ); CalcScaledEdgeShape(eorder, sigma[vi1]-sigma[vi2], 1-z, &shapei(0) ); @@ -3633,7 +3633,7 @@ namespace netgen { -1, 1, 1 } }; - ArrayMem hshapes(order+1), hdshapes(order+1); + NgArrayMem hshapes(order+1), hdshapes(order+1); int ii = 8; const ELEMENT_EDGE * edges = MeshTopology::GetEdges1 (HEX); @@ -4062,7 +4062,7 @@ namespace netgen T lami[4]; TFlatVector vlami(4, lami); - ArrayMem, 50> coarse_xi (npts); + NgArrayMem, 50> coarse_xi (npts); for (int pi = 0; pi < npts; pi++) { @@ -4216,13 +4216,13 @@ namespace netgen // THESE LAST LINES ARE COPIED FROM CurvedElements::CalcSurfaceTransformation - ArrayMem,100> coefs(info.ndof); + NgArrayMem,100> coefs(info.ndof); GetCoefficients (info, coefs); - ArrayMem shapes_mem(info.ndof); + NgArrayMem shapes_mem(info.ndof); TFlatVector shapes(info.ndof, &shapes_mem[0]); - ArrayMem dshapes_mem(info.ndof*2); + NgArrayMem dshapes_mem(info.ndof*2); MatrixFixWidth<2,T> dshapes(info.ndof,&shapes_mem[0]); @@ -4368,7 +4368,7 @@ namespace netgen FlatVector vlami(8, lami); - ArrayMem, 50> coarse_xi (xi->Size()); + NgArrayMem, 50> coarse_xi (xi->Size()); for (int pi = 0; pi < xi->Size(); pi++) { @@ -4527,7 +4527,7 @@ namespace netgen TFlatVector vlami(8, &lami[0]); - ArrayMem coarse_xi (3*n); + NgArrayMem coarse_xi (3*n); for (int pi = 0; pi < n; pi++) { @@ -4645,12 +4645,12 @@ namespace netgen } if (ok) return; - ArrayMem,100> coefs(info.ndof); - ArrayMem shapes_mem(info.ndof); + NgArrayMem,100> coefs(info.ndof); + NgArrayMem shapes_mem(info.ndof); TFlatVector shapes(info.ndof, &shapes_mem[0]); - ArrayMem dshapes_mem(3*info.ndof); + NgArrayMem dshapes_mem(3*info.ndof); MatrixFixWidth<3,T> dshapes(info.ndof, &dshapes_mem[0]); // NgProfiler::StopTimer (timer3); diff --git a/libsrc/meshing/curvedelems.hpp b/libsrc/meshing/curvedelems.hpp index e774fe58..f0d5d21c 100644 --- a/libsrc/meshing/curvedelems.hpp +++ b/libsrc/meshing/curvedelems.hpp @@ -224,7 +224,7 @@ private: int order; int nv; int ndof; - ArrayMem edgenrs; + NgArrayMem edgenrs; int facenr; }; diff --git a/libsrc/meshing/improve3.cpp b/libsrc/meshing/improve3.cpp index 0c43ef9c..98400ded 100644 --- a/libsrc/meshing/improve3.cpp +++ b/libsrc/meshing/improve3.cpp @@ -1182,8 +1182,8 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, { Element hel(TET); - ArrayMem suroundpts(nsuround); - ArrayMem tetused(nsuround); + NgArrayMem suroundpts(nsuround); + NgArrayMem tetused(nsuround); Element & elem = mesh[hasbothpoints[0]]; diff --git a/libsrc/meshing/localh.cpp b/libsrc/meshing/localh.cpp index 48919975..d8445b11 100644 --- a/libsrc/meshing/localh.cpp +++ b/libsrc/meshing/localh.cpp @@ -449,9 +449,9 @@ namespace netgen Box3d boxcfc(c,fc); - ArrayMem faceused; - ArrayMem faceused2; - ArrayMem facenotused; + NgArrayMem faceused; + NgArrayMem faceused2; + NgArrayMem facenotused; /* faceused.SetSize(0); @@ -606,9 +606,9 @@ namespace netgen Box3d fboxc(fc-fv, fc+fv); Box3d boxcfc(c,fc); - ArrayMem faceused; - ArrayMem faceused2; - ArrayMem facenotused; + NgArrayMem faceused; + NgArrayMem faceused2; + NgArrayMem facenotused; for (int j = 0; j < nfinbox; j++) { diff --git a/libsrc/meshing/meshtype.cpp b/libsrc/meshing/meshtype.cpp index f32714c5..32402d43 100644 --- a/libsrc/meshing/meshtype.cpp +++ b/libsrc/meshing/meshtype.cpp @@ -2146,7 +2146,7 @@ namespace netgen { int np = GetNP(); double eps = 1e-6; - ArrayMem mem(2*np); + NgArrayMem mem(2*np); TFlatVector shaper(np, &mem[0]); TFlatVector shapel(np, &mem[np]); // Vector shaper(np), shapel(np); diff --git a/libsrc/meshing/netrule3.cpp b/libsrc/meshing/netrule3.cpp index 753abbb0..b45de522 100644 --- a/libsrc/meshing/netrule3.cpp +++ b/libsrc/meshing/netrule3.cpp @@ -201,7 +201,7 @@ int vnetrule :: IsTriangleInFreeZone (const Point3d & p1, int infreeset, cannot = 0; - ArrayMem pfi(3), pfi2(3); + NgArrayMem pfi(3), pfi2(3); // convert from local index to freeset index int i, j; @@ -868,7 +868,7 @@ int vnetrule :: IsQuadInFreeZone (const Point3d & p1, int infreeset, cannot = 0; - ArrayMem pfi(4), pfi2(4); + NgArrayMem pfi(4), pfi2(4); // convert from local index to freeset index int i, j; @@ -931,7 +931,7 @@ int vnetrule :: IsQuadInFreeSet (const Point3d & p1, const Point3d & p2, return 1; } - ArrayMem pi3(3); + NgArrayMem pi3(3); int res; pi3.Elem(1) = pi.Get(1); diff --git a/libsrc/meshing/refine.cpp b/libsrc/meshing/refine.cpp index ca7f737b..7b0e2c3c 100644 --- a/libsrc/meshing/refine.cpp +++ b/libsrc/meshing/refine.cpp @@ -192,8 +192,8 @@ namespace netgen case TRIG: case TRIG6: { - ArrayMem pnums(6); - ArrayMem pgis(6); + NgArrayMem pnums(6); + NgArrayMem pgis(6); static int betw[3][3] = { { 2, 3, 4 }, @@ -275,8 +275,8 @@ namespace netgen case QUAD6: case QUAD8: { - ArrayMem pnums(9); - ArrayMem pgis(9); + NgArrayMem pnums(9); + NgArrayMem pgis(9); static int betw[5][3] = { { 1, 2, 5 }, @@ -367,7 +367,7 @@ namespace netgen case TET: case TET10: { - ArrayMem pnums(10); + NgArrayMem pnums(10); static int betw[6][3] = { { 1, 2, 5 }, { 1, 3, 6 }, @@ -458,7 +458,7 @@ namespace netgen } case HEX: { - ArrayMem pnums(27); + NgArrayMem pnums(27); static int betw[13][3] = { { 1, 2, 9 }, { 3, 4, 10 }, @@ -584,7 +584,7 @@ namespace netgen } case PRISM: { - ArrayMem pnums(18); + NgArrayMem pnums(18); static int betw[9][3] = { { 3, 1, 7 }, { 1, 2, 8 }, diff --git a/libsrc/meshing/ruler2.cpp b/libsrc/meshing/ruler2.cpp index ae9f267a..b37c3b1b 100644 --- a/libsrc/meshing/ruler2.cpp +++ b/libsrc/meshing/ruler2.cpp @@ -66,15 +66,15 @@ namespace netgen int noldll = llines1.Size(); - ArrayMem pused(maxlegalpoint), lused(maxlegalline); - ArrayMem pnearness(noldlp), lnearness(llines1.Size()); + NgArrayMem pused(maxlegalpoint), lused(maxlegalline); + NgArrayMem pnearness(noldlp), lnearness(llines1.Size()); - ArrayMem pmap, pfixed, lmap; + NgArrayMem pmap, pfixed, lmap; - ArrayMem tempnewpoints; - ArrayMem tempnewlines; - ArrayMem tempdellines; - ArrayMem tempelements; + NgArrayMem tempnewpoints; + NgArrayMem tempnewlines; + NgArrayMem tempdellines; + NgArrayMem tempelements; elements.SetSize (0); diff --git a/libsrc/meshing/ruler3.cpp b/libsrc/meshing/ruler3.cpp index 42f87a22..a853de03 100644 --- a/libsrc/meshing/ruler3.cpp +++ b/libsrc/meshing/ruler3.cpp @@ -79,19 +79,19 @@ int Meshing3 :: ApplyRules NgArray pused; // point is already mapped, number of uses - ArrayMem fused; // face is already mapped - ArrayMem pmap; // map of reference point to local point - ArrayMem pfixed; // point mapped by face-map - ArrayMem fmapi; // face in reference is mapped to face nr ... - ArrayMem fmapr; // face in reference is rotated to map - ArrayMem transfreezone; // transformed free-zone + NgArrayMem fused; // face is already mapped + NgArrayMem pmap; // map of reference point to local point + NgArrayMem pfixed; // point mapped by face-map + NgArrayMem fmapi; // face in reference is mapped to face nr ... + NgArrayMem fmapr; // face in reference is rotated to map + NgArrayMem transfreezone; // transformed free-zone INDEX_2_CLOSED_HASHTABLE ledges(100); // edges in local environment - ArrayMem tempnewpoints; + NgArrayMem tempnewpoints; NgArray tempnewfaces; - ArrayMem tempdelfaces; + NgArrayMem tempdelfaces; NgArray tempelements; - ArrayMem triboxes; // bounding boxes of local faces + NgArrayMem triboxes; // bounding boxes of local faces NgArray pnearness; NgArray fnearness; diff --git a/libsrc/meshing/topology.cpp b/libsrc/meshing/topology.cpp index a2075176..850ab808 100644 --- a/libsrc/meshing/topology.cpp +++ b/libsrc/meshing/topology.cpp @@ -1800,8 +1800,8 @@ namespace netgen void MeshTopology :: GetFaceEdges (int fnr, NgArray & fedges, bool withorientation) const { - ArrayMem pi(4); - ArrayMem eledges; + NgArrayMem pi(4); + NgArrayMem eledges; fedges.SetSize (0); GetFaceVertices(fnr, pi); @@ -1812,7 +1812,7 @@ namespace netgen // e3 = op e1(f2,f3) // e4 = op e2(f1,f3) - /* ArrayMem fp; + /* NgArrayMem fp; fp[0] = pi[0]; for(int k=1;kfp[0]) swap(fp[k],fp[0]); diff --git a/libsrc/stlgeom/stltool.cpp b/libsrc/stlgeom/stltool.cpp index 683fdc83..5a2eb61e 100644 --- a/libsrc/stlgeom/stltool.cpp +++ b/libsrc/stlgeom/stltool.cpp @@ -1308,7 +1308,7 @@ int STLBoundary :: TestSegChartNV(const Point3d & p1, const Point3d& p2, { // NgProfiler::RegionTimer reg(timerquick); - ArrayMem pis; + NgArrayMem pis; searchtree -> GetIntersecting (box2d.PMin(), box2d.PMax(), pis); for (auto i2 : pis) diff --git a/libsrc/visualization/vssolution.cpp b/libsrc/visualization/vssolution.cpp index 5faf42e6..93245546 100644 --- a/libsrc/visualization/vssolution.cpp +++ b/libsrc/visualization/vssolution.cpp @@ -1852,8 +1852,8 @@ namespace netgen CurvedElements & curv = mesh->GetCurvedElements(); int n = 1 << subdivisions; - ArrayMem, 65> ptsloc(n+1); - ArrayMem, 65> ptsglob(n+1); + NgArrayMem, 65> ptsloc(n+1); + NgArrayMem, 65> ptsglob(n+1); double trigpts[3][2] = { { 0, 0 }, { 0, 1 }, { 1, 0} }; double trigvecs[3][2] = { { 1, 0 }, { 0, -1 }, { -1, 1} }; @@ -2829,7 +2829,7 @@ namespace netgen if (comp == 0) { - ArrayMem values(data->components); + NgArrayMem values(data->components); ok = GetValues (data, elnr, xref, x, dxdxref, &values[0]); val = ExtractValue (data, 0, &values[0]); @@ -3000,7 +3000,7 @@ namespace netgen if (comp == 0) { - ArrayMem values(data->components); + NgArrayMem values(data->components); ok = GetValues (data, elnr, lam1, lam2, lam3, &values[0]); val = ExtractValue (data, 0, &values[0]); return ok; @@ -3383,7 +3383,7 @@ namespace netgen { case SOL_VIRTUALFUNCTION: { - ArrayMem values(data->components); + NgArrayMem values(data->components); bool ok; ok = data->solclass->GetSurfValue (selnr, facetnr, lam1, lam2, &values[0]); @@ -3413,7 +3413,7 @@ namespace netgen if (comp == 0) { val = 0; - ArrayMem values(data->components); + NgArrayMem values(data->components); ok = GetSurfValues (data, selnr, facetnr, lam1, lam2, &values[0]); val = ExtractValue (data, 0, &values[0]); return ok; @@ -3425,7 +3425,7 @@ namespace netgen case SOL_VIRTUALFUNCTION: { - ArrayMem values(data->components); + NgArrayMem values(data->components); bool ok; ok = data->solclass->GetSurfValue (selnr, facetnr, lam1, lam2, &values[0]); @@ -3655,7 +3655,7 @@ namespace netgen if (comp == 0) { val = 0; - ArrayMem values(data->components); + NgArrayMem values(data->components); ok = GetSurfValues (data, selnr, facetnr, xref, x, dxdxref, &values[0]); val = ExtractValue (data, 0, &values[0]); return ok; @@ -3666,7 +3666,7 @@ namespace netgen { case SOL_VIRTUALFUNCTION: { - ArrayMem values(data->components); + NgArrayMem values(data->components); bool ok; // ok = data->solclass->GetSurfValue (selnr, lam1, lam2, &values[0]);