diff --git a/Makefile.in b/Makefile.in index 8dadf4b9..f25e0d04 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,7 +233,6 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 METASOURCES = AUTO SUBDIRS = libsrc ng nglib tutorials doc -TESTS = ng/netgen -batchmode all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -428,79 +427,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - distdir: $(DISTFILES) $(am__remove_distdir) test -d $(distdir) || mkdir $(distdir) @@ -650,7 +576,6 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-recursive all-am: Makefile config.h installdirs: installdirs-recursive @@ -741,21 +666,23 @@ uninstall-am: install-strip .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-TESTS check-am clean \ - clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am + +# TESTS = ng/netgen -batchmode # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/configure.ac b/configure.ac index f2ed92ea..29770e3b 100644 --- a/configure.ac +++ b/configure.ac @@ -53,13 +53,13 @@ AC_ARG_ENABLE([nglib], AC_ARG_ENABLE([parallel], [ --enable-parallel enable mpi parallelization], - [AC_SUBST([MPI_INCLUDES], "-I/opt/mpich/include -DPARALLEL -I/home/joachim/download/metis-4.0/Lib -DMETIS") - AC_SUBST([MPI_LIBS], "-L/home/joachim/download/metis-4.0 -lmetis -L/opt/mpich/ch-p4/lib64 -lmpich") + [AC_SUBST([MPI_INCLUDES], "-I/opt/mpich/include -DPARALLEL -I/usr/share/metis/Lib -DMETIS") + AC_SUBST([MPI_LIBS], "-lmetis -L/opt/mpich/ch-p4/lib -lmpich") ] ) -# [AC_SUBST([MPI_INCLUDES], "-I/opt/mpich/include -DPARALLEL -I/usr/share/metis/Lib -DMETIS") -# AC_SUBST([MPI_LIBS], "-lmetis -L/opt/mpich/ch-p4/lib -lmpich") +# [AC_SUBST([MPI_INCLUDES], "-I/opt/mpich/include -DPARALLEL -I/home/joachim/download/metis-4.0/Lib -DMETIS") +# AC_SUBST([MPI_LIBS], "-L/home/joachim/download/metis-4.0 -lmetis -L/opt/mpich/ch-p4/lib64 -lmpich") # AC_HEADER_STDC @@ -102,8 +102,8 @@ AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile -libsrc/opti/Makefile libsrc/parallel/Makefile -libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile -nglib/Makefile tutorials/Makefile doc/Makefile) + libsrc/parallel/Makefile libsrc/stlgeom/Makefile + libsrc/visualization/Makefile ng/Makefile nglib/Makefile + tutorials/Makefile doc/Makefile) AC_OUTPUT diff --git a/libsrc/linalg/Makefile.in b/libsrc/linalg/Makefile.in index feabee33..78e116cd 100644 --- a/libsrc/linalg/Makefile.in +++ b/libsrc/linalg/Makefile.in @@ -48,7 +48,8 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libla_la_LIBADD = -am_libla_la_OBJECTS = densemat.lo polynomial.lo vector.lo +am_libla_la_OBJECTS = densemat.lo polynomial.lo vector.lo bfgs.lo \ + linopt.lo linsearch.lo libla_la_OBJECTS = $(am_libla_la_OBJECTS) libla_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -227,11 +228,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp +noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp opti.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO noinst_LTLIBRARIES = libla.la -libla_la_SOURCES = densemat.cpp polynomial.cpp vector.cpp +libla_la_SOURCES = densemat.cpp polynomial.cpp vector.cpp bfgs.cpp linopt.cpp linsearch.cpp libla_la_LDFLAGS = -rdynamic all: all-am @@ -284,7 +285,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfgs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/densemat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linopt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linsearch.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polynomial.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Plo@am__quote@ diff --git a/libsrc/parallel/parallelinterface.hpp b/libsrc/parallel/parallelinterface.hpp deleted file mode 100644 index 6127acd1..00000000 --- a/libsrc/parallel/parallelinterface.hpp +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef FILE_PARALLELINTERFACE -#define FILE_PARALLELINTERFACE - -#ifdef PARALLEL - -#ifdef __cplusplus -extern "C" { -#endif - - // this interface is 0-base !! - -// // these functions have O(N) complexity -// int NgPar_Glob2Loc_SurfEl ( int globnum ) ; -// int NgPar_Glob2Loc_VolEl ( int globnum ) ; -// int NgPar_Glob2Loc_Segm ( int globnum ) ; -// int NgPar_Glob2Loc_Vert ( int globnum ) ; - - - int NgPar_GetLoc2Glob_VolEl ( int locnum ); - - // int NgPar_GetDistantNodeNums ( int nt, int locnum, int * procs, int * distnum); - - // number on distant processor - - // gibt anzahl an distant pnums zurueck - // * pnums entspricht Array - int NgPar_GetDistantNodeNums ( int nodetype, int locnum, int * pnums ); - int NgPar_GetNDistantNodeNums ( int nodetype, int locnum ); - - int NgPar_GetDistantPNum ( int proc, int locnum ) ; - int NgPar_GetDistantEdgeNum ( int proc, int locnum ) ; - int NgPar_GetDistantFaceNum ( int proc, int locnum ) ; - int NgPar_GetDistantElNum ( int proc, int locnum ); - - bool NgPar_IsExchangeFace ( int fnr ) ; - bool NgPar_IsExchangeVert ( int vnum ); - bool NgPar_IsExchangeEdge ( int ednum ); - bool NgPar_IsExchangeElement ( int elnum ); - - void NgPar_PrintParallelMeshTopology (); - bool NgPar_IsElementInPartition ( int elnum, int dest ); - - bool NgPar_IsGhostFace ( int facenum ); - bool NgPar_IsGhostEdge ( int edgenum ); - -#ifdef __cplusplus -} -#endif - -#endif - -#endif diff --git a/ng/Makefile.in b/ng/Makefile.in index 82346106..fecc0fbc 100644 --- a/ng/Makefile.in +++ b/ng/Makefile.in @@ -67,7 +67,6 @@ netgen_DEPENDENCIES = \ $(top_builddir)/libsrc/parallel/libparallel.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/opti/libopti.la \ $(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/general/libgeneral.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -280,7 +279,6 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \ $(top_builddir)/libsrc/parallel/libparallel.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/opti/libopti.la \ $(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/general/libgeneral.la \ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) diff --git a/ng/parallelinterface.cpp b/ng/parallelinterface.cpp index aa03c525..f5903615 100644 --- a/ng/parallelinterface.cpp +++ b/ng/parallelinterface.cpp @@ -3,7 +3,7 @@ #include -#include "../libsrc/parallel/parallelinterface.hpp" +#include "../libsrc/include/parallelinterface.hpp" namespace netgen { diff --git a/nglib/Makefile.am b/nglib/Makefile.am index d9bf50e8..aa1e886d 100644 --- a/nglib/Makefile.am +++ b/nglib/Makefile.am @@ -13,7 +13,6 @@ libnglib_la_LIBADD = \ $(top_builddir)/libsrc/parallel/libparallel.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/opti/libopti.la \ $(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/general/libgeneral.la $(MPI_LIBS) @@ -27,19 +26,6 @@ ng_vol_LDADD = \ libnglib.la -# $(top_builddir)/libsrc/occ/libocc.la -# $(top_builddir)/libsrc/geom2d/libgeom2d.la -# $(top_builddir)/libsrc/csg/libcsg.la -# $(top_builddir)/libsrc/interface/libinterface.la \ -# $(top_builddir)/libsrc/stlgeom/libstl.la \ -# $(top_builddir)/libsrc/meshing/libmesh.la -# $(top_builddir)/libsrc/gprim/libgprim.la -# $(top_builddir)/libsrc/opti/libopti.la -# $(top_builddir)/libsrc/linalg/libla.la \ -# $(top_builddir)/libsrc/general/libgeneral.la - - -# ng_vol_LDFLAGS = -rdynamic diff --git a/nglib/Makefile.in b/nglib/Makefile.in index 8971da81..ea5f2234 100644 --- a/nglib/Makefile.in +++ b/nglib/Makefile.in @@ -67,7 +67,6 @@ libnglib_la_DEPENDENCIES = \ $(top_builddir)/libsrc/parallel/libparallel.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/opti/libopti.la \ $(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/general/libgeneral.la \ $(am__DEPENDENCIES_1) @@ -268,7 +267,6 @@ libnglib_la_LIBADD = \ $(top_builddir)/libsrc/parallel/libparallel.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/opti/libopti.la \ $(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/general/libgeneral.la $(MPI_LIBS) @@ -608,19 +606,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-includeHEADERS uninstall-libLTLIBRARIES - -# $(top_builddir)/libsrc/occ/libocc.la -# $(top_builddir)/libsrc/geom2d/libgeom2d.la -# $(top_builddir)/libsrc/csg/libcsg.la -# $(top_builddir)/libsrc/interface/libinterface.la \ -# $(top_builddir)/libsrc/stlgeom/libstl.la \ -# $(top_builddir)/libsrc/meshing/libmesh.la -# $(top_builddir)/libsrc/gprim/libgprim.la -# $(top_builddir)/libsrc/opti/libopti.la -# $(top_builddir)/libsrc/linalg/libla.la \ -# $(top_builddir)/libsrc/general/libgeneral.la - -# ng_vol_LDFLAGS = -rdynamic # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: