debian/0000755000000000000000000000000012251560466007175 5ustar debian/netgen.install0000644000000000000000000000017612251560466012051 0ustar usr/bin/* usr/share/man/man1/* usr/share/netgen/*.tcl usr/share/applications/netgen.desktop usr/share/pixmaps/netgen16x16.xpm debian/watch0000644000000000000000000000014112251551074010215 0ustar version=3 opts=dversionmangle=s/\.dfsg// \ http://sf.net/netgen-mesher/netgen-([\d.]+)\.tar\.gz debian/netgen.sgml0000644000000000000000000001237512251551273011345 0ustar manpage.1'. You may view the manual page with: `docbook-to-man manpage.sgml | nroff -man | less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml docbook-to-man $< > $@ The docbook-to-man binary is found in the docbook-to-man package. Please remember that if you create the nroff version in one of the debian/rules file targets (such as build), you will need to include docbook-to-man in your Build-Depends control field. --> Christophe"> Prud'homme"> January 4, 2006"> 1"> prudhomm@debian.org"> NETGEN"> Debian"> GNU"> GPL"> ]>
&dhemail;
&dhfirstname; &dhsurname; 2003 &dhusername; &dhdate; &dhucpackage; &dhsection; &dhpackage; Automatic 3d tetrahedral mesh generator &dhpackage; OPTIONS... file.geo DESCRIPTION This manual page documents briefly the &dhpackage; and bar commands. This manual page was written for the &debian; distribution because the original program does not have a manual page. &dhpackage; is an automatic mesh generation tool for two and three dimensions. Netgen generates triangular or quadrilateral meshes in 2D, and tetrahedral meshes in 3D. The input for 2D is described by spline curves, and the input for 3D problems is either defined by constructive solid geometries, or by the standard STL file format. Netgen contains modules for mesh optimization and hierarchical mesh refinement. Curved elements are supported of arbitrary order. Homepage: http://www.mathcces.rwth-aachen.de/netgen/doku.php OPTIONS Input geometry file (alternative: netgen filename) Output mesh file Automatic mesh-size selection Filetype of output file, default is netgen file Run in batchmode Print additional information SEE ALSO gmsh (1) AUTHOR This manual page was written by &dhusername; &dhemail; for the &debian; system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the &gnu; General Public License, Version 2 any later version published by the Free Software Foundation. On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. debian/rules0000755000000000000000000000450712251555462010263 0ustar #!/usr/bin/make -f # Sample debian/rules that uses cdbs. Originaly written by Robert Millan. # This file is public domain. DEB_AUTO_CLEANUP_RCS := yes #DEB_AUTO_UPDATE_AUTOCONF := 1 export MACHINE=LINUX DEB_DH_COMPRESS_ARGS := -X pdf include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk DEB_CONFIGURE_EXTRA_FLAGS = --enable-occ --with-occ=/usr \ --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5 \ --with-togl=/usr/lib \ --enable-jpeglib # add opencascade support for 64bits #WITH_OCC=yes #ifeq ($(WITH_OCC),yes) # CFLAGS += -D_OCC64 # CXXFLAGS += -D_OCC64 # CPPFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H #endif makebuilddir/netgen:: if [ ! -e Makefile.in.save ]; then \ for autoreconfile in `find . -name Makefile.in` aclocal.m4 \ config.guess config.h.in config.sub configure depcomp install-sh \ ltmain.sh m4/libtool.m4 m4/lt*.m4 missing mkinstalldirs; do \ cp -p $$autoreconfile $$autoreconfile.save ; \ done; \ fi autoreconf --install build/netgen:: (cd debian && docbook-to-man netgen.sgml > netgen.1) install/netgen:: install -d $(DEB_DESTDIR)/usr/share/man/man1 install -m644 debian/netgen.1 $(DEB_DESTDIR)/usr/share/man/man1 install -m644 debian/ng_stl.1 $(DEB_DESTDIR)/usr/share/man/man1 install -m644 debian/ng_vol.1 $(DEB_DESTDIR)/usr/share/man/man1 install -d $(DEB_DESTDIR)/usr/share/netgen mv $(DEB_DESTDIR)/usr/bin/*.tcl $(DEB_DESTDIR)/usr/share/netgen chmod ugo-x $(DEB_DESTDIR)/usr/share/netgen/*.tcl mv $(DEB_DESTDIR)/usr/bin/netgen.ocf $(DEB_DESTDIR)/usr/share/netgen install -d $(DEB_DESTDIR)/usr/share/pixmaps install -m644 debian/netgen16x16.xpm $(DEB_DESTDIR)/usr/share/pixmaps install -d $(DEB_DESTDIR)/usr/share/applications install -m644 debian/netgen.desktop $(DEB_DESTDIR)/usr/share/applications install/netgen-doc:: install -d $(DEB_DESTDIR)/usr/share/doc/netgen-doc install -d $(DEB_DESTDIR)/usr/share/doc/netgen-doc/examples install -m644 tutorials/* $(DEB_DESTDIR)/usr/share/doc/netgen-doc/examples rm -f $(DEB_DESTDIR)/usr/share/doc/netgen-doc/examples/Makefile* cleanbuilddir/netgen:: -rm -f debian/netgen.1 [ ! -f Makefile ] || $(MAKE) distclean for autoreconfile in `find . -name \*.save`; do \ mv -f $$autoreconfile `echo $$autoreconfile | sed s/.save//`; \ done debian/changelog0000644000000000000000000002231012251560466011045 0ustar netgen (4.9.13.dfsg-8) unstable; urgency=medium * Team upload. * Patch netgen to set NETGENDIR if not already set. (Closes: #648047) * Remove /etc/profile.d/netgen.{csh,sh}. (Closes: #671186) -- Ansgar Burchardt Tue, 10 Dec 2013 10:15:08 +0100 netgen (4.9.13.dfsg-7) unstable; urgency=low * Drop quilt.mk and quilt build-depends, as otherwise patches are unapplied before autoreconf and thus this package FTBFS, as without patches autoreconf fails. Closes: #713306 -- Dmitrijs Ledkovs Thu, 22 Aug 2013 20:50:56 +0100 netgen (4.9.13.dfsg-6) unstable; urgency=low * Team upload. * Fix automake1.13 FTBFS at autoreconf. Closes: #713306 * Disable ffmpeg/avcodec, GPL incompatible + needs porting to new api. Closes: #618968 -- Dmitrijs Ledkovs Wed, 21 Aug 2013 23:29:59 +0100 netgen (4.9.13.dfsg-5) experimental; urgency=low * Team upload. * Use libjpeg-dev not libjpeg62-dev (closes: #644069). * Fix build against oce 0.10 (closes: #677558). * Tweak debian/rules to fix building twice in a row. * Fix libnglib-4.9.13 short description. * Add netgen-headers package providing internal headers (closes: #683661) * Bump oce build-dependencies to 0.10. -- Julien Cristau Tue, 27 Nov 2012 10:53:26 +0100 netgen (4.9.13.dfsg-4) unstable; urgency=low [ Denis Barbier ] * Switch from OpenCASCADE to OCE (closes: #659132). -- "Adam C. Powell, IV" Tue, 06 Mar 2012 11:17:32 -0500 netgen (4.9.13.dfsg-3) unstable; urgency=low * Versioned Depends on libopencascade-modeling-dev (closes: #619931). -- "Adam C. Powell, IV" Mon, 11 Apr 2011 18:04:44 -0400 netgen (4.9.13.dfsg-2) unstable; urgency=low * Patched to work with OpenCASCADE 6.5.0 (closes: #619931). -- "Adam C. Powell, IV" Fri, 01 Apr 2011 17:14:50 -0400 netgen (4.9.13.dfsg-1) unstable; urgency=low [ Reinhard Tartler ] * Add a flag to unbreak building with FFmpeg 0.6 (closes: #588982) [ Adam C. Powell, IV ] * New upstream (closes: #586786). * Quoted Adam Powell's name in the changelog (closes: #591770). * Added debian/patches/quiltrc and refreshed patches. * Bumped Standards-Version. * Added lintian overrides file. -- "Adam C. Powell, IV" Thu, 21 Oct 2010 23:48:28 -0400 netgen (4.9.12.dfsg-3) unstable; urgency=low * Added automake to Build-Depends (closes: #580516). * Moved to Debian Science git repository and updated control accordingly. * Move aside autotools-related files during configuration and cleaning. -- Adam C. Powell, IV Fri, 14 May 2010 15:50:02 -0400 netgen (4.9.12.dfsg-2) unstable; urgency=low [ Christophe Trophime ] * debian/control : added autoconf (Closes: #578292) * debian/watch : added dversionmangle * Change netgen icon [ Adam C. Powell, IV ] * Changed netgen.desktop to set NETGENDIR variable. -- Adam C. Powell, IV Tue, 04 May 2010 06:41:35 -0400 netgen (4.9.12.dfsg-1) unstable; urgency=low [ Christophe Prud'homme ] * New upstream release (Closes: #514621). * debian/watch: added [ Adam C. Powell, IV ] * Bumped Standards-Version. * Forward-ported netgen-missing-symbols.patch. * Simplified rules considerably for new autotools build system. * Added OpenCASCADE support (Closes: #506523). * Added -release versioning to libnglib and changed shlib package name from libnetgen4.9 to libnglib-4.9.12. * Changed source format to 3.0 (quilt). * Added autotools-dev and libtool to Build-Depends. * Updated README.Debian. * Removed doc/ng4.pdf because there's no source for it. [ Christophe Trophime ] * Add support for jpeglib * Add support for ffmpeg * Disable netgen profiling * Add missing man pages * Add /usr/share/netgen which contains *.tcl * Setting NETGENDIR to /usr/share/netgen in /etc/profile.d/*sh * Fix permissions on tcl scripts in /usr/share/netgen * Move netgen.ocf to /usr/share/netgen * Added libbz2-dev to debian/control * Add menu entry for netgen -- Adam C. Powell, IV Mon, 12 Apr 2010 22:24:17 -0400 netgen (4.4-15) unstable; urgency=low [Christophe Prud'homme] * Bug fix: "patch depends on changes from .diff.gz", thanks to Raphael Hertzog (Closes: #485181). * Bug fix: "obsolete binaries need to be removed", thanks to Frank Lichtenheld (Closes: #490750). [Daniel Leidert] * debian/copyright: Completed. -- Christophe Prud'homme Sun, 09 Nov 2008 12:47:59 +0100 netgen (4.4-14) unstable; urgency=low * debian/control: do not build on alpha, hppa and m68k -- Christophe Prud'homme Sat, 26 Apr 2008 11:18:42 +0200 netgen (4.4-13) unstable; urgency=low * Bug fix: "netgen: Undefined symbols in libraries", thanks to Adam C Powell IV (Closes: #475323). * debian/rules: build depends on libgl1-mesa-dev|nvidia-glx-dev -- Christophe Prud'homme Sun, 13 Apr 2008 12:44:21 +0200 netgen (4.4-12) unstable; urgency=low * attempt to fix hppa build * Bug fix: "netgen: FTBFS: include/../ngstd/array.hpp:294: error: 'memcpy' was not declared in this scope", thanks to Lucas Nussbaum (Closes: #474828). -- Christophe Prud'homme Wed, 09 Apr 2008 08:28:05 +0200 netgen (4.4-11) unstable; urgency=low [ Christophe Prud'homme ] * debian/rules: export LINK * fixed build on ia64 and possibly other archs * debian/patches/netgen-shlibs.patch: cleanup up LINKFLAGS2 -- Christophe Prud'homme Mon, 07 Apr 2008 13:28:49 +0200 netgen (4.4-10) unstable; urgency=low [ Daniel Leidert ] * debian/control: Added Homepage field. Vcs fields transition. Fixed Vcs-Svn field. * debian/netgen-doc.doc-base: Fixed encoding of the file. (Abstract): Improved description. (Section): Fixed for doc-base 0.8.10. * debian/rules (clean): Fixed to build twice in a row. * debian/patches/stdlib.patch: Adjusted to compile with GCC 4.3 (closes: #454830). * debian/patches/netgen-shlibs.patch: Adjusted. Add linkages to resolve symbols for the libraries. Otherwise the library package dependencies will not be correct. * debian/patches/clean.patch: Removed. Not sufficient. Better be done in debian/rules. [ Christophe Prud'homme ] * debian/rules: export CC/CPLUSPLUS * Upload -- Christophe Prud'homme Mon, 07 Apr 2008 10:53:48 +0200 netgen (4.4-9) unstable; urgency=low * Bug fix: "netgen: clean target is insufficient", thanks to brian m. carlson (Closes: #455536). * Bug fix: "FTBFS with GCC 4.3: missing #includes", thanks to Martin Michlmayr (Closes: #454830). * Bug fix: "netgen: Interface lib is missing nglib.cpp", thanks to Adam C. Powell (Closes: #461929). * Bug fix: "netgen: Please add shared libs", thanks to Adam C. Powell (Closes: #462105). * debian/control: Fixed Depends for libnetgen * debian/control: Updated Standards-Version -- Christophe Prud'homme Fri, 08 Feb 2008 09:27:04 +0100 netgen (4.4-8) unstable; urgency=low [ Christophe Prud'homme ] * Bug fix: "FTBFS with GCC 4.3: missing #includes", thanks to Martin Michlmayr (Closes: #417451). [ Rafael Laboissiere ] * debian/control: Added XS-Vcs-Svn and XS-Vcs-Browser fields to the Source section -- Christophe Prud'homme Tue, 17 Jul 2007 06:32:28 +0200 netgen (4.4-7) unstable; urgency=low * Added g++ to Build-Depends, it might help build on arm * Updated Standards-Version to 3.7.2 (no change) -- Christophe Prud'homme Sun, 30 Jul 2006 17:09:06 +0200 netgen (4.4-6) unstable; urgency=low * Bug fix: "netgen: FTBFS: cannot find -lXi", thanks to Daniel Schepler (Closes: #370176). * Make it compile with g++ 4.1 -- Christophe Prud'homme Fri, 9 Jun 2006 08:00:29 +0200 netgen (4.4-5) unstable; urgency=low * Fixed netgen override disparity * Fixed tix dependency * Changed Maintainer to pkg-scicomp Alioth project and added myself to the list of Uploaders -- Christophe Prud'homme Sun, 9 Apr 2006 17:43:36 +0200 netgen (4.4-4) unstable; urgency=low * Bug fix: "netgen: does not run or missing dependency", thanks to Laurent Bonnaud (Closes: #359949). * Bug fix: "FTBFS with G++ 4.1: misc errors", thanks to Martin Michlmayr (Closes: #361336). -- Christophe Prud'homme Sat, 8 Apr 2006 10:57:12 +0200 netgen (4.4-3) unstable; urgency=low * Fixed build-depends: added libxmu-dev -- Christophe Prud'homme Sat, 25 Mar 2006 13:49:40 +0100 netgen (4.4-2) unstable; urgency=low * Fixed build-depends -- Christophe Prud'homme Fri, 17 Mar 2006 19:33:04 +0100 netgen (4.4-1) unstable; urgency=low * Initial release Closes: #343082 * applied patch by D. Barbier to disable occ * Note to archive maintainer: I have added license.terms (tk license) and LICENSE.togl (close to tk license) to the archive and all copyright holders are listed in debian/copyright -- Christophe Prud'homme Sat, 18 Feb 2006 11:25:26 +0100 debian/control0000644000000000000000000000673012251560466010606 0ustar Source: netgen Section: math Priority: optional Maintainer: Debian Science Maintainers Uploaders: Christophe Prud'homme , "Adam C. Powell, IV" DM-Upload-Allowed: yes Build-Depends: cdbs, debhelper (>= 8.1.0~), autotools-dev, automake, libtool, g++ (>= 4.0), tcl8.5-dev, tk8.5-dev, tix-dev (>= 8.4.3-2), docbook-to-man, libxmu-dev, libglu1-mesa-dev, libgl1-mesa-dev|nvidia-glx-dev, liboce-foundation-dev (>= 0.10), liboce-modeling-dev (>= 0.10), liboce-visualization-dev (>= 0.10), liboce-ocaf-dev (>= 0.10), liboce-ocaf-lite-dev (>= 0.10), libtogl-dev (>= 1.7), libswscale-dev, libjpeg-dev, libbz2-dev, Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/debian-science/packages/netgen.git Vcs-Browser: http://git.debian.org/?p=debian-science/packages/netgen.git Homepage: http://sourceforge.net/projects/netgen-mesher/ Package: netgen Architecture: any Depends: tix, tix-dev, ${shlibs:Depends}, ${misc:Depends} Description: Automatic 3d tetrahedral mesh generator NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. NETGEN contains modules for mesh optimization and hierarchical mesh refinement. Package: netgen-doc Section: doc Architecture: all Depends: ${misc:Depends} Suggests: netgen Description: Automatic 3d tetrahedral mesh generator documentation NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. NETGEN contains modules for mesh optimization and hierarchical mesh refinement. . This package contains the user manual (in PDF format) and example files. Package: libnglib-dev Section: libdevel Architecture: any Depends: libnglib-4.9.13 (= ${binary:Version}), ${misc:Depends} Description: Automatic 3d tetrahedral mesh generator development files NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. The connection to a geometry kernel allows the handling of IGES and STEP files. NETGEN contains modules for mesh optimization and hierarchical mesh refinement. . This package contains the static libraries and header files. Package: libnglib-4.9.13 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Automatic 3d tetrahedral mesh generator shared library NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. The connection to a geometry kernel allows the handling of IGES and STEP files. NETGEN contains modules for mesh optimization and hierarchical mesh refinement. . This package contains the shared libraries. Package: netgen-headers Section: libdevel Architecture: any Depends: libnglib-dev (= ${binary:Version}), ${misc:Depends}, Description: Automatic 3d tetrahedral mesh generator internal headers NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. The connection to a geometry kernel allows the handling of IGES and STEP files. NETGEN contains modules for mesh optimization and hierarchical mesh refinement. . This package contains internal headers. debian/netgen.maintscript0000644000000000000000000000015012251560466012730 0ustar rm_conffile /etc/profile.d/netgen.csh 4.9.13.dfsg-8~ rm_conffile /etc/profile.d/netgen.sh 4.9.13.dfsg-8~debian/netgen-doc.examples0000644000000000000000000000001512251551074012747 0ustar tutorials/* debian/ng_stl.10000644000000000000000000000204012251551074010534 0ustar .TH "NETGEN" "1" .SH "NAME" ng_stl \(em Netgen (nglib) STL Testing .SH "SYNOPSIS" .PP \fBng_stl\fR [OPTIONS...] [STL_filename] .SH "DESCRIPTION" .PP This manual page documents briefly the \fBng_stl\fR and \fBbar\fR commands. .PP This manual page was written for the \fBDebian\fP distribution because the original program does not have a manual page. .PP \fBng_stl\fR is an STL testing utility for nglib. .PP Homepage: http://www.mathcces.rwth-aachen.de/netgen/doku.php .SH "AUTHOR" .PP This manual page was written by Christophe Trophime for the \fBDebian\fP system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. .PP On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. .\" created by instant / docbook-to-man, Tue 16 Mar 2010, 10:36 debian/libnglib-4.9.13.install0000644000000000000000000000002612251551273013073 0ustar usr/lib/libnglib-*.so debian/README.source0000644000000000000000000000024112251551074011344 0ustar Please refer to /usr/share/doc/quilt/README.source for information on how to manipulate the patches for this package, which are in the debian/patches directory. debian/compat0000644000000000000000000000000212251551074010366 0ustar 7 debian/libnglib-dev.install0000644000000000000000000000006612251551074013120 0ustar usr/include/*.h usr/include/*.hpp usr/lib/libnglib.so debian/menu0000644000000000000000000000034212251551074010056 0ustar ?package(netgen): \ needs="X11" \ section="Applications/Science/Engineering" \ title="Netgen" \ command="/usr/bin/netgen" \ icon="/usr/share/pixmaps/netgen16x16.xpm" debian/netgen-headers.install0000644000000000000000000000115112251551273013450 0ustar libsrc/general/*.hpp usr/share/netgen/libsrc/general libsrc/csg/*.hpp usr/share/netgen/libsrc/csg libsrc/geom2d/*.hpp usr/share/netgen/libsrc/geom2d libsrc/gprim/*.hpp usr/share/netgen/libsrc/gprim libsrc/include/*.hpp usr/share/netgen/libsrc/include libsrc/include/mystdlib.h usr/share/netgen/libsrc/include libsrc/linalg/*.hpp usr/share/netgen/libsrc/linalg libsrc/meshing/*.hpp usr/share/netgen/libsrc/meshing libsrc/occ/*.hpp usr/share/netgen/libsrc/occ libsrc/stlgeom/*.hpp usr/share/netgen/libsrc/stlgeom libsrc/visualization/*.hpp usr/share/netgen/libsrc/visualization config.h usr/share/netgen/libsrc/include debian/netgen.desktop0000644000000000000000000000040112251551074012036 0ustar [Desktop Entry] Version=1.0 Name=Netgen Mesh Generator GenericName=Netgen Comment=3-D finite element mesh generator Exec=sh -c 'NETGENDIR=/usr/share/netgen /usr/bin/netgen' Icon=netgen16x16 Type=Application Terminal=false Categories=Education;Math;Science; debian/source/0000755000000000000000000000000012251551074010470 5ustar debian/source/lintian-overrides0000644000000000000000000000023712251551074014053 0ustar # Lintian thinks uploader Adam Powell's name violates policy netgen source: uploader-address-missing "Adam C. Powell netgen source: uploader-not-full-name IV" debian/source/format0000644000000000000000000000001412251551074011676 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012251560466010624 5ustar debian/patches/call-am-prog-ar.patch0000644000000000000000000000106312251551273014514 0ustar Description: to fix autoreconf FTBFS Author: Dmitrijs Ledkovs Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713306 --- netgen-4.9.13.dfsg.orig/configure.ac +++ netgen-4.9.13.dfsg/configure.ac @@ -1,5 +1,6 @@ AC_INIT([netgen],[4.9.13],[],[]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +AM_PROG_AR AC_CONFIG_MACRO_DIR([m4]) @@ -208,4 +209,4 @@ AC_MSG_RESULT([ Example programs will be built but not installed. ------------------------------------------------------------------------ -]) \ No newline at end of file +]) debian/patches/occ-6.5.0.patch0000644000000000000000000000433412251551074013054 0ustar Index: netgen/libsrc/occ/Partition_Inter3d.cxx =================================================================== --- netgen.orig/libsrc/occ/Partition_Inter3d.cxx 2012-03-03 20:29:19.823206572 +0100 +++ netgen/libsrc/occ/Partition_Inter3d.cxx 2012-03-03 20:29:35.227282960 +0100 @@ -243,7 +243,7 @@ Standard_Integer i, nbExt = anExtPS.NbExt(); Extrema_POnSurf aPOnSurf; for (i = 1; i <= nbExt; ++i ) - if (anExtPS.Value( i ) <= TolE) { + if (anExtPS.SquareDistance( i ) <= TolE) { aPOnSurf = anExtPS.Point( i ); break; } Index: netgen/libsrc/occ/Partition_Loop2d.cxx =================================================================== --- netgen.orig/libsrc/occ/Partition_Loop2d.cxx +++ netgen/libsrc/occ/Partition_Loop2d.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -519,7 +519,7 @@ DC.Initialize( DegEdge, F ); // avoid intersecting twice the same edge - BRepOffset_DataMapOfShapeReal EUMap ( EdgesList.Extent() ); + TopTools_DataMapOfShapeReal EUMap ( EdgesList.Extent() ); Standard_Real U, f, l; BRep_Tool::Range (DegEdge, f, l); Index: netgen/libsrc/occ/Partition_Spliter.cxx =================================================================== --- netgen.orig/libsrc/occ/Partition_Spliter.cxx 2012-03-03 20:29:19.827206593 +0100 +++ netgen/libsrc/occ/Partition_Spliter.cxx 2012-03-03 20:29:35.231282976 +0100 @@ -1169,7 +1169,7 @@ for (; j<=nbj && ok; ++j) { if (Extrema.IsMin(j)) { hasMin = Standard_True; - ok = Extrema.Value(j) <= tol; + ok = Extrema.SquareDistance(j) <= tol; } } } debian/patches/build.patch0000644000000000000000000000407612251551273012747 0ustar --- netgen-4.4.orig/ng.tcl +++ netgen-4.4/ng.tcl @@ -7,7 +7,7 @@ set progname "NETGEN" -set ngdir "" +set ngdir "/usr/share/netgen" if { [lsearch [array names env] NETGENDIR] != -1 } { set ngdir $env(NETGENDIR) } --- netgen-4.4.orig/Makefile +++ netgen-4.4/Makefile @@ -21,7 +21,7 @@ # system libraries: # # -tcltklib = -ltix8.1.8.4 -ltk8.4 -ltcl8.4 +tcltklib = -lTix8.4 -ltk8.4 -ltcl8.4 # tcltklib = -ltix4.1.8.3 -ltk8.3 -ltcl8.3 # tcltklib = -ltix8.2 -ltk8.3 -ltcl8.3 # tcltklib = /usr/lib/libtix8.1.8.3.so -ltk8.3 -ltcl8.3 @@ -29,7 +29,7 @@ # tcltklib = -ltix8.2 -ltk8.4 -ltcl8.4 # # -syslib = $(tcltklib) -lGL -lGLU -lX11 -lXi -lm -ldl -lpthread $(SYSLIB2) +syslib = $(tcltklib) -lGL -lGLU -lX11 -lm -ldl -lpthread $(SYSLIB2) # (maybe you have to remove -ldl) # # @@ -48,7 +48,10 @@ OCCLIB_DIR=$(OCC_DIR)/ros/lin/lib # add libs in makefile.mach.$(MACHINE) +ifdef WITH_OCC # occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL +occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool -lXxf86vm +endif # include $(LIBSRC_DIR)/makefile.mach.$(MACHINE) # @@ -117,7 +120,7 @@ # .PHONY : clean clean: - -@rm *.o ngtcltk/*.o togl/*.o lib/$(MACHINE)/lib*.a lib/$(MACHINE)/*.o + -rm *.o ngtcltk/*.o togl/*.o lib/$(MACHINE)/lib*.a lib/$(MACHINE)/*.o ng # # .PHONY : cleanapp --- netgen-4.4.orig/ngtcltk/ngappinit.cpp +++ netgen-4.4/ngtcltk/ngappinit.cpp @@ -77,7 +77,7 @@ if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR"))) ngdir = getenv ("NETGENDIR"); else - ngdir = "."; + ngdir = "/usr/share/netgen"; verbose = parameters.GetDefineFlag ("V"); --- netgen-4.4.orig/ngtcltk/nghelp.tcl +++ netgen-4.4/ngtcltk/nghelp.tcl @@ -1,6 +1,6 @@ proc print_commandline_help { } { - puts "Usage: ng { options }" + puts "Usage: netgen { options }" puts "-geofile=filename Input geometry file (alternative: ng filename)" puts "-meshfile=filename Output mesh file" debian/patches/togl.patch0000644000000000000000000001411212251551273012605 0ustar --- netgen-4.4.orig/togl/license.terms +++ netgen-4.4/togl/license.terms @@ -0,0 +1,39 @@ +This software is copyrighted by the Regents of the University of +California, Sun Microsystems, Inc., Scriptics Corporation, +and other parties. The following terms apply to all files associated +with the software unless explicitly disclaimed in individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. --- netgen-4.4.orig/togl/LICENSE.togl +++ netgen-4.4/togl/LICENSE.togl @@ -0,0 +1,27 @@ +This software is copyrighted by Brian Paul (brian@mesa3d.org) +and Benjamin Bederson (bederson@cs.umd.edu). The following +terms apply to all files associated with the software unless explicitly +disclaimed in individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. --- netgen-4.4.orig/togl/togl.cpp +++ netgen-4.4/togl/togl.cpp @@ -140,12 +140,14 @@ # include "tkInt8.4p4.h" #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==6 # include "tkInt8.4p6.h" +#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 +# include "tk-private/generic/tkInt.h" #else - Sorry, you will have to edit togl.c to include the right tkInt.h file +#error Sorry, you will have to edit togl.c to include the right tkInt.h file #endif #elif defined(WIN32) #if TK_MAJOR_VERSION<8 - Sorry Windows version requires Tcl/Tk ver 8.0 or higher. +#error Sorry Windows version requires Tcl/Tk ver 8.0 or higher. #endif #include "tkInt.h" #include "tkWinInt.h" @@ -903,8 +905,8 @@ #if defined(__sgi) && defined(STEREO) stereoMakeCurrent( Tk_Display(togl->TkWin), togl->OverlayWindow, - togl->OverlayCtx ); -#endif /*__sgi STEREO */ + togl->OverlayCtx ); +#endif /*__sgi STEREO */ #endif /* WIN32 */ togl->OverlayDisplayProc(togl); } @@ -1846,7 +1848,7 @@ * The widget is destroyed. * *---------------------------------------------------------------------- - */ + */ static void ToglCmdDeletedProc( ClientData clientData ) { struct Togl *togl = (struct Togl *)clientData; @@ -1998,7 +2000,7 @@ #else Tk_DeleteTimerHandler(togl->timerHandler); #endif - + } if (togl->UpdatePending) { #if (TCL_MAJOR_VERSION * 100 + TCL_MINOR_VERSION) >= 705 @@ -3093,7 +3095,7 @@ stereo.currentStereoBuffer = STEREO_BUFFER_LEFT; break; case GL_RIGHT: - case GL_FRONT_RIGHT: + case GL_FRONT_RIGHT: stereo.currentStereoBuffer = STEREO_BUFFER_RIGHT; mode = GL_FRONT; break; @@ -3164,7 +3166,7 @@ static void stereoMakeCurrent(Display *dpy, Window win, GLXContext ctx) { - + if (stereo.useSGIStereo) { if (dpy && (dpy != stereo.currentDisplay)) { int event, error; @@ -3210,7 +3212,7 @@ GLfloat near, GLfloat far, GLfloat eyeDist, GLfloat eyeOffset) { GLfloat eyeShift = (eyeDist - near) * (eyeOffset / eyeDist); - + glFrustum(left+eyeShift, right+eyeShift, bottom, top, near, far); glTranslatef(-eyeShift, 0.0, 0.0); } debian/patches/doc-no-ng4.pdf.patch0000644000000000000000000000176212251551273014264 0ustar Don't install ng4.pdf (it's not in the .dfsg tarball) because it's not free. Index: netgen/doc/Makefile.am =================================================================== --- netgen.orig/doc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -dist_doc_DATA = ng4.pdf Index: netgen/Makefile.am =================================================================== --- netgen.orig/Makefile.am +++ netgen/Makefile.am @@ -2,7 +2,7 @@ METASOURCES = AUTO -SUBDIRS = libsrc ng nglib tutorials doc windows +SUBDIRS = libsrc ng nglib tutorials windows # TESTS = ng/netgen -batchmode Index: netgen/configure.ac =================================================================== --- netgen.orig/configure.ac +++ netgen/configure.ac @@ -177,7 +177,7 @@ libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile nglib/Makefile - tutorials/Makefile doc/Makefile windows/Makefile ) + tutorials/Makefile windows/Makefile ) AC_OUTPUT debian/patches/oce-0.10.diff0000644000000000000000000000254112251551273012576 0ustar Description: Fix build against oce 0.10 Author: Julien Cristau Bug-Debian: http://bugs.debian.org/677558 --- netgen-4.9.13.dfsg.orig/libsrc/occ/Partition_Loop.cxx +++ netgen-4.9.13.dfsg/libsrc/occ/Partition_Loop.cxx @@ -178,7 +178,7 @@ static Standard_Boolean SelectEdge(cons } } - Standard_Real anglemax = - PI; + Standard_Real anglemax = - M_PI; TopoDS_Edge SelectedEdge; for ( itl.Initialize(LE); itl.More(); itl.Next()) { const TopoDS_Edge& E = TopoDS::Edge(itl.Value()); --- netgen-4.9.13.dfsg.orig/libsrc/occ/Partition_Loop2d.cxx +++ netgen-4.9.13.dfsg/libsrc/occ/Partition_Loop2d.cxx @@ -209,7 +209,7 @@ static Standard_Boolean SelectEdge(cons Cc->D1(uc, PC, CTg1); if (!isForward) CTg1.Reverse(); - Standard_Real anglemin = 3 * PI, tolAng = 1.e-8; + Standard_Real anglemin = 3 * M_PI, tolAng = 1.e-8; // select an edge whose first derivative is most left of CTg1 // ie an angle between Tg1 and CTg1 is least @@ -233,7 +233,7 @@ static Standard_Boolean SelectEdge(cons // -PI < angle < PI Standard_Real angle = Tg1.Angle(CTg1); - if (PI - Abs(angle) <= tolAng) + if (M_PI - Abs(angle) <= tolAng) { // an angle is too close to PI; assure that an angle sign really // reflects an edge position: +PI - an edge is worst, debian/patches/ffmpeg-0.6.patch0000644000000000000000000000161412251551074013407 0ustar Author: Reinhard Tartler Subject: Unbreak build with FFmpeg 0.6 Index: netgen/ng/Makefile.am =================================================================== --- netgen.orig/ng/Makefile.am +++ netgen/ng/Makefile.am @@ -1,6 +1,6 @@ include_HEADERS = -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -D__STDC_CONSTANT_MACROS -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) bin_PROGRAMS = netgen netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp nginterface.cpp nginterface_v2.cpp parallelfunc.cpp parallelinterface.cpp demoview.hpp parallelfunc.hpp togl_1_7.h debian/patches/series0000644000000000000000000000043112251560466012037 0ustar #togl.patch ####netgen-missing-symbols.patch #netgen-nglib.patch #netgen-shlibs.patch #stdlib.patch #build.patch configure-occ.patch tcl-scripts.patch nglib-version.patch doc-no-ng4.pdf.patch ffmpeg-0.6.patch occ-6.5.0.patch oce-0.10.diff call-am-prog-ar.patch set-netgendir.patch debian/patches/configure-occ.patch0000644000000000000000000000334712251551273014373 0ustar Change OCC include directory and the Togl lib name to Debian's. Index: netgen/configure.ac =================================================================== --- netgen.orig/configure.ac +++ netgen/configure.ac @@ -44,7 +44,7 @@ if test a$occon = atrue ; then - AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc"]) + AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/include/oce"]) AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) # -lTKDCAF Index: netgen/ng/Makefile.am =================================================================== --- netgen.orig/ng/Makefile.am +++ netgen/ng/Makefile.am @@ -16,7 +16,7 @@ $(top_builddir)/libsrc/gprim/libgprim.la \ $(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/general/libgen.la \ - $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) + $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) # add for static linkage of ngsolve: # /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfemng.a /opt/netgen/lib/libngmg.a /opt/netgen/lib/libngla.a /opt/netgen/lib/libngbla.a /opt/netgen/lib/libngstd.a -L/opt/intel/mkl/10.2.1.017/lib/em64t /opt/intel/mkl/10.2.1.017/lib/em64t/libmkl_solver_lp64.a -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core debian/patches/nglib-version.patch0000644000000000000000000000063612251551273014424 0ustar Use package version to identify interface in soname. Index: netgen/nglib/Makefile.am =================================================================== --- netgen.orig/nglib/Makefile.am +++ netgen/nglib/Makefile.am @@ -19,7 +19,7 @@ $(top_builddir)/libsrc/general/libgen.la \ $(OCCLIBS) $(MPI_LIBS) -libnglib_la_LDFLAGS = -avoid-version +libnglib_la_LDFLAGS = -release $(PACKAGE_VERSION) # -rdynamic debian/patches/stdlib.patch0000644000000000000000000005132712251551273013132 0ustar --- netgen-4.4.orig/libsrc/meshing/meshtype.hpp +++ netgen-4.4/libsrc/meshing/meshtype.hpp @@ -955,13 +955,14 @@ - + class Mesh; /** Identification of periodic surfaces, close surfaces, etc. */ class Identifications { private: + Mesh & mesh; /// identify points (thin layers, periodic b.c.) --- netgen-4.4.orig/libsrc/visualization/stlmeshing.cpp +++ netgen-4.4/libsrc/visualization/stlmeshing.cpp @@ -1062,9 +1062,9 @@ } +VisualSceneSTLMeshing vsstlmeshing; -VisualSceneSTLMeshing vsstlmeshing; #endif --- netgen-4.4.orig/libsrc/visualization/mvdraw.hpp +++ netgen-4.4/libsrc/visualization/mvdraw.hpp @@ -250,6 +250,7 @@ int seltria; }; +extern VisualSceneSTLMeshing vsstlmeshing; --- netgen-4.4.orig/libsrc/linalg/densemat.hpp +++ netgen-4.4/libsrc/linalg/densemat.hpp @@ -7,13 +7,16 @@ /* Date: 01. Oct. 94 */ /**************************************************************************/ -/** +/** Data type dense matrix */ #include +class DenseMatrix; +void CalcInverse (const DenseMatrix & m1, DenseMatrix & m2); + class DenseMatrix { protected: @@ -60,7 +63,7 @@ double sum; const double * mp, * sp; double * dp; - + #ifdef DEBUG if (prod.Size() != height) { @@ -68,17 +71,17 @@ assert (1); // prod.SetSize (height); } - - if (!height) + + if (!height) { cout << "DenseMatrix::Mult height = 0" << endl; } - if (!width) + if (!width) { cout << "DenseMatrix::Mult width = 0" << endl; } - + if (width != v.Size()) { (*myerr) << "\nMatrix and Vector don't fit" << endl; @@ -89,14 +92,14 @@ } else #endif - { + { mp = data; dp = &prod.Elem(1); for (int i = 1; i <= height; i++) { sum = 0; sp = &v.Get(1); - + for (INDEX j = 1; j <= width; j++) { // sum += Get(i,j) * v.Get(j); @@ -104,7 +107,7 @@ mp++; sp++; } - + *dp = sum; dp++; } @@ -123,7 +126,7 @@ /// friend DenseMatrix operator+ (const DenseMatrix & m1, const DenseMatrix & m2); - /// + /// friend void Transpose (const DenseMatrix & m1, DenseMatrix & m2); /// friend void Mult (const DenseMatrix & m1, const DenseMatrix & m2, DenseMatrix & m3); @@ -167,7 +170,7 @@ public: /// - MatrixFixWidth () + MatrixFixWidth () { height = 0; data = 0; } /// MatrixFixWidth (int h) @@ -182,7 +185,7 @@ { delete data; height = h; - data = new double[WIDTH*height]; + data = new double[WIDTH*height]; } } @@ -196,7 +199,7 @@ MatrixFixWidth & operator= (double v) { for (int i = 0; i < height*WIDTH; i++) - data[i] = v; + data[i] = v; return *this; } @@ -207,13 +210,13 @@ const double * mp, * sp; double * dp; - /* + /* if (prod.Size() != height) { cerr << "MatrixFixWidth::Mult: wrong vector size " << endl; assert (1); } - */ + */ mp = data; dp = &prod[0]; @@ -221,14 +224,14 @@ { sum = 0; sp = &v[0]; - + for (int j = 0; j < WIDTH; j++) { sum += *mp * *sp; mp++; sp++; } - + *dp = sum; dp++; } --- netgen-4.4.orig/ngsolve/linalg/order.cpp +++ netgen-4.4/ngsolve/linalg/order.cpp @@ -54,7 +54,7 @@ return ball.Alloc(); } - void CliqueEl :: operator delete (void * p, size_t) + void CliqueEl :: operator delete (void * p) { ball.Free (p); } --- netgen-4.4.orig/ngsolve/linalg/order.hpp +++ netgen-4.4/ngsolve/linalg/order.hpp @@ -118,7 +118,7 @@ /// void * operator new(size_t); /// - void operator delete (void *, size_t); + void operator delete (void *); }; --- netgen-4.4.orig/ngsolve/basiclinalg/calcinverse.cpp +++ netgen-4.4/ngsolve/basiclinalg/calcinverse.cpp @@ -3,17 +3,17 @@ namespace ngbla { using namespace ngbla; - + template inline double abs (Mat & m) { double sum = 0; for (int i = 0; i < N; i++) - sum += abs(m(i,i)); + sum += std::abs(m(i,i)); return sum; } - + inline double abs (double a) { return fabs(a); @@ -29,7 +29,7 @@ void CalcInverse (const FlatMatrix m, FlatMatrix inv) { // Gauss - Jordan - algorithm - + int n = m.Height(); int r; @@ -38,14 +38,14 @@ ngstd::ARRAY p(n); // pivot-permutation Vector hv(n); - + inv = m; // Algorithm of Stoer, Einf. i. d. Num. Math, S 145 for (int j = 0; j < n; j++) p[j] = j; - + for (int j = 0; j < n; j++) { // pivot search @@ -59,7 +59,7 @@ r = i; maxval = abs (inv(i, j)); } - + if (maxval < 1e-20) { throw Exception ("Inverse matrix: Matrix singular"); @@ -72,7 +72,7 @@ swap (inv(j,k), inv(r,k)); swap (p[j], p[r]); } - + // transformation @@ -88,7 +88,7 @@ for (int k = 0; k < n; k++) if (k != j) { - + /* for (i = 0; i < n; i++) if (i != j) @@ -109,13 +109,13 @@ inv(n*i+k) -= h; } - T h = hr * inv(j,k); + T h = hr * inv(j,k); inv(j,k) = -h; } } // col exchange - + for (int i = 0; i < n; i++) { for (int k = 0; k < n; k++) @@ -125,45 +125,45 @@ } } - template void CalcInverse (const FlatMatrix m, + template void CalcInverse (const FlatMatrix m, FlatMatrix inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix m, + template void CalcInverse (const FlatMatrix m, FlatMatrix inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); - template void CalcInverse (const FlatMatrix > m, + template void CalcInverse (const FlatMatrix > m, FlatMatrix > inv); } --- netgen-4.4.orig/ngsolve/basiclinalg/expr3.hpp +++ netgen-4.4/ngsolve/basiclinalg/expr3.hpp @@ -26,20 +26,20 @@ return vec(nr); } template -inline T Access (const Vec & vec, int nr) +inline T Access (const Vec & vec, int nr) { return vec(nr); } #else -template +template inline typename TVEC::TELEM & Access (TVEC & vec, int nr) { return vec(nr); } -template +template inline typename TVEC::TELEM Access (const TVEC & vec, int nr) { return vec(nr); @@ -197,7 +197,7 @@ public: enum { HEIGHT = mat_traits::HEIGHT }; enum { WIDTH = mat_traits::WIDTH }; - typedef typename mat_prod_type::TMAT TELEM; typedef Mat TMAT; }; @@ -216,7 +216,7 @@ { enum { HEIGHT = mat_traits::HEIGHT }; enum { WIDTH = mat_traits::WIDTH }; - typedef typename mat_sum_type::TMAT TELEM; typedef Mat TMAT; }; @@ -256,14 +256,14 @@ /// Height of matrix -template +template inline int Height (const TM & m) { return m.Height(); } /// Width of matrix -template +template inline int Width (const TM & m) { return m.Width(); @@ -290,7 +290,7 @@ return x; } -template<> +template<> inline double ReduceComplex (Complex x) { throw Complex2RealException(); @@ -320,7 +320,7 @@ public: MatrixNotFittingException (const string & where, int h1, int w1, int h2, int w2) - : Exception ("") + : Exception ("") { stringstream str; str << where << " mat1 = " << h1 << " x " << w1 << ", mat2 = " << h2 << " x " << w2 << endl; @@ -339,12 +339,12 @@ */ template -class Expr +class Expr { public: Expr () { ; } - typedef T TConv; + typedef T TConv; T & Spec() { return static_cast (*this); } const T & Spec() const { return static_cast (*this); } @@ -436,7 +436,7 @@ #ifdef CHECK_RANGE if (Height() != v.Height() || Width() != v.Width()) { - throw MatrixNotFittingException ("operator=", + throw MatrixNotFittingException ("operator=", Height(), Width(), v.Height(), v.Width()); } @@ -477,7 +477,7 @@ { #ifdef CHECK_RANGE if (Height() != v.Height() || Width() != v.Width()) - throw MatrixNotFittingException ("operator+=", + throw MatrixNotFittingException ("operator+=", Height(), Width(), v.Height(), v.Width()); #endif @@ -510,7 +510,7 @@ { #ifdef CHECK_RANGE if (Height() != v.Height() || Width() != v.Width()) - throw MatrixNotFittingException ("operator+=", + throw MatrixNotFittingException ("operator+=", Height(), Width(), v.Height(), v.Width()); #endif @@ -536,7 +536,7 @@ for (int i = 0; i < hw; i++) Spec()(i) += scal; } - + template T & operator-= (const Expr & v) @@ -544,7 +544,7 @@ #ifdef CHECK_RANGE if (Height() != v.Height() || Width() != v.Width()) - throw MatrixNotFittingException ("operator-=", + throw MatrixNotFittingException ("operator-=", Height(), Width(), v.Height(), v.Width()); #endif @@ -600,7 +600,7 @@ */ -template +template class SumExpr : public Expr > { const TA a; @@ -610,7 +610,7 @@ typename TB::TELEM>::TMAT TELEM; typedef typename mat_traits::TSCAL TSCAL; - SumExpr (const TA & aa, const TB & ab) : a(aa), b(ab) + SumExpr (const TA & aa, const TB & ab) : a(aa), b(ab) { ; // cout << "SUM, TA = " << typeid(TA).name() << endl @@ -643,7 +643,7 @@ Matrix-expr minus Matrix-expr */ -template +template class SubExpr : public Expr > { const TA a; @@ -667,7 +667,7 @@ inline SubExpr operator- (const Expr & a, const Expr & b) { - return SubExpr + return SubExpr (static_cast (a), static_cast (b)); } @@ -719,7 +719,7 @@ /** Scalar times Matrix-expr */ -template +template class ScaleExpr : public Expr > { TA a; @@ -743,14 +743,14 @@ }; template -inline ScaleExpr +inline ScaleExpr operator* (double b, const Expr & a) { return ScaleExpr (static_cast (a), b ); } template -inline ScaleExpr +inline ScaleExpr operator* (Complex b, const Expr & a) { return ScaleExpr (static_cast (a), b); @@ -768,7 +768,7 @@ const TA a; const TB b; public: - typedef typename mat_prod_type::TMAT TELEM; typedef typename mat_traits::TSCAL TSCAL; @@ -776,7 +776,7 @@ TELEM operator() (int i) const { return TELEM(TSCAL(0)); } TELEM operator() (int i, int j) const - { + { int wa = a.Width(); TELEM sum; if (wa >= 1) @@ -787,7 +787,7 @@ } else sum = TSCAL(0); - + return sum; } @@ -801,7 +801,7 @@ inline MultExpr operator* (const Expr & a, const Expr & b) { - return MultExpr + return MultExpr (static_cast (a), static_cast (b)); } @@ -830,7 +830,7 @@ }; -/// Transpose +/// Transpose template inline TransExpr Trans (const Expr & a) @@ -851,6 +851,16 @@ /** Inner product */ +inline double InnerProduct ( const double& a, const double& b ) +{ + return a * b; +} + +inline Complex InnerProduct ( const Complex& a, const Complex b) +{ + return a * b; +} + template inline typename TA::TSCAL InnerProduct (const MatExpr & a, const MatExpr & b) @@ -862,15 +872,6 @@ return sum; } -inline double InnerProduct (double a, double b) -{ - return a * b; -} - -inline Complex InnerProduct (Complex a, Complex b) -{ - return a * b; -} /* **************************** Trace **************************** */ @@ -889,6 +890,16 @@ /* **************************** L2Norm **************************** */ /// Euklidean norm squared +inline double L2Norm2 (const double& v) +{ + return v*v; +} + +inline double L2Norm2 (Complex v) +{ + return v.real()*v.real()+v.imag()*v.imag(); +} + template inline double L2Norm2 (const MatExpr & v) { @@ -899,17 +910,6 @@ return sum; } - -inline double L2Norm2 (double v) -{ - return v*v; -} - -inline double L2Norm2 (Complex v) -{ - return v.real()*v.real()+v.imag()*v.imag(); -} - template inline double L2Norm (const MatExpr & v) { @@ -988,11 +988,11 @@ inv(0,0) = det * (m(4) * m(8) - m(5) * m(7)); inv(0,1) = -det * (m(1) * m(8) - m(2) * m(7)); inv(0,2) = det * (m(1) * m(5) - m(2) * m(4)); - + inv(1,0) = -det * (m(3) * m(8) - m(5) * m(6)); inv(1,1) = det * (m(0) * m(8) - m(2) * m(6)); inv(1,2) = -det * (m(0) * m(5) - m(2) * m(3)); - + inv(2,0) = det * (m(3) * m(7) - m(4) * m(6)); inv(2,1) = -det * (m(0) * m(7) - m(1) * m(6)); inv(2,2) = det * (m(0) * m(4) - m(1) * m(3)); @@ -1035,19 +1035,19 @@ const T & sm = m.Spec(); switch (sm.Height()) { - case 1: + case 1: { - return sm(0,0); + return sm(0,0); break; } case 2: { - return ( sm(0,0)*sm(1,1) - sm(0,1)*sm(1,0) ); + return ( sm(0,0)*sm(1,1) - sm(0,1)*sm(1,0) ); break; } case 3: { - return + return sm(0) * sm(4) * sm(8) + sm(1) * sm(5) * sm(6) + sm(2) * sm(3) * sm(7) --- netgen-4.4.orig/ngsolve/solve/shapetester.cpp +++ netgen-4.4/ngsolve/solve/shapetester.cpp @@ -1,6 +1,7 @@ #include // #include +#include namespace ngsolve --- netgen-4.4.orig/ngsolve/comp/fespace.cpp +++ netgen-4.4/ngsolve/comp/fespace.cpp @@ -10,6 +10,8 @@ #include #include +#include + using namespace ngmg; namespace ngcomp --- netgen-4.4.orig/ngsolve/comp/postproc.cpp +++ netgen-4.4/ngsolve/comp/postproc.cpp @@ -9,6 +9,7 @@ */ #include +#include namespace ngcomp { @@ -274,8 +275,8 @@ if (dimflux > 1) { FlatMatrix elmat(dnumsflux.Size(), lh); - dynamic_cast (fluxbli) - . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh); + BlockBilinearFormIntegrator const& fluxbli_ref = dynamic_cast (fluxbli); + fluxbli_ref . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh); CholeskyFactors invelmat(elmat); FlatVector hv1(dnumsflux.Size(), lh); Index: netgen/libsrc/include/mystdlib.h =================================================================== --- netgen.orig/libsrc/include/mystdlib.h 2008-04-07 10:33:54.000000000 +0200 +++ netgen/libsrc/include/mystdlib.h 2008-04-07 10:38:23.000000000 +0200 @@ -6,6 +6,7 @@ #include #include #include +#include #ifdef OLDCINCLUDE Index: netgen/ngsolve/ngstd/array.hpp =================================================================== --- netgen.orig/ngsolve/ngstd/array.hpp 2008-04-07 10:33:54.000000000 +0200 +++ netgen/ngsolve/ngstd/array.hpp 2008-04-07 10:39:49.000000000 +0200 @@ -7,6 +7,7 @@ /* Date: 01. Jun. 95 */ /**************************************************************************/ +#include /** Exception thrown by array range check. @@ -291,7 +292,7 @@ T * p = new T[nsize]; int mins = (nsize < this->size) ? nsize : this->size; - memcpy (p, this->data, mins * sizeof(T)); + std::memcpy (p, this->data, mins * sizeof(T)); if (ownmem) delete [] this->data; Index: netgen/ngsolve/linalg/basevector.cpp =================================================================== --- netgen.orig/ngsolve/linalg/basevector.cpp 2008-04-07 10:33:55.000000000 +0200 +++ netgen/ngsolve/linalg/basevector.cpp 2008-04-07 10:39:13.000000000 +0200 @@ -9,6 +9,7 @@ */ #include +#include namespace ngla { using namespace ngla; @@ -146,7 +147,7 @@ { FlatVector fv = FVDouble(); for (int i = 0; i < fv.Size(); i++) - fv(i) = double (rand()) / RAND_MAX; + fv(i) = double (std::rand()) / RAND_MAX; } Index: netgen/ngsolve/ngstd/flags.cpp =================================================================== --- netgen.orig/ngsolve/ngstd/flags.cpp 2008-04-07 10:33:55.000000000 +0200 +++ netgen/ngsolve/ngstd/flags.cpp 2008-04-07 10:38:23.000000000 +0200 @@ -5,7 +5,8 @@ /**************************************************************************/ #include - +#include +#include namespace ngstd { using namespace ngstd; Index: netgen/ngsolve/linalg/blockjacobi.cpp =================================================================== --- netgen.orig/ngsolve/linalg/blockjacobi.cpp 2006-04-07 09:27:13.000000000 +0200 +++ netgen/ngsolve/linalg/blockjacobi.cpp 2008-04-07 10:38:23.000000000 +0200 @@ -7,7 +7,7 @@ #include - +#include namespace ngla { using namespace ngla; Index: netgen/ngsolve/ngstd/ngstd.hpp =================================================================== --- netgen.orig/ngsolve/ngstd/ngstd.hpp 2008-04-07 10:38:37.000000000 +0200 +++ netgen/ngsolve/ngstd/ngstd.hpp 2008-04-07 10:38:54.000000000 +0200 @@ -1,6 +1,9 @@ #ifndef FILE_NGSTD #define FILE_NGSTD +#include +#include + /*********************************************************************/ /* File: ngstd.hpp */ /* Author: Joachim Schoeberl */ debian/patches/netgen-shlibs.patch0000644000000000000000000002255512251551273014414 0ustar Index: netgen/libsrc/makefile.inc =================================================================== --- netgen.orig/libsrc/makefile.inc 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/makefile.inc 2008-11-09 13:17:41.000000000 +0100 @@ -18,23 +18,34 @@ # ARFLAGS = r # +LIBA=lib$(lib).so LIBB=$(LIB_DIR)/lib$(lib).a # .PRECIOUS: .cpp .c -.SUFFIXES: .cpp .c .o +.SUFFIXES: .cpp .c .o .lo # .cpp.o: $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $< .c.o: $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $< +.cpp.lo: + $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) -fPIC -DPIC $< -o $@ + +all: $(LIBA) $(LIBB) + # # +$(LIBA):: $(LIB_DIR) $(LIBB):: $(LIB_DIR) # # make lib from sources: # -$(LIBB):: $(src) - $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $? +$(LIBA):: $(src:%.cpp=%.lo) + $(CPLUSPLUS) -shared -ltcl8.4 -lpthread -lGL -lstdc++ -lm -o $(LIB_DIR)/$@.4.4 *.lo -Wl,-soname,$@.4.4 + ln -sf $@.4.4 $(LIB_DIR)/$@.4 + ln -sf $@.4.4 $(LIB_DIR)/$@ + +$(LIBB):: $(src:%.cpp=%.o) @$(AR) $(ARFLAGS) $@ *.o -@$(RM) *.o -@$(RANLIB) $@ Index: netgen/libsrc/linalg/Makefile =================================================================== --- netgen.orig/libsrc/linalg/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/linalg/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -3,7 +3,7 @@ # src = basemat.cpp densemat.cpp vector.cpp sparsmat.cpp polynomial.cpp # -lib = la +lib = netgen_linalg libpath = libsrc/linalg # # Index: netgen/libsrc/general/Makefile =================================================================== --- netgen.orig/libsrc/general/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/general/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -5,7 +5,7 @@ spbita2d.cpp seti.cpp optmem.cpp sort.cpp mystring.cpp parthreads.cpp \ moveablemem.cpp dynamicmem.cpp ngexception.cpp # -lib = gen +lib = netgen_general libpath = libsrc/general # include ../makefile.inc Index: netgen/libsrc/gprim/Makefile =================================================================== --- netgen.orig/libsrc/gprim/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/gprim/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -6,7 +6,7 @@ # reftrans.cpp rot3d.cpp # -lib = gprim +lib = netgen_gprim libpath = libsrc/gprim # # Index: netgen/libsrc/csg/Makefile =================================================================== --- netgen.orig/libsrc/csg/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/csg/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -10,7 +10,7 @@ # # lex.yy.cpp geometry.cpp # -lib = csg +lib = netgen_csg libpath = libsrc/csg # # Index: netgen/libsrc/geom2d/Makefile =================================================================== --- netgen.orig/libsrc/geom2d/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/geom2d/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -3,7 +3,7 @@ # src = spline2d.cpp geom2dmesh.cpp splinegeometry2.cpp genmesh2d.cpp # -lib = geom2d +lib = netgen_geom2d libpath = libsrc/geom2d # # Index: netgen/libsrc/stlgeom/Makefile =================================================================== --- netgen.orig/libsrc/stlgeom/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/stlgeom/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -3,7 +3,7 @@ # src = stlgeom.cpp stltopology.cpp stlgeomchart.cpp stlgeommesh.cpp meshstlsurface.cpp stlline.cpp stltool.cpp # -lib = stlgeom +lib = netgen_stlgeom libpath = libsrc/stlgeom # # Index: netgen/libsrc/occ/Makefile =================================================================== --- netgen.orig/libsrc/occ/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/occ/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -3,7 +3,7 @@ # src = occgeom.cpp occmeshsurf.cpp occgenmesh.cpp -lib = occ +lib = netgen_occ libpath = libsrc/occ # # Index: netgen/libsrc/meshing/Makefile =================================================================== --- netgen.orig/libsrc/meshing/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/meshing/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -9,7 +9,7 @@ boundarylayer.cpp specials.cpp msghandler.cpp \ pyramidrls.cpp pyramid2rls.cpp prism2rls.cpp curvedelems.cpp curvedelems2.cpp # -lib = mesh +lib = netgen_meshing libpath = libsrc/meshing # include ../makefile.inc Index: netgen/libsrc/opti/Makefile =================================================================== --- netgen.orig/libsrc/opti/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/opti/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -3,7 +3,7 @@ # src = bfgs.cpp linsearch.cpp linopt.cpp # -lib = opti +lib = netgen_opti libpath = libsrc/opti # # Index: netgen/libsrc/visualization/Makefile =================================================================== --- netgen.orig/libsrc/visualization/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/visualization/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -3,7 +3,7 @@ # src = stlmeshing.cpp mvdraw.cpp vscsg.cpp vsmesh.cpp vsocc.cpp vssolution.cpp meshdoc.cpp # -lib = vis +lib = netgen_visualization libpath = libsrc/visualization # # Index: netgen/libsrc/interface/Makefile =================================================================== --- netgen.orig/libsrc/interface/Makefile 2008-11-09 13:17:41.000000000 +0100 +++ netgen/libsrc/interface/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -1,6 +1,6 @@ src = nglib.cpp nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp # -lib = nginterface +lib = netgen_interface libpath = libsrc/interface # include ../makefile.inc Index: netgen/ngsolve/Makefile =================================================================== --- netgen.orig/ngsolve/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/ngsolve/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -64,8 +64,10 @@ # # # -lib = ../lib/$(MACHINE)/libngsolve.a -lib2 = ../lib/$(MACHINE)/libngsolvebasic.a +lib = ../lib/$(MACHINE)/libnetgen_solve.a +slib = libnetgen_solve.so +lib2 = ../lib/$(MACHINE)/libnetgen_solvebasic.a +slib2 = libnetgen_solvebasic.so libold = ../lib/$(MACHINE)/libngsolve_oldla.a # # @@ -74,7 +76,7 @@ # # # .PRECIOUS: .cpp .hh -# .SUFFIXES: .cpp .o +.SUFFIXES: .cpp .o .lo # # .cpp.o: # $(CPLUSPLUS) -c $< @@ -84,22 +86,35 @@ # # make lib from sources: # -goal: $(lib) $(lib2) +goal: $(lib) $(lib2) ../lib/$(MACHINE)/$(slib) ../lib/$(MACHINE)/$(slib2) # pebblesinc = -I../../pebbles_old/libsrc/setup -I../../pebbles_old/libsrc/solver -I../../pebbles_old/libsrc/prepro -I../../pebbles_old/libsrc/parallel -I../../pebbles_old/libsrc # +.cpp.lo: + $(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS -fPIC -DPIC $< -o $@ + $(lib):: $(src) $(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS $? $(AR) $(ARFLAGS) $@ *.o mv *.o ../lib/$(MACHINE) -$(RM) *.o -@$(RANLIB) $@ -# + +../lib/$(MACHINE)/$(slib):: $(src:%.cpp=%.lo) + $(CPLUSPLUS) -shared -ltcl8.4 -lpthread -lm -lstdc++ -o ../lib/$(MACHINE)/$(slib).4.4 $^ -Wl,-soname,$(slib).4.4 + ln -sf $(slib).4.4 $@.4 + ln -sf $(slib).4.4 $@ + $(lib2):: $(src2) $(CPLUSPLUS) -c -I. -I../libsrc/interface -Iinclude $(CPLUSPLUSFLAGS2) $? $(AR) $(ARFLAGS) $@ *.o -$(RM) *.o -@$(RANLIB) $@ + +../lib/$(MACHINE)/$(slib2):: $(src2:%.cpp=%.lo) + $(CPLUSPLUS) -shared -lm -lstdc++ -o ../lib/$(MACHINE)/$(slib2).4.4 $^ -Wl,-soname,$(slib2).4.4 + ln -sf $(slib2).4.4 $@.4 + ln -sf $(slib2).4.4 $@ # # # Index: netgen/Makefile =================================================================== --- netgen.orig/Makefile 2008-11-09 13:17:37.000000000 +0100 +++ netgen/Makefile 2008-11-09 13:17:41.000000000 +0100 @@ -14,8 +14,8 @@ # # # -mylib = -lnginterface -lvis -lcsg -lstlgeom -lgeom2d -lmesh -lgprim -lopti \ - -lla -lgen -locc +mylib = -lnetgen_interface -lnetgen_visualization -lnetgen_csg -lnetgen_stlgeom -lnetgen_geom2d -lnetgen_meshing -lnetgen_gprim -lnetgen_opti \ + -lnetgen_linalg -lnetgen_general -lnetgen_occ # # # system libraries: Index: netgen/libsrc/makefile.mach.LINUX =================================================================== --- netgen.orig/libsrc/makefile.mach.LINUX 2008-11-09 13:17:37.000000000 +0100 +++ netgen/libsrc/makefile.mach.LINUX 2008-11-09 13:17:41.000000000 +0100 @@ -4,10 +4,7 @@ # # CC=/opt/gcc-dev/bin/gcc # CC=/usr/local/bin/gcc -CC=gcc -CPLUSPLUS=$(CC) AR=ar -LINK=$(CC) MAKE=make RM=rm RANLIB=ranlib @@ -15,12 +12,8 @@ # Machine dependent flags: # CFLAGS2 = - -CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX -DOPENGL \ - -ftemplate-depth-99 -finline-limit=20000 \ - -funroll-loops -DNGSOLVE - -LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5 -lstdc++ +CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL -I/usr/include/tcl8.4 -I/usr/include/tk8.4 -I/usr/X11R6/include -DLINUX -DOPENGL -DNGSOLVE +LINKFLAGS2 = goalngs=goalngs @@ -28,4 +21,5 @@ # lapack = -llapack -lblas -lgmp -lg2c -appngs = lib/$(MACHINE)/*.o -lngsolvebasic \ No newline at end of file +appngs = lib/$(MACHINE)/*.o -lnetgen_solvebasic + debian/patches/netgen-nglib.patch0000644000000000000000000000147312251551273014217 0ustar Index: netgen/libsrc/interface/Makefile =================================================================== --- netgen.orig/libsrc/interface/Makefile 2008-11-09 13:09:29.000000000 +0100 +++ netgen/libsrc/interface/Makefile 2008-11-09 13:09:39.000000000 +0100 @@ -1,4 +1,4 @@ -src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp +src = nglib.cpp nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp # lib = nginterface libpath = libsrc/interface debian/patches/set-netgendir.patch0000644000000000000000000000107512251560466014420 0ustar From: Ansgar Burchardt Date: Tue, 10 Dec 2013 09:44:49 +0100 Subject: set NETGENDIR to /usr/share/netgen if unset Bug-Debian: http://bugs.debian.org/648047 Bug-Debian: http://bugs.debian.org/671186 --- a/ng/ngappinit.cpp +++ b/ng/ngappinit.cpp @@ -150,9 +150,11 @@ if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR"))) ngdir = getenv ("NETGENDIR"); - else - ngdir = "."; - + else { + ngdir = "/usr/share/netgen"; + setenv("NETGENDIR", ngdir.c_str(), 1); + } + verbose = parameters.GetDefineFlag ("V"); if (verbose) debian/patches/quiltrc0000644000000000000000000000007312251551273012226 0ustar QUILT_PATCHES="debian/patches" QUILT_NO_DIFF_TIMESTAMPS=1 debian/patches/tcl-scripts.patch0000644000000000000000000000777512251551273014130 0ustar Index: netgen/ng/dialog.tcl =================================================================== --- netgen.orig/ng/dialog.tcl +++ netgen/ng/dialog.tcl @@ -1,3 +1,7 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# dialog.tcl -- +# Index: netgen/ng/drawing.tcl =================================================================== --- netgen.orig/ng/drawing.tcl +++ netgen/ng/drawing.tcl @@ -1,3 +1,7 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# drawing.tcl -- +# # # Creates a drawing frame, and binds mouse events # Index: netgen/ng/menustat.tcl =================================================================== --- netgen.orig/ng/menustat.tcl +++ netgen/ng/menustat.tcl @@ -1,3 +1,7 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# menustat.tcl -- +# # netgen menus: menu .ngmenu -tearoff 0 -relief raised -bd 2 Index: netgen/ng/ng.tcl =================================================================== --- netgen.orig/ng/ng.tcl +++ netgen/ng/ng.tcl @@ -1,3 +1,8 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# ng.tcl -- +# + puts "Parsing ng.tcl" if {[catch {package require Tix } result ]} { Index: netgen/ng/nghelp.tcl =================================================================== --- netgen.orig/ng/nghelp.tcl +++ netgen/ng/nghelp.tcl @@ -1,3 +1,8 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# nghelp.tcl -- +# + proc print_commandline_help { } { puts "Usage: ng { options }" Index: netgen/ng/ngicon.tcl =================================================================== --- netgen.orig/ng/ngicon.tcl +++ netgen/ng/ngicon.tcl @@ -1,3 +1,8 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# ngicon.tcl -- +# + set icon_data { /* XPM */ static char *icon2[] = { Index: netgen/ng/ngshell.tcl =================================================================== --- netgen.orig/ng/ngshell.tcl +++ netgen/ng/ngshell.tcl @@ -1,4 +1,9 @@ -## the shell loop +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# ngshell.tcl -- +# +# +# the shell loop proc dotest {} { source ngtest.tcl Index: netgen/ng/ngtesting.tcl =================================================================== --- netgen.orig/ng/ngtesting.tcl +++ netgen/ng/ngtesting.tcl @@ -1,5 +1,9 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# ngtesting.tcl -- +# + -# tests.tcl proc Ng_TestMeshing { infile outfile logfile} { if { ![file exists $infile]} { puts $logfile "error: file $infile does not exist" Index: netgen/ng/ngvisual.tcl =================================================================== --- netgen.orig/ng/ngvisual.tcl +++ netgen/ng/ngvisual.tcl @@ -1,3 +1,8 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# ngvisual.tcl -- +# + Ng_Vis_Set parameters Index: netgen/ng/parameters.tcl =================================================================== --- netgen.orig/ng/parameters.tcl +++ netgen/ng/parameters.tcl @@ -1,4 +1,9 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# proc setgranularity { gran } { +# parameters.tcl -- +# + # # puts "set granularity $gran" # Index: netgen/ng/sockets.tcl =================================================================== --- netgen.orig/ng/sockets.tcl +++ netgen/ng/sockets.tcl @@ -1,3 +1,8 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# sockets.tcl -- +# + set sockets.serverport 0 set sockets.serverhost "localhost" set sockets.serverlistbox 0 Index: netgen/ng/variables.tcl =================================================================== --- netgen.orig/ng/variables.tcl +++ netgen/ng/variables.tcl @@ -1,3 +1,7 @@ +# -*- mode: TCL; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*- +# +# variables.tcl -- +# # netgen global tcl-variables set drawmode rotate debian/patches/netgen-missing-symbols.patch0000644000000000000000000000270012251551273016255 0ustar Index: netgen-4.9.11/nglib/nglib.cpp =================================================================== --- netgen-4.9.11.orig/nglib/nglib.cpp 2010-02-23 18:36:03.000000000 -0500 +++ netgen-4.9.11/nglib/nglib.cpp 2010-02-23 18:36:40.000000000 -0500 @@ -25,10 +25,18 @@ #endif +#include +#include + namespace netgen { extern void MeshFromSpline2D (SplineGeometry2d & geometry, Mesh *& mesh, MeshingParameters & mp); +#include "../libsrc/visualization/mvdraw.hpp" +#include "../libsrc/visualization/soldata.hpp" +#include "../libsrc/visualization/vssolution.hpp" + Tcl_Interp * tcl_interp; + VisualSceneSolution vssolution; } Index: netgen-4.9.11/libsrc/visualization/vssolution.cpp =================================================================== --- netgen-4.9.11.orig/libsrc/visualization/vssolution.cpp 2009-08-30 02:54:42.000000000 -0400 +++ netgen-4.9.11/libsrc/visualization/vssolution.cpp 2010-02-23 18:35:57.000000000 -0500 @@ -18,6 +18,19 @@ extern VisualSceneMesh vsmesh; + SYMBOLTABLE & GetVisualizationScenes () + { + static SYMBOLTABLE vss; + return vss; + } + + void AddVisualizationScene (const string & name, + VisualScene * vs) + { + GetVisualizationScenes().Set (name.c_str(), vs); + } + + VisualSceneSolution :: SolData :: SolData () : name (0), data (0), solclass(0) { ; } debian/netgen-doc.install0000644000000000000000000000004412251551074012601 0ustar usr/share/doc/netgen-doc/examples/* debian/ng_vol.10000644000000000000000000000202412251551074010534 0ustar .TH "NETGEN" "1" .SH "NAME" ng_vol \(em Netgen (nglib) Testing .SH "SYNOPSIS" .PP \fBng_vol\fR [OPTIONS...] [filename] .SH "DESCRIPTION" .PP This manual page documents briefly the \fBng_vol\fR and \fBbar\fR commands. .PP This manual page was written for the \fBDebian\fP distribution because the original program does not have a manual page. .PP \fBng_vol\fR is an testing utility for nglib. .PP Homepage: http://www.mathcces.rwth-aachen.de/netgen/doku.php .SH "AUTHOR" .PP This manual page was written by Christophe Trophime for the \fBDebian\fP system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. .PP On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. .\" created by instant / docbook-to-man, Tue 16 Mar 2010, 10:36 debian/copyright0000644000000000000000000000231012251551273011120 0ustar # -*- coding: utf-8 -*- This package was debianized by Christophe Prud'homme on Wed, 4 Jan 2006 13:15:20 +0100. It was downloaded from: http://www.mathcces.rwth-aachen.de/netgen/doku.php Authors: Joachim Schöberl et al. Copyright: Copyright (C) 1994-2004 Joachim Schöberl License: netgen This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL'. debian/netgen16x16.xpm0000644000000000000000000000665612251551074011721 0ustar /* XPM */ static char *netgen__x__[] = { /* columns rows colors chars-per-pixel */ "16 16 176 2", " c #1D3E00", ". c #393D11", "X c #560000", "o c #591B00", "O c #660000", "+ c #660101", "@ c #6D0000", "# c #670800", "$ c #6E0C0C", "% c #710000", "& c #790000", "* c #7B0000", "= c #780D0D", "- c #7D1F05", "; c #621313", ": c #6B1617", "> c #6C1818", ", c #791412", "< c #4C2500", "1 c #402E00", "2 c #572300", "3 c #563607", "4 c #5B391E", "5 c #7B2709", "6 c #643E11", "7 c #7B3619", "8 c #612722", "9 c #6B2424", "0 c #782B2A", "q c #773333", "w c #1D4A00", "e c #005600", "r c #005C00", "t c #005E00", "y c #075E07", "u c #244E00", "i c #244C0D", "p c #394000", "a c #255006", "s c #2A5200", "d c #006200", "f c #006300", "g c #006201", "h c #026200", "j c #036203", "k c #046200", "l c #006600", "z c #0A6103", "x c #006800", "c c #006900", "v c #006A00", "b c #006B00", "n c #036B00", "m c #036903", "M c #006D00", "N c #006F00", "B c #056D05", "V c #096309", "C c #0B610C", "Z c #086D08", "A c #10640E", "S c #007000", "D c #017000", "F c #017200", "G c #037103", "H c #047300", "J c #007400", "K c #077007", "L c #007900", "P c #037A00", "I c #0C7E0C", "U c #116A11", "Y c #146F14", "T c #1E6F1E", "R c #2B6323", "E c #216A21", "W c #296D29", "Q c #227422", "! c #217822", "~ c #227B22", "^ c #337533", "/ c #3E7637", "( c #3C763C", ") c #3F783D", "_ c #454300", "` c #5C5813", "' c #4D5C39", "] c #526237", "[ c #5E7E5E", "{ c #800000", "} c #810000", "| c #8A0000", " . c #8F0000", ".. c #880900", "X. c #920000", "o. c #920400", "O. c #9D0000", "+. c #9E0000", "@. c #A00000", "#. c #A90907", "$. c #B20600", "%. c #B40600", "&. c #BF0000", "*. c #AD1D1E", "=. c #B61B1C", "-. c #8B2600", ";. c #982004", ":. c #B02424", ">. c #BB2929", ",. c #C40000", "<. c #C10600", "1. c #C90000", "2. c #CD0000", "3. c #CE0202", "4. c #CD0708", "5. c #D30707", "6. c #DE1313", "7. c #E10000", "8. c #EE090B", "9. c #C32F2F", "0. c #CA302E", "q. c #CA3F3B", "w. c #875959", "e. c #B74E4E", "r. c #B84F4F", "t. c #9E7473", "y. c #B76E70", "u. c #A77276", "i. c #A17D7D", "p. c #AE7979", "a. c #D54545", "s. c #DA4040", "d. c #D84D49", "f. c #538155", "g. c #548654", "h. c #588C59", "j. c #6A976A", "k. c #A08978", "l. c #B9867E", "z. c #809B80", "x. c #809F80", "c. c #979C8E", "v. c #A68A80", "b. c #BC8486", "n. c #A79797", "m. c #B39898", "M. c #B19E9E", "N. c #84A485", "B. c #80A880", "V. c #8FA88F", "C. c #8CB18C", "Z. c #ABA68F", "A. c #B7A1A4", "S. c #B7A9A9", "D. c #BEAAAA", "F. c #A6B7A5", "G. c #AEB2AD", "H. c #E39A9B", "J. c #D6AEAE", "K. c #DEAEAE", "L. c #C5B7B7", "P. c #C1BBBB", "I. c #A4C3A4", "U. c #BEC3BE", "Y. c #CFC7C6", "T. c #DCC2C2", "R. c #CBD6CB", "E. c #D3D2D2", "W. c #D5D2D2", "Q. c #DED9D9", "!. c #E3D2D5", "~. c #E7D8DC", "^. c #DBE3DB", "/. c #DAE2DE", "(. c #F9FDFB", "). c None", /* pixels */ ").).).).).).).).).).).).).).).).", ").).).R.V.N.B.z.N.k.9.r.T.).).).", ").).G.^ B d K v z ;.7.1.>.K.).).", ").!.] d v l v t i 0.6.3.O.:.J.).", ").t.a S v y Y I / b.s.8.3.&.e.).", "Q.0 w l V j.U.F.k.H.d.5 -.<.=.L.", "S., s S Q ^.(.Z.a.q.` H P . #.p.", "n.= 1 v K g.h.6 4.7 ) C J k - y.", "P.> # u S k _ %.5.b./.W v P 3 u.", "E.9 * ..2 o $.,.*.~.I.U e M . A.", ").w.+ * | X.@.O.4 [ T d v S ' ).", ").D.> X * } X.o.w t t l M A c.).", ").).i.; O % @ < v M v S Z [ ).).", ").).).m.q $ 8 R ~ ~ E ( C.).).).", ").).).).W.M.Y.).).).).).).).).).", ").).).).).).).).).).).).).).).)." }; debian/README.Debian0000644000000000000000000000104212251555462011233 0ustar netgen for Debian ----------------- netgen provides - netgen : the gui to generate mesh - netgen-doc : the doc for the netgen gui and some tutorial files - libnglib-dev : the static libraries and headers Regarding the development files, they are organized as follows for each - /usr/lib/libnglib[-version].so (shared libraries) - /usr/include/*.h* (header files for nglib library interface) Environment NETGENDIR is set by default to /usr/share/netgen. -- Christophe Prud'homme , Wed Jan 4 15:05:23 2006