netgen - ngsolve integration

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netgen 4.9.4.
+# Generated by GNU Autoconf 2.63 for netgen 4.9.5.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='netgen'
 PACKAGE_TARNAME='netgen'
-PACKAGE_VERSION='4.9.4'
+PACKAGE_VERSION='4.9.5'
-PACKAGE_STRING='netgen 4.9.4'
+PACKAGE_STRING='netgen 4.9.5'
 PACKAGE_BUGREPORT=''
 
 ac_default_prefix="/opt/netgen"
@@ -1521,7 +1521,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures netgen 4.9.4 to adapt to many kinds of systems.
+\`configure' configures netgen 4.9.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1591,7 +1591,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of netgen 4.9.4:";;
+     short | recursive ) echo "Configuration of netgen 4.9.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1700,7 +1700,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-netgen configure 4.9.4
+netgen configure 4.9.5
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1714,7 +1714,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by netgen $as_me 4.9.4, which was
+It was created by netgen $as_me 4.9.5, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2430,7 +2430,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='netgen'
- VERSION='4.9.4'
+ VERSION='4.9.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17788,7 +17788,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by netgen $as_me 4.9.4, which was
+This file was extended by netgen $as_me 4.9.5, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17851,7 +17851,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-netgen config.status 4.9.4
+netgen config.status 4.9.5
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([netgen],[4.9.4],[],[])
+AC_INIT([netgen],[4.9.5],[],[])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
 AC_CONFIG_MACRO_DIR([m4])

libsrc/general/Makefile.am

@@ -1,6 +1,6 @@
-noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp
+noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp dynamicmem.hpp moveablemem.hpp  parthreads.hpp
 
-include_HEADERS =  dynamicmem.hpp moveablemem.hpp  parthreads.hpp ngexception.hpp
+include_HEADERS = ngexception.hpp
 
 AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
 METASOURCES = AUTO

libsrc/general/Makefile.in

@@ -233,8 +233,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp
+noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp dynamicmem.hpp moveablemem.hpp  parthreads.hpp
-include_HEADERS = dynamicmem.hpp moveablemem.hpp  parthreads.hpp ngexception.hpp
+include_HEADERS = ngexception.hpp
 AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libgeneral.la

libsrc/general/profiler.cpp

@@ -41,6 +41,9 @@ namespace netgen
     // which leads to an "order of destruction"-problem,
     // thus we use the C-variant:
 
+
+
+    /*
     char filename[100];
 #ifdef PARALLEL
     sprintf (filename, "netgen.prof.%d", id);
@@ -51,6 +54,7 @@ namespace netgen
     FILE *prof = fopen(filename,"w");
     Print (prof);
     fclose(prof);
+    */
   }
 
 

libsrc/include/mystdlib.h

@@ -74,20 +74,6 @@ namespace metis { extern "C" {
 # endif
 #endif
 
-/*
-extern void* operator new(std::size_t) throw (std::bad_alloc);
-extern void* operator new[](std::size_t) throw (std::bad_alloc);
-extern void operator delete(void*) throw();
-extern void operator delete[](void*) throw();
-*/
-
-/*
-extern int mem_alloc;
-extern int mem_total_alloc;
-extern int mem_max_alloc;
-extern int mem_total_alloc_array;
-extern int mem_total_alloc_table;
-*/
 
 using namespace std;
 

libsrc/meshing/global.cpp

@@ -1,8 +1,12 @@
 #include <mystdlib.h>
 #include "meshing.hpp"
 
+
 namespace netgen
 {
+  // stringstream emptystr;
+  // ostream * testout = &emptystr;
+  // testout -> clear(ios::failbit);
   ostream * testout = &cout;
 
   ostream * mycout = &cout;

ng/ngappinit.cpp

@@ -180,6 +180,7 @@ int main(int argc, char ** argv)
 
   if ( netgen::id == 0 )
     {
+      // if (parameters.StringFlagDefined ("testout"))
       netgen::testout = new ofstream (parameters.GetStringFlag ("testout", "test.out"));