From 45659babc582ecc53f7654e635fa8fadae525a87 Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE> Date: Thu, 22 Nov 2007 15:47:41 +0000 Subject: [PATCH] There are two major changes: a cleanup w.r.t. to the DOWB-matrix stuff: the DOWB-matrices have eaten the "ordinary" matrices (they contained the scalar case anyway). This shrinks the needed number of data-structures and function proto-types (e.g. there is now only one DOF_MATRIX and one OPERATOR_INFO, one oem_solve_d(), but no longer an oem_solve_dowb() etc.). This simplifies stuff a lot. Hopefully the added overhead for the ordinary scalar case is neglectible. Second main-line of changes: the boundary _interpretation_ (Neumann, Dirichlet etc.) is now clearly separated from the geometric boundary classification. Boundary segments are assigned a tag as usual, but that tag has to be interpreted by the application. Typically the application now passes a bit-mask to any functions which needs to deal with boundary conditions, one bit for each boundary type which has to be taken into account (e.g.: if Dirichlet boundary conditions are desired for a the boundary segments of type 1 and 255, then the application would pass a bitmask BNDRY_MASK to dirichlet_bound(..., BNDRY_MASK, ...); where BNDRY_MASK has bit 1 and 255 set (and bit 0 to denote that the mask belongs to a boundary at all). --- Makefile.am.template | 4 ++-- configure.ac | 8 ++++++-- gen-assemble-fcts.sh | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile.am.template b/Makefile.am.template index 10c1650..c455633 100644 --- a/Makefile.am.template +++ b/Makefile.am.template @@ -16,7 +16,7 @@ AM_CXXFLAGS = $(ALBERTA_%EFLAGS%_CXXFLAGS) nodist_libalberta%LIBCODE%_la_SOURCES = $(sources) libalberta%LIBCODE%_la_CPPFLAGS = \ $(CPPFLAGS) -DDIM_OF_WORLD=$(DIM_OF_WORLD) -DALBERTA_DEBUG=$(ALBERTA_DEBUG) -libalberta%LIBCODE%_la_LDFLAGS = -version-info 2:0:0 +libalberta%LIBCODE%_la_LDFLAGS = -version-info 3:0:0 if ALBERTA_USE_GRAPHICS lib_LTLIBRARIES += libalberta_gfx%LIBCODE%.la @@ -25,7 +25,7 @@ nodist_libalberta_gfx%LIBCODE%_la_SOURCES = $(gfxsources) libalberta_gfx%LIBCODE%_la_CPPFLAGS = \ $(CPPFLAGS) -DDIM_OF_WORLD=$(DIM_OF_WORLD) -DALBERTA_DEBUG=$(ALBERTA_DEBUG) #libalberta_gfx%LIBCODE%_la_LIBADD = @GLTOOLS_ALL_LIBS@ @OPENDX_ALL_LIBS@ @OPENGL_ALL_LIBS@ -libalberta_gfx%LIBCODE%_la_LDFLAGS = -version-info 2:0:0 +libalberta_gfx%LIBCODE%_la_LDFLAGS = -version-info 3:0:0 endif diff --git a/configure.ac b/configure.ac index ebd8855..7771e38 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([alberta], [2.0], [Claus.Heine@Mathematik.Uni-Freiburg.DE,kosterdtp@ewi.uwente.nl]) +AC_INIT([alberta], [2.1], [Claus.Heine@Mathematik.Uni-Freiburg.DE,kosterdtp@ewi.uwente.nl]) AC_CONFIG_SRCDIR([alberta/src/Common/alberta.h]) AM_MAINTAINER_MODE @@ -10,7 +10,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([1.10 dist-bzip2]) +AM_INIT_AUTOMAKE([1.10 dist-bzip2 tar-pax]) AM_CONFIG_HEADER([config.h]) pkglibexecdir="${libexecdir}/${PACKAGE_NAME}-${PACKAGE_VERSION}" @@ -94,6 +94,10 @@ AC_SUBST(DEMOSOURCES) # something has changed, copy albert_util_inlines.h.in to # alberta_util_inlines.h # +# This somewhat complicated stuff is meant primarily for use during +# development to avoid rebuilding of the library just because a header +# file was touched (but not changed). +# AC_CONFIG_COMMANDS([alberta_util/src/alberta_util_inlines.h], [if test -f alberta_util/src/alberta_util_inlines.h && \ cmp alberta_util/src/alberta_util_inlines.h alberta_util/src/alberta_util_inlines.h.in diff --git a/gen-assemble-fcts.sh b/gen-assemble-fcts.sh index 711151e..2a854a5 100755 --- a/gen-assemble-fcts.sh +++ b/gen-assemble-fcts.sh @@ -47,7 +47,7 @@ for target in DST SRC LALT LB C; do esac SED_STRING="${SED_STRING} -e 's|@${TYPE}@|REAL_DD|g'" SED_STRING="${SED_STRING} -e 's|@${PTR_TYPE}@|REAL_D *|g'" - SED_STRING="${SED_STRING} -e 's|@${DOWB_NAME}@|full|g'" + SED_STRING="${SED_STRING} -e 's|@${DOWB_NAME}@|real_dd|g'" SED_STRING="${SED_STRING} -e 's|@${CONSTCAST}@|(const REAL_D *)|g'" ;; DM) @@ -64,7 +64,7 @@ for target in DST SRC LALT LB C; do esac SED_STRING="${SED_STRING} -e 's|@${TYPE}@|REAL_D|g'" SED_STRING="${SED_STRING} -e 's|@${PTR_TYPE}@|REAL *|g'" - SED_STRING="${SED_STRING} -e 's|@${DOWB_NAME}@|diag|g'" + SED_STRING="${SED_STRING} -e 's|@${DOWB_NAME}@|real_d|g'" SED_STRING="${SED_STRING} -e 's|@${CONSTCAST}@|/**/|g'" ;; SCM) @@ -81,7 +81,7 @@ for target in DST SRC LALT LB C; do esac SED_STRING="${SED_STRING} -e 's|@${TYPE}@|REAL|g'" SED_STRING="${SED_STRING} -e 's|@${PTR_TYPE}@|NOT_NEEDED|g'" - SED_STRING="${SED_STRING} -e 's|@${DOWB_NAME}@|scal|g'" + SED_STRING="${SED_STRING} -e 's|@${DOWB_NAME}@|real|g'" SED_STRING="${SED_STRING} -e 's|@${CONSTCAST}@|/**/|g'" ;; esac -- GitLab