diff --git a/configure.ac b/configure.ac index 0f4d7c10..a8759f10 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([netgen],[5.2-dev],[],[]) +AC_INIT([netgen],[5.3-dev],[],[]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/libsrc/include/Makefile.am b/libsrc/include/Makefile.am index f84db193..c4420cf2 100644 --- a/libsrc/include/Makefile.am +++ b/libsrc/include/Makefile.am @@ -1,6 +1,7 @@ noinst_HEADERS = acisgeom.hpp gprim.hpp meshing.hpp occgeom.hpp \ visual.hpp csg.hpp incvis.hpp myadt.hpp opti.hpp geometry2d.hpp \ -linalg.hpp mydefs.hpp parallel.hpp stlgeom.hpp mystdlib.h +linalg.hpp mydefs.hpp parallel.hpp stlgeom.hpp mystdlib.h \ +nginterface_v2_impl.hpp include_HEADERS = nginterface.h nginterface_v2.hpp diff --git a/libsrc/include/mydefs.hpp b/libsrc/include/mydefs.hpp index 97aaa186..78d575df 100644 --- a/libsrc/include/mydefs.hpp +++ b/libsrc/include/mydefs.hpp @@ -20,7 +20,7 @@ // in the configure/make phases, with the // right version number #ifdef WIN32 -#define PACKAGE_VERSION "5.2-dev" +#define PACKAGE_VERSION "5.3-dev" #endif diff --git a/libsrc/meshing/curvedelems.cpp b/libsrc/meshing/curvedelems.cpp index ad322e1c..41b3d91e 100644 --- a/libsrc/meshing/curvedelems.cpp +++ b/libsrc/meshing/curvedelems.cpp @@ -3675,7 +3675,6 @@ namespace netgen - Vector shapes; MatrixFixWidth<3> dshapes; @@ -3706,7 +3705,10 @@ namespace netgen // info.ndof += facecoeffsindex[info.facenr+1] - facecoeffsindex[info.facenr]; } - Array > coefs(info.ndof); + ArrayMem,100> coefs(info.ndof); + ArrayMem shapes_mem(info.ndof); + Vector shapes(info.ndof, &shapes_mem[0]); + GetCoefficients (info, &coefs[0]); if (x) { diff --git a/ng/menustat.tcl b/ng/menustat.tcl index 56f0250f..08d058d4 100644 --- a/ng/menustat.tcl +++ b/ng/menustat.tcl @@ -1066,7 +1066,7 @@ proc timer2 { } { } } - after 200 { timer2 } + after 30 { timer2 } } # after 1000 { timer2 } timer2