Commit d31e2373 authored by David Werner's avatar David Werner
Browse files

Patches is a directory to put in patches to DUNE and components. Please

document your patches you put in.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@5164 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent c0aad04d
On purpose of this patch directory
----------------------------------
DuMuX is based on a certain release of DUNE
and some of its components or models can make use of
external libraries and modules.
Sometimes software like a compiler or a standard library
changes, so it can be useful to adapt these releases in a certain way
that components will seamless work together.
It can also be necessary to fix serious bugs in them, but it makes
not always sense to use a developer version or a more recent release if available.
For fixing such things this directory is made. Files created here contain patches
against some DUNE release or some other component. Their application should be documented here too.
--------------------------------------
|Compilation problem with 'dune-istl'|
--------------------------------------
If you use DUNE 2.0 stable release use
dune-istl-2.0.patch
For completeness we contain also a patch against a trunk version of dune-istl
which an average DUMUX developer will not need, it could be useful in further releases.
But hopefully it will be obsoleted.
dune-istl-dune-trunk-r6271.patch
Application:
cd $PATH_TO_DUNE_ISTL_2.0
patch -p1 < $PATH_TO_THIS_PATCHES_FOLDER/dune-istl-2.0.patch
cd $PATH_TO_DUNE_ISTL_TRUNK
patch -p1 < $PATH_TO_THE_DOWNLOADS_FOLDER/dune-istl-dune-trunk-r6271.patch
The checkout-dumux script applies dune-istl-2.0.patch automatically, if patch application is not switched off.
--- dune-istl-2.0/dune/istl/remoteindices.hh.orig 2010-11-26 16:18:39.703876061 +0100
+++ dune-istl-2.0/dune/istl/remoteindices.hh 2010-11-26 16:20:53.242998985 +0100
@@ -1412,20 +1412,14 @@
}
template<typename T, typename A>
- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*,
- SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
+ inline typename RemoteIndices<T,A>::const_iterator
RemoteIndices<T,A>::begin() const
{
return remoteIndices_.begin();
}
-
+
template<typename T, typename A>
- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*,
- SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
+ inline typename RemoteIndices<T,A>::const_iterator
RemoteIndices<T,A>::end() const
{
return remoteIndices_.end();
diff --git a/dune/common/parallel/remoteindices.hh b/dune/common/parallel/remoteindices.hh
index bfb6d43..bb7b0cf 100644
--- a/dune/common/parallel/remoteindices.hh
+++ b/dune/common/parallel/remoteindices.hh
@@ -1508,30 +1508,21 @@ namespace Dune{
}
template<typename T, typename A>
- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*,
- SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
+ inline typename RemoteIndices<T,A>::const_iterator
RemoteIndices<T,A>::find(int proc) const
{
return remoteIndices_.find(proc);
}
template<typename T, typename A>
- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*,
- SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
+ inline typename RemoteIndices<T,A>::const_iterator
RemoteIndices<T,A>::begin() const
{
return remoteIndices_.begin();
}
template<typename T, typename A>
- inline typename std::map<int, std::pair<SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*,
- SLList<typename RemoteIndices<T,A>::RemoteIndex,
- typename RemoteIndices<T,A>::Allocator >*> >::const_iterator
+ inline typename RemoteIndices<T,A>::const_iterator
RemoteIndices<T,A>::end() const
{
return remoteIndices_.end();
Supports Markdown
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