Skip to content
Snippets Groups Projects
Commit f106bb28 authored by Markus Blatt's avatar Markus Blatt
Browse files

Merge sync to keep track with the trunk. 

Thanks for renaming files and targets. Always a pleasure to mimic this manually.


[[Imported from SVN: r6654]]
parents b27b7873 d3717d78 f0d76465
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 167 additions and 1659 deletions
configure.ac
+ 1
− 1
View file @ f106bb28
......@@ -16,6 +16,7 @@ DUNE_CHECK_ALL
AC_SUBST([DUNE_COMMON_ROOT], '$(abs_top_srcdir)')
AC_SUBST([DUNE_COMMON_BIN], '$(abs_top_srcdir)/bin/')
AC_SUBST([AM_CPPFLAGS], '-I$(top_srcdir)')
AC_SUBST([AM_LDFLAGS], '$(DUNE_LDFLAGS)')
AC_SUBST([LDADD], '$(top_builddir)/lib/libdunecommon.la')
# write output
......@@ -25,7 +26,6 @@ AC_CONFIG_FILES([Makefile
dune/Makefile
dune/common/Makefile
dune/common/test/Makefile
dune/common/exprtmpl/Makefile
dune/common/parallel/Makefile
dune/common/parallel/test/Makefile
doc/Makefile
......
doc/buildsystem/buildsystem.tex
+ 116
− 21
View file @ f106bb28
......@@ -84,7 +84,7 @@ Im Neuenheimer Feld 368, D-69120 Heidelberg, Germany}\\
\section{Creating a new \dune project}\label{section::creating_new_dune_project}
From a build system point of view there is no difference between a \dune
application and a \dune module.\\
application and a \dune module.
\dune modules are packages that offer a certain functionality that can
be used by \dune applications. Therefore \dune modules offer libraries
......@@ -115,7 +115,7 @@ the bare minimum you have to provide in order to create a new project:
This section tells you how to begin working with \dune without explaining any
further details. For a closer look on \duneproject, see section
\ref{section::creating_new_dune_project}.\\
\ref{section::creating_new_dune_project}.
Once you have downloaded all the \dune modules you are interested in, you probably
wonder ``How do I start working with \dune?'' It is quite easy.
......@@ -146,7 +146,7 @@ modules). It can be done by calling
\emph{Note:} In case you are using the unstable version
\dune you should be aware that the build system may change,
just like the source code. Therefore it might be that
\texttt{duneproject} is not up to date with the latest changes. \\
\texttt{duneproject} is not up to date with the latest changes.
After calling \duneproject, you have to provide a name for your project
(without whitespace), e.g., \texttt{dune-foo}.
......@@ -242,8 +242,8 @@ After running
make doc
\end{lstlisting}
in \texttt{dune-foo} you should now find a
\texttt{html} \texttt{doxygen} documentation in
\texttt{dune-foo/doc/doxygen/html/index.html}.\\
\texttt{html} \texttt{doxygen} documentation which can be read by opening
\texttt{dune-foo/doc/doxygen/html/index.html}.
\section{Dune module guidelines}\label{section::dune_module_guidelines}
\label{guidelines}
......@@ -261,8 +261,8 @@ A \dune module should comply with the following rules:
directory. You should at least provide the macros \texttt{\emph{MODULE}\_CHECKS}
and \texttt{\emph{MODULE}\_CHECK\_MODULE}, in order to setup and
find your module (see~\ref{m4files}).
\item Header files that can be used by other \dune modules should be
accessible via \verb!#include <dune/foo/bar.hh>!. In order to work
\item Header files should be accessible via \verb!#include <dune/foo/bar.hh>!,
otherwise they cannot be used by other \dune modules. In order to work
with a freshly checkout version of your module you will usually need
to create a local symbolic link \texttt{dune ->
\textit{module-directory/}}. This link gets created by the
......@@ -514,7 +514,7 @@ bye_CPPFLAGS = -DBYE
\end{lstlisting}
Perhaps you're wondering why the above examples used
\texttt{AM\_CPPFLAGS} instead of the normal \texttt{CPPFLAGS}? The
\texttt{AM\_CPPFLAGS} instead of normal \texttt{CPPFLAGS}? The
reason for this is that the variables \texttt{CFLAGS},
\texttt{CPPFLAGS}, \texttt{CXXFLAGS} etc. are considered {\em user
variables} which may be set on the command line:
......@@ -835,7 +835,7 @@ target_LIBADD =
\begin{description}
\item[MPI] The \texttt{DUNE\_MPI} macro sets the following variables with the
help of the macros \texttt{ACX\_MPI} and \texttt{MPI\_CONFIG}: For
help of the macros \texttt{MPI\_CONFIG} and \texttt{ACX\_MPI}: For
compilation with the MPI compiler \texttt{MPICC} and \texttt{MPILIBS}.
These are not used in \dune except that \texttt{MPICC} may be set on the
configure command line to select which MPI installation to use. For
......@@ -1060,7 +1060,7 @@ We offer a set of macros that can be used in your \configureac:
\texttt{dunecontrol m4create} and write a file
\texttt{dependencies.m4}.
\item \texttt{DUNE\_SYMLINK}
creates symlink \texttt{\$(top\_srcdir)/dune} $\rightarrow$
creates symlink \texttt{\$(top\_srcdir)/dune} $\!\rightarrow$
\texttt{\$(top\_srcdir)}. The programming guidelines (\ref{guidelines})
require that the include statements be like \texttt{\#include
<dune/...>}. If your module has a directory structure
......@@ -1078,7 +1078,7 @@ We offer a set of macros that can be used in your \configureac:
\texttt{DUNE\_CHECK\_ALL}.
\end{itemize}
\texttt{DUNE\_CHECK\_ALL} defines certain
\texttt{DUNE\_CHECK\_ALL} defines the following
variables that can be used in the \configure script or in the
\makefileam:
......@@ -1172,9 +1172,9 @@ and \texttt{\emph{MODULE}\_CHECK\_MODULE} is called. Last
\texttt{\emph{MODULE}\_CHECKS} is called for your module, in order to
check all prerequisites for your module.
What you just read implies that you have to provide the two macros
When you have to provide the two macros
\texttt{\emph{MODULE}\_CHECKS} and
\texttt{\emph{MODULE}\_CHECK\_MODULE} for your module. These should be
\texttt{\emph{MODULE}\_CHECK\_MODULE} for your module these should be
written to a \texttt{m4/*.m4} file.
Here follows an example for the module \texttt{dune-foo}:
......@@ -1227,7 +1227,7 @@ The commands you are interested in right now are
directories containing \dunemodule files and the parameters given on
the command line are passed as parameters to \autogen.
\item \texttt{configure} runs \configure for each
module. \texttt{--with-dune\textit{module}} parameters are created
module. \texttt{--with-dune-\textit{module}} parameters are created
for a set of known \dune modules.
\item \texttt{make} runs \make for each module.
\item \texttt{all} runs \autogen, \configure and \make for each module.
......@@ -1295,6 +1295,33 @@ environment variables.
\item \texttt{GREP} tells \dunecontrol which command to invoke for 'grep'.
\end{itemize}
\minisec{opts file variables}
Certain aspects of the build system can be specified via additional
entries in the opts file:
\begin{itemize}
\item \texttt{DUNE\_CONTROL\_PATH} -- see \emph{environment variables}
\item \texttt{RESUME\_FILE} -- see \emph{Resume build after error}
Section \ref{sec:timesaving}
\item \texttt{BUILDDIR} configure the modules to use out-of-source
build. The binaries are built in subdirectories of each module,
named according to the \texttt{BUILDDIR} variable.
\item \texttt{\textit{COMMAND}\,\_FLAGS}\\ the most important ones are:
\begin{itemize}
\item \texttt{AUTOGEN\_FLAGS} specifies options for the
\texttt{dune-autogen} script. This allows to set\\
\texttt{--acversion=VERSION} or \texttt{--amversion=VERSION} to
force usage of a specific\\ \texttt{autoconf\$VERSION} or
\texttt{automake\$VERSION}.
\item \texttt{CONFIGURE\_FLAGS} specifies options you want to pass to
configure. For a list of possible parameters see
\texttt{./configure --help} (note that this command is only
available after running \texttt{dunecontrol autogen}).
\item \texttt{MAKE\_FLAGS} specifies options for the \texttt{make}
command, e.g. \texttt{-j4} to allow four concurrent build jobs.
\end{itemize}
\end{itemize}
\subsection{dune.module}\label{subsec::dune.module}
The \dunemodule file is split into two parts. First we have the
......@@ -1305,9 +1332,11 @@ implementation of a command called via \dunecontrol.
\begin{lst}[File dune.module] \mbox{}
\begin{lstlisting}
# parameters for dune control
Module: dune_grid
Depends: dune_common
Suggests: UG Alberta Alu3d
Module: dune-grid
Version: 2.2-svn
Maintainer: dune@dune-project.org
Depends: dune-common (>= 2.2) dune-geometry (>= 2.2)
Extra-Suggests: UG Alberta Alu3d
# overload the run_configure command
run_configure () {
......@@ -1332,10 +1361,14 @@ i.e. the order in which the modules are built. The parameters and
their values are separated by colon. Possible parameters are
\begin{itemize}
\item \texttt{Module} (\em required\em) is the name of the module. The
name is of the form \texttt{[a-zA-Z0-9\_]+}.
name is of the form \texttt{[a-zA-Z0-9\_-]+}.
\item \texttt{Version} (\em optional\em) is the module's version.
\item \texttt{Maintainer} (\em optional\em) is the email address of the
module's maintainer.
\item \texttt{Depends} (\em required\em) takes a space separated list
of required modules. This module is not functional without these
other modules.
other modules. Checks whether the demanded version of the required
modules is provided.
\item \texttt{Suggests} (\em optional\em) takes a space separated list
of optional modules. This module is functional without these
other modules, but can offer further functionality if one or more of
......@@ -1425,8 +1458,70 @@ AC_CONFIG_FILES([Makefile
AC_OUTPUT
\end{lstlisting}
Now, your project is prepared to build the subdirectory
\texttt{my\_pdelab\_application} if and only if \texttt{dune-pdelab} is successfully
installed on your machine.
\texttt{my\_pdelab\_application} if and only if your machine has a successfully
installed \texttt{dune-pdelab}.
\subsection{Time savings using \dunecontrol}
\label{sec:timesaving}
\dunecontrol can help working with a growing stack of depending \dune modules and
might save you time.
\minisec{Narrow down \dune modules to apply actions to}
Often you don't want to let \dunecontrol apply actions for every module but only
the one you are working on.
With the flag \texttt{--only=dune-foo} in
\begin{lstlisting}[language=make]
./dune-common/bin/dunecontrol --module=dune-foo --opts=config.opts configure
\end{lstlisting}
only the module \texttt{dune-foo} will be configured by \dunecontrol.
Using the flag \texttt{--current} below a module's root directory \dunecontrol
applies actions only for this module.
To apply the actions to a module and all modules it depends on, set the flag
\texttt{--module=dune-foo}.
\minisec{Updates from revision control systems}
If modules are kept in a revision control system you need to stay up to
date and download the newest versions for your modules. The command \texttt{update}
as in
\begin{lstlisting}[language=make]
./dune-common/bin/dunecontrol update
\end{lstlisting}
makes \dunecontrol to update every module. Currently supported and automatically detected
revision control systems are the Concurrent Versions System (CVS), Apache
Subversion (SVN) and Git.
\minisec{Execute commands for every module}
The \dunecontrol command \texttt{exec} allows to execute commands in the root
directory of every module. For example the
statement
\begin{lstlisting}[language=make,showstringspaces=false]
./dune-common/bin/dunecontrol exec "svn log -l10"
\end{lstlisting}
shows the last ten Subversion commit messages for all modules. If a module is
not under Subversion version control the command execution fails and \dunecontrol
stops.
\minisec{Resume build after error}
\dunecontrol stops whenever an error occurs. But you can resume from the module which
failed. To enable this feature, you have to specify the path of a resume file in the
variable \texttt{RESUME\_FILE} of your options file and use the flag \texttt{--resume}.
If \dunecontrol fails it saves the name of the failing module in the specified file.
On the next run it recognizes the failed run and resumes from the failed module on.
\dunecontrol skips the first module -- the one with the error in the last run -- after
resuming if the flag \texttt{--skipfirst} is given together with \texttt{--resume}.
\minisec{Use configure caching}
\configure is run for every module thus many tests are unnecessarily run multiple times.
You can use \autoconf's ability to cache test results. If you add
\texttt{--cache-file=/tmp/dune-config.cache} to the \texttt{CONFIUGURE\_FLAGS} of
you options file the \configure cache is created. Be aware that the file persists
between \dunecontrol runs. If you encounter any problems, you want to change the
configuration or to rerun all checks, the cache file should be removed manually.
\section{Further documentation}
......
dune/common/Makefile.am
+ 1
− 8
View file @ f106bb28
# $Id$
SUBDIRS = . test exprtmpl parallel
SUBDIRS = . test parallel
# the standard debug streams are put into the libdune
noinst_LTLIBRARIES = libcommon.la
......@@ -83,11 +83,4 @@ commoninclude_HEADERS = \
unused.hh \
version.hh
if EXPRESSIONTEMPLATES
commoninclude_HEADERS += exprtmpl.hh exprtmpl/scalar.inc exprtmpl/exprexpr.inc
libcommon_la_SOURCES += exprtmpl.cc
else
sourcescheck_NOSOURCES = exprtmpl.hh exprtmpl.cc
endif
include $(top_srcdir)/am/global-rules
dune/common/densevector.hh
+ 5
− 5
View file @ f106bb28
......@@ -301,9 +301,9 @@ namespace Dune {
//! it distinct from the STL version which returns
//! a reverse iterator. Use the new method beforeEnd
//! instead.
Iterator rbegin() DUNE_DEPRECATED
Iterator rbegin() DUNE_DEPRECATED_MSG("Use the new method beforeEnd instead")
{
return beforeBegin();
return beforeEnd();
}
//! @returns an iterator that is positioned before
......@@ -317,7 +317,7 @@ namespace Dune {
//! it distinct from the STL version which returns
//! a reverse iterator. Use the new method beforeBegin
//! instead.
Iterator rend () DUNE_DEPRECATED
Iterator rend () DUNE_DEPRECATED_MSG("Use the new method beforeBegin instead")
{
return beforeBegin();
}
......@@ -356,7 +356,7 @@ namespace Dune {
//! it distinct from the STL version which returns
//! a reverse iterator. Use the new method beforeEnd
//! instead.
ConstIterator rbegin() const DUNE_DEPRECATED
ConstIterator rbegin() const DUNE_DEPRECATED_MSG("Use the new method beforeEnd instead")
{
return beforeEnd();
}
......@@ -372,7 +372,7 @@ namespace Dune {
//! it distinct from the STL version which returns
//! a reverse iterator. Use the new method beforeBegin
//! instead.
ConstIterator rend () const DUNE_DEPRECATED
ConstIterator rend () const DUNE_DEPRECATED_MSG("Use the new method beforeBegin instead")
{
return beforeBegin();
}
......
dune/common/exprtmpl.cc deleted 100644 → 0
+ 0
− 6
View file @ b27b7873
// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=4 sw=2 sts=2:
#include "exprtmpl.hh"
/** This is only needed for debugging and will be removed in the future */
Indent INDENT;
dune/common/exprtmpl.hh deleted 100644 → 0
+ 0
− 1111
View file @ b27b7873
This diff is collapsed.
dune/common/exprtmpl/Makefile.am deleted 100644 → 0
+ 0
− 7
View file @ b27b7873
# $Id: $
SOURCES = exprexpr.inc norm.inc scalar.inc
exprtmpldir = $(includedir)/dune/common/exprtmpl
exprtmpl_HEADERS = $(SOURCES)
include $(top_srcdir)/am/global-rules
dune/common/exprtmpl/exprexpr.inc deleted 100644 → 0
+ 0
− 136
View file @ b27b7873
// -*- C++ -*-
#ifndef OP
#error OP undefined
#endif
namespace ExprTmpl {
template <class A, class B>
class ExpressionOpExpression
{
public:
//#warning compare field_type of class A and B and choose infomation richest one!
typedef typename FieldType<A>::type field_type;
typedef typename BlockType<A>::type block_type;
typedef typename BlockExpression<ExpressionOpExpression>::type BlockExpr;
ExpressionOpExpression (const Expression<A> & _a, const Expression<B> & _b)
: a(_a), b(_b) {
#ifdef DUNE_ISTL_WITH_CHECKING
assert(a.N() == b.N());
#endif
}
BlockExpr operator[] (int i) const {
return a[i] OP b[i];
}
int N() const { return a.N(); };
private:
Expression<A> a;
Expression<B> b;
};
// Expression op Expression
template <class A, class B>
Expression< ExpressionOpExpression<A,B> >
operator OP (const Expression<A> & a, const Expression<B> & b)
{
ExpressionOpExpression<A,B> ex(a, b);
return Expression< ExpressionOpExpression<A,B> >(ex);
}
// Expression op Vector
template <class A, class B>
Expression< ExpressionOpExpression<A, ConstRef<B> > >
operator OP (const Expression<A> & a, const Vector<B> & b)
{
ConstRef<B> rb(b);
ExpressionOpExpression<A, ConstRef<B> > ex(a, rb);
return Expression< ExpressionOpExpression<A, ConstRef<B> > >(ex);
}
// Expression op FieldVector<K,1>
template <class A, class K>
K operator OP (const Expression<A> & a,
const Expression< ConstRef< FieldVector<K,1> > >& b)
{
return a OP b[0];
}
// Vector op Expression
template <class A, class B>
Expression< ExpressionOpExpression< ConstRef<A>, B> >
operator OP (const Vector<A> & a, const Expression<B> & b)
{
ConstRef<A> ra(a);
ExpressionOpExpression< ConstRef<A>, B> ex(ra, b);
return Expression< ExpressionOpExpression<ConstRef<A>, B> >(ex);
}
// FieldVector<K,1> op Expression
template <class K, class B>
K operator OP (const Expression< ConstRef< FieldVector<K,1> > > & a,
const Expression<B> & b)
{
return a[0] OP b;
}
// Vector op Vector
template <class V>
Expression< ExpressionOpExpression< ConstRef<V>, ConstRef<V> > >
operator OP (const Vector<V> & a, const Vector<V> & b)
{
ConstRef<V> ra(a);
ConstRef<V> rb(b);
ExpressionOpExpression< ConstRef<V>, ConstRef<V> > ex(ra, rb);
return Expression< ExpressionOpExpression< ConstRef<V>, ConstRef<V> > >(ex);
}
// FieldVector<K,1> op FieldVector<K,1>
template <class K>
K operator OP (const Expression< ConstRef< FieldVector<K,1> > > & a,
const Expression< ConstRef< FieldVector<K,1> > > & b)
{
return a[0] OP b[0];
}
// TypeTraits
template<class A, class B>
struct BlockExpression< ExpressionOpExpression<A,B> >
{
typedef
typename SelectType<
// decide whether we are at the and of the recusrion
isEndOfExpressionRecusion<typename BlockType<A>::type>::value,
// select FieldType if where are at the end of the recursion
typename FieldType<A>::type,
// construct nested expression otherwise
ExprTmpl::Expression<
ExprTmpl::ExpressionOpExpression<
typename ExpressionImp< typename BlockExpression<
typename ExpressionImp<A>::type>::type>::type,
typename ExpressionImp< typename BlockExpression<
typename ExpressionImp<B>::type>::type>::type > >
>::Type type;
};
template <class A, class B>
struct ExpressionImp< ExpressionOpExpression<A,B> >
{
typedef ExpressionOpExpression<A,B> type;
};
}
template <class A, class B>
struct FieldType< ExprTmpl::ExpressionOpExpression<A,B> >
{
typedef typename FieldType<A>::type type;
};
template <class A, class B>
struct BlockType< ExprTmpl::ExpressionOpExpression<A,B> >
{
typedef typename BlockType<A>::type type;
};
#undef ExpressionOpExpression
#undef OP
dune/common/exprtmpl/norm.inc deleted 100644 → 0
+ 0
− 74
View file @ b27b7873
// -*- C++ -*-
#ifndef NORM
#error NORM undefined
#endif
#ifndef NORM_CODE
#error NORM_CODE undefined
#endif
#ifndef VAL_CODE
#error VAL_CODE undefined
#endif
template <class A>
typename FieldType<A>::type
NORM (const ExprTmpl::Expression<A> & a)
{
NORM_CODE
}
template <class A>
typename FieldType<A>::type
NORM (const ExprTmpl::Vector<A> & a)
{
NORM_CODE
}
/*
template <class A>
double
ExprTmpl::Expression<A>::NORM () const
{
const ExprTmpl::Expression<A> & a = *this;
NORM_CODE
}
template <class A>
double
ExprTmpl::Vector<A>::NORM () const
{
const ExprTmpl::Vector<A> & a = *this;
NORM_CODE
}
template <class A>
double
ExprTmpl::ConstRef<A>::NORM () const
{
const ExprTmpl::ConstRef<A> & a = *this;
NORM_CODE
}
*/
inline double
NORM (const double & a)
{
VAL_CODE
}
inline float
NORM (const float & a)
{
VAL_CODE
}
inline int
NORM (const int & a)
{
VAL_CODE
}
#undef NORM
#undef NORM_CODE
#undef VAL_CODE
dune/common/exprtmpl/scalar.inc deleted 100644 → 0
+ 0
− 185
View file @ b27b7873
// -*- C++ -*-
#ifndef OP
#error OP undefined
#endif
#ifdef ExpressionOpScalar
namespace ExprTmpl {
template <class A>
class ExpressionOpScalar
{
public:
typedef typename FieldType<A>::type field_type;
typedef typename BlockType<A>::type block_type;
typedef typename BlockExpression<ExpressionOpScalar>::type BlockExpr;
ExpressionOpScalar (const Expression<A> & _a,
const typename FieldType<A>::type & _lambda)
: a(_a), lambda(_lambda) {}
BlockExpr operator[] (int i) const {
return a[i] OP lambda;
}
int N() const { return a.N(); };
private:
Expression<A> a;
const field_type lambda;
};
// Scalar op FieldVector<K,1>
template <class K>
K operator OP (const Expression< ConstRef< FieldVector<K,1> > > & a,
const K & lambda)
{
return a[0] OP lambda;
}
// Vector op Scalar
template <class A>
Expression< ExpressionOpScalar<ConstRef<A> > >
operator OP (const Vector<A> & a, const typename FieldType<A>::type & lambda)
{
ConstRef<A> ra(a);
ExpressionOpScalar< ConstRef<A> > ex(ra, lambda);
return Expression< ExpressionOpScalar<ConstRef<A> > >(ex);
}
// Expression op Scalar
template <class A>
Expression< ExpressionOpScalar<A> >
operator OP (const Expression<A> & a, const typename FieldType<A>::type & lambda)
{
ExpressionOpScalar<A> ex(a, lambda);
return Expression< ExpressionOpScalar<A> >(ex);
}
// TypeTraits
//#warning Kann hier nicht das innere ExpressionImp weg?
template <class Ex>
struct BlockExpression< ExprTmpl::ExpressionOpScalar<Ex> >
{
typedef
typename SelectType<
isEndOfExpressionRecusion< typename BlockType<Ex>::type >::value,
typename FieldType<Ex>::type,
ExprTmpl::Expression<
ExprTmpl::ExpressionOpScalar<typename ExpressionImp<
typename BlockExpression<
typename ExpressionImp<Ex>::type>::type>::type > >
>::Type type;
};
template <class Ex>
struct ExpressionImp< ExprTmpl::ExpressionOpScalar<Ex> >
{
typedef ExprTmpl::ExpressionOpScalar< Ex > type;
};
} // namespace ExprTmpl
template <class A>
struct FieldType< ExprTmpl::ExpressionOpScalar<A> >
{
typedef typename FieldType<A>::type type;
};
template <class A>
struct BlockType< ExprTmpl::ExpressionOpScalar<A> >
{
typedef typename BlockType<A>::type type;
};
#undef ExpressionOpScalar
#endif
#ifdef ScalarOpExpression
namespace ExprTmpl {
template <class A>
class ScalarOpExpression
{
public:
typedef typename FieldType<A>::type field_type;
typedef typename BlockType<A>::type block_type;
typedef typename BlockExpression<ScalarOpExpression>::type BlockExpr;
ScalarOpExpression (const Expression<A> & _a,
const typename FieldType<A>::type & _lambda)
: a(_a), lambda(_lambda) {}
BlockExpr operator[] (int i) const {
return lambda OP a[i];
}
int N() const { return a.N(); };
private:
Expression<A> a;
const field_type lambda;
};
// Scalar op FieldVector<K,1>
template <class K>
K operator OP (const K & lambda,
const Expression< ConstRef< FieldVector<K,1> > > & a)
{
return lambda OP a[0];
}
// Scalar op Vector
template <class A>
Expression< ScalarOpExpression<ConstRef<A> > >
operator OP (const typename FieldType<A>::type & lambda, const Vector<A> & a)
{
ConstRef<A> ra(a);
ScalarOpExpression< ConstRef<A> > ex(ra, lambda);
return Expression< ScalarOpExpression<ConstRef<A> > >(ex);
}
// Scalar op Expression
template <class A>
Expression< ScalarOpExpression<A> >
operator OP (const typename FieldType<A>::type & lambda, const Expression<A> & a)
{
ScalarOpExpression<A> ex(a, lambda);
return Expression< ScalarOpExpression<A> >(ex);
}
// TypeTraits
template <class Ex>
struct BlockExpression< ExprTmpl::ScalarOpExpression<Ex> >
{
typedef
typename SelectType<
isEndOfExpressionRecusion< typename BlockType<Ex>::type >::value,
typename FieldType<Ex>::type,
ExprTmpl::Expression<
ExprTmpl::ScalarOpExpression<typename ExpressionImp<
typename BlockExpression<
typename ExpressionImp<Ex>::type>::type>::type > >
>::Type type;
};
template <class Ex>
struct ExpressionImp< ExprTmpl::ScalarOpExpression<Ex> >
{
typedef ExprTmpl::ScalarOpExpression< Ex > type;
};
} // namespace ExprTmpl
template <class A>
struct FieldType< ExprTmpl::ScalarOpExpression<A> >
{
typedef typename FieldType<A>::type type;
};
template <class A>
struct BlockType< ExprTmpl::ScalarOpExpression<A> >
{
typedef typename BlockType<A>::type type;
};
#undef ScalarOpExpression
#endif
#undef OP
dune/common/mpicollectivecommunication.hh
+ 0
− 56
View file @ f106bb28
......@@ -13,7 +13,6 @@
#include <algorithm>
#include <functional>
#include "deprecated.hh"
#include "exceptions.hh"
#include "collectivecommunication.hh"
#include "binaryfunctions.hh"
......@@ -27,61 +26,6 @@
namespace Dune
{
//=======================================================
// use singleton pattern and template specialization to
// generate MPI data types
//=======================================================
// any type is interpreted as contiguous piece of memory
// i.e. only value types are allowed !
template<typename T>
class Generic_MPI_Datatype
{
public:
static MPI_Datatype get() DUNE_DEPRECATED
{
if (!type)
{
type = shared_ptr<MPI_Datatype>(new MPI_Datatype);
MPI_Type_contiguous(sizeof(T),MPI_BYTE,type.get());
MPI_Type_commit(type.get());
}
return *type;
}
private:
Generic_MPI_Datatype () {}
Generic_MPI_Datatype (const Generic_MPI_Datatype& ) {}
static shared_ptr<MPI_Datatype> type;
};
template<typename T>
shared_ptr<MPI_Datatype> Generic_MPI_Datatype<T>::type = shared_ptr<MPI_Datatype>(static_cast<MPI_Datatype*>(0));
// A Macro for defining traits for the primitive data types
#define ComposeMPITraits(p,m) \
template<> \
class Generic_MPI_Datatype<p>{ \
public: \
static inline MPI_Datatype get() DUNE_DEPRECATED { \
return m; \
} \
}
ComposeMPITraits(char, MPI_CHAR);
ComposeMPITraits(unsigned char,MPI_UNSIGNED_CHAR);
ComposeMPITraits(short,MPI_SHORT);
ComposeMPITraits(unsigned short,MPI_UNSIGNED_SHORT);
ComposeMPITraits(int,MPI_INT);
ComposeMPITraits(unsigned int,MPI_UNSIGNED);
ComposeMPITraits(long,MPI_LONG);
ComposeMPITraits(unsigned long,MPI_UNSIGNED_LONG);
ComposeMPITraits(float,MPI_FLOAT);
ComposeMPITraits(double,MPI_DOUBLE);
ComposeMPITraits(long double,MPI_LONG_DOUBLE);
#undef ComposeMPITraits
//=======================================================
// use singleton pattern and template specialization to
// generate MPI operations
......
dune/common/parallel/communicator.hh
+ 11
− 4
View file @ f106bb28
......@@ -1387,18 +1387,25 @@ namespace Dune
typedef typename CommPolicy<Data>::IndexedType Type;
Type *sendBuffer, *recvBuffer;
size_t sendBufferSize, recvBufferSize;
size_t sendBufferSize;
#ifndef NDEBUG
size_t recvBufferSize;
#endif
if(FORWARD) {
sendBuffer = reinterpret_cast<Type*>(buffers_[0]);
sendBufferSize = bufferSize_[0];
recvBuffer = reinterpret_cast<Type*>(buffers_[1]);
#ifndef NDEBUG
recvBufferSize = bufferSize_[1];
#endif
}else{
sendBuffer = reinterpret_cast<Type*>(buffers_[1]);
sendBufferSize = bufferSize_[1];
recvBuffer = reinterpret_cast<Type*>(buffers_[0]);
#ifndef NDEBUG
recvBufferSize = bufferSize_[0];
#endif
}
typedef typename CommPolicy<Data>::IndexedTypeFlag Flag;
......@@ -1451,7 +1458,7 @@ namespace Dune
// Wait for completion of receive and immediately start scatter
i=0;
int success = 1;
//int success = 1;
int finished = MPI_UNDEFINED;
MPI_Status status; //[messageInformation_.size()];
//MPI_Waitall(messageInformation_.size(), recvRequests, status);
......@@ -1472,7 +1479,7 @@ namespace Dune
MessageScatterer<Data,GatherScatter,FORWARD,Flag>() (interfaces_, dest, recvBuffer+info.start_, proc);
}else{
std::cerr<<rank<<": MPI_Error occurred while receiving message from "<<processMap[finished]<<std::endl;
success=0;
//success=0;
}
}
......@@ -1482,7 +1489,7 @@ namespace Dune
for(i=0; i< messageInformation_.size(); i++)
if(MPI_SUCCESS!=MPI_Wait(sendRequests+i, &recvStatus)) {
std::cerr<<rank<<": MPI_Error occurred while sending message to "<<processMap[finished]<<std::endl;
success=0;
//success=0;
}
/*
int globalSuccess;
......
dune/common/parallel/indicessyncer.hh
+ 7
− 8
View file @ f106bb28
......@@ -515,7 +515,6 @@ namespace Dune
RemoteIndexIterator riEnd = remote->second.first->end();
RemoteIndexIterator rIndex = remote->second.first->begin();
GlobalIndexIterator gIndex = global->second.begin();
GlobalIndexIterator gEnd = global->second.end();
IndexIterator index = indexSet.begin();
assert(rIndex==riEnd || gIndex != global->second.end());
......@@ -808,8 +807,6 @@ namespace Dune
}
// Exchange indices with each neighbour
const RemoteIterator rend = remoteIndices_.end();
calculateMessageSizes();
// Allocate the buffers
......@@ -925,11 +922,9 @@ namespace Dune
for(Iterator iterators = iteratorsMap_.begin(); iteratorsEnd != iterators; ++iterators)
{
std::pair<GlobalIndex,Attribute> p;
bool old, valid=iterators->second.isNotAtEnd();
if(valid)
if (iterators->second.isNotAtEnd())
{
p =iterators->second.globalIndexPair();
old=iterators->second.isOld();
p = iterators->second.globalIndexPair();
}
if(iterators->second.isNotAtEnd() && iterators->second.isOld()
......@@ -1101,7 +1096,9 @@ namespace Dune
// remote index list
SLList<std::pair<int,Attribute> > sourceAttributeList;
sourceAttributeList.push_back(std::make_pair(source,Attribute(sourceAttribute)));
bool foundSelf=false;
#ifndef NDEBUG
bool foundSelf = false;
#endif
Attribute myAttribute=Attribute();
// Unpack the remote indices
......@@ -1116,7 +1113,9 @@ namespace Dune
remoteIndices_.communicator());
if(process==rank_) {
#ifndef NDEBUG
foundSelf=true;
#endif
myAttribute=Attribute(attribute);
// Now we know the local attribute of the global index
//Only add the index if it is unknown.
......
dune/common/test/.gitignore
+ 2
− 3
View file @ f106bb28
......@@ -5,12 +5,12 @@ Makefile.in
semantic.cache
dynvectortest
fvectortest
mpicollcomm
mpicollectivecommunication
lrutest
test-stack
arraylisttest
shared_ptrtest
float_cmp
testfloatcmp
bitsetvectortest
iteratorfacadetest
sllisttest
......@@ -19,7 +19,6 @@ tupleutilitytest
enumsettest
fmatrixtest
dynmatrixtest
polyallocator
poolallocatortest
*.gcda
*.gcno
......
dune/common/test/CMakeLists.txt
+ 3
− 3
View file @ f106bb28
......@@ -14,7 +14,6 @@ set(TESTS
dynvectortest
enumsettest
fassigntest
float_cmp
fmatrixtest
fvectortest
gcdlcmtest
......@@ -40,6 +39,7 @@ set(TESTS
testfassign3
testfassign4
testfconstruct
testfloatcmp
tuplestest_config
tuplestest_dune
tuplestest_tr1
......@@ -96,8 +96,8 @@ add_executable("fassigntest" fassigntest.cc)
target_link_libraries("fassigntest" "dunecommon")
add_executable("float_cmp" float_cmp.cc)
target_link_libraries("float_cmp" "dunecommon")
add_executable("testfloatcmp" testfloatcmp.cc)
target_link_libraries("testfloatcmp" "dunecommon")
# we provide an empty fortran file to force the linker
# to link to the fortran libraries (needed for static linking)
......
dune/common/test/Makefile.am
+ 8
− 8
View file @ f106bb28
......@@ -13,14 +13,13 @@ TESTPROGS = \
dynvectortest \
enumsettest \
fassigntest \
float_cmp \
fmatrixtest \
fvectortest \
gcdlcmtest \
iteratorfacadetest \
iteratorfacadetest2 \
lrutest \
mpicollcomm \
mpicollectivecommunication \
mpiguardtest \
mpihelpertest \
mpihelpertest2 \
......@@ -45,6 +44,7 @@ TESTPROGS = \
testfassign_fail5 \
testfassign_fail6 \
testfconstruct \
testfloatcmp \
tuplestest_dune \
tuplestest_std \
tuplestest_tr1 \
......@@ -154,7 +154,7 @@ dynmatrixtest_SOURCES = dynmatrixtest.cc
dynvectortest_SOURCES = dynvectortest.cc
fmatrixtest_SOURCES = fmatrixtest.cc
fmatrixtest_LDADD = $(LAPACK_LIBS) $(LDADD)
fmatrixtest_LDADD = $(LAPACK_LIBS) $(LDADD) $(BLAS_LIBS) $(LIBS) $(FLIBS)
fvectortest_SOURCES = fvectortest.cc
......@@ -182,10 +182,10 @@ mpihelpertest2_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS) -DMPIHELPER_PREINITI
mpihelpertest2_LDADD = $(DUNEMPILIBS) $(LDADD)
mpihelpertest2_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
mpicollcomm_SOURCES = mpicollectivecommunication.cc
mpicollcomm_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
mpicollcomm_LDADD = $(DUNEMPILIBS) $(LDADD)
mpicollcomm_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
mpicollectivecommunication_SOURCES = mpicollectivecommunication.cc
mpicollectivecommunication_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
mpicollectivecommunication_LDADD = $(DUNEMPILIBS) $(LDADD)
mpicollectivecommunication_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
mpiguardtest_SOURCES = mpiguardtest.cc
mpiguardtest_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
......@@ -239,7 +239,7 @@ conversiontest_SOURCES = conversiontest.cc
sourcescheck_NOSOURCES = exprtmpl.cc timing.cc
float_cmp_SOURCES = float_cmp.cc
testfloatcmp_SOURCES = testfloatcmp.cc
genericiterator_compile_fail_SOURCES = genericiterator_compile_fail.cc
......
dune/common/test/bitsetvectortest.cc
+ 2
− 0
View file @ f106bb28
......@@ -172,9 +172,11 @@ void doTest() {
testConstContainer(cbbf);
// iterator interface
#ifndef NDEBUG
ConstReferenceOp<BBF> cop;
assert(testIterator(bbf, cop) == 0);
assert(testIterator(cbbf, cop) == 0);
#endif
}
int main()
......
dune/common/test/deprtuplestest.cc
+ 5
− 17
View file @ f106bb28
......@@ -14,28 +14,16 @@
using namespace Dune;
template<int i, int j>
struct Same
{
enum { value = false};
};
template<int i>
struct Same<i,i>
{
enum { value = true};
};
template<class T>
void test(T& tuple)
{
float f;
float f DUNE_UNUSED;
f = Element<0>::get(tuple);
int i;
int i DUNE_UNUSED;
i = Element<1>::get(tuple);
double d;
double d DUNE_UNUSED;
d = Element<2>::get(tuple);
char c;
char c DUNE_UNUSED;
c = Element<3>::get(tuple);
std::string s;
s = Element<4>::get(tuple);
......@@ -236,7 +224,7 @@ int tuple_tr1_test()
// get the second element
tuple_element<1,tuple<int,double> >::type d;
tuple_element<1,tuple<int,double> >::type d DUNE_UNUSED;
d=get<1>(t);
get<0>(t)=16;
......
dune/common/test/dynmatrixtest.cc
+ 5
− 5
View file @ f106bb28
......@@ -204,8 +204,8 @@ void test_matrix()
(*it) *= 2;
}
// reverse iterator vector
it = v.rbegin();
end = v.rend();
it = v.beforeEnd();
end = v.beforeBegin();
for (; it!=end; --it)
(*it) /= 2;
// find vector
......@@ -299,20 +299,20 @@ void test_matrix()
for(size_type i=0; i<A.N(); ++i)
for(size_type j=0; j<A.M(); ++j)
A[i][j] = i;
const DynamicMatrix<K>& Aref = A;
const DynamicMatrix<K>& Aref DUNE_UNUSED = A;
DynamicMatrix<K> B(n+1,n+1);
for(size_type i=0; i<B.N(); ++i)
for(size_type j=0; j<B.M(); ++j)
B[i][j] = i;
const DynamicMatrix<K>& Bref = B;
const DynamicMatrix<K>& Bref DUNE_UNUSED = B;
DynamicMatrix<K> C(n,n);
for(size_type i=0; i<C.N(); ++i)
for(size_type j=0; j<C.M(); ++j)
C[i][j] = i;
const DynamicMatrix<K>& Cref = C;
const DynamicMatrix<K>& Cref DUNE_UNUSED = C;
#if 0
DynamicMatrix<K> AB = Aref.rightmultiplyany(B);
......
dune/common/test/dynvectortest.cc
+ 1
− 1
View file @ f106bb28
......@@ -15,7 +15,7 @@ void dynamicVectorTest(int d) {
DynamicVector<ct> v(d,1);
DynamicVector<ct> w(d,2);
DynamicVector<ct> z(d,2);
bool b;
bool b DUNE_UNUSED;
// Test whether the norm methods compile
(w+v).two_norm();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment