This commit is contained in:
Joachim Schoeberl 2014-04-28 07:15:26 +00:00
parent 763f8f9660
commit 7f8fc52371
3 changed files with 16 additions and 10 deletions

View File

@ -12,7 +12,6 @@
C++ interface to Netgen C++ interface to Netgen
*/ */
namespace netgen namespace netgen
{ {
struct T_EDGE2 struct T_EDGE2

View File

@ -7,8 +7,6 @@
#include "nginterface.h" #include "nginterface.h"
#include "nginterface_v2.hpp" #include "nginterface_v2.hpp"
#include "../general/archive_base.hpp"
namespace netgen namespace netgen
{ {
#include "writeuser.hpp" #include "writeuser.hpp"

View File

@ -1598,9 +1598,6 @@ namespace netgen
Vector shapes;
MatrixFixWidth<2> dshapes;
Array<Vec<3> > coefs;
const Element2d & el = mesh[elnr]; const Element2d & el = mesh[elnr];
ELEMENT_TYPE type = el.GetType(); ELEMENT_TYPE type = el.GetType();
@ -1658,6 +1655,13 @@ namespace netgen
} }
} }
ArrayMem<Vec<3>,100> coefs(info.ndof);
ArrayMem<double, 100> shapes_mem(info.ndof);
Vector shapes(info.ndof, &shapes_mem[0]);
ArrayMem<double, 200> dshapes_mem(2*info.ndof);
MatrixFixWidth<2> dshapes(info.ndof, &dshapes_mem[0]);
CalcElementShapes (info, xi, shapes); CalcElementShapes (info, xi, shapes);
GetCoefficients (info, coefs); GetCoefficients (info, coefs);
@ -3255,10 +3259,6 @@ namespace netgen
return; return;
} }
Vector shapes;
MatrixFixWidth<2> dshapes;
Array<Vec<DIM_SPACE> > coefs;
const Element2d & el = mesh[elnr]; const Element2d & el = mesh[elnr];
ELEMENT_TYPE type = el.GetType(); ELEMENT_TYPE type = el.GetType();
@ -3333,8 +3333,17 @@ namespace netgen
// THESE LAST LINES ARE COPIED FROM CurvedElements::CalcSurfaceTransformation // THESE LAST LINES ARE COPIED FROM CurvedElements::CalcSurfaceTransformation
ArrayMem<Vec<DIM_SPACE>,100> coefs(info.ndof);
GetCoefficients (info, coefs); GetCoefficients (info, coefs);
ArrayMem<double, 100> shapes_mem(info.ndof);
Vector shapes(info.ndof, &shapes_mem[0]);
// ArrayMem<double, 100> dshapes_mem(info.ndof*2);
MatrixFixWidth<2> dshapes; // (info.ndof,&shapes_mem[0]);
if (x) if (x)
{ {
if (info.order == 1 && type == TRIG) if (info.order == 1 && type == TRIG)