diff options
author | knarf <knarf@cct.lsu.edu> | 2010-08-24 12:09:31 -0400 |
---|---|---|
committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:21:13 +0000 |
commit | d10c28976521941cac4ce3e490a73814e9b336fc (patch) | |
tree | 9a9c94da3518cfc2a2d2b8b31491464ee5cfbdbb | |
parent | c755d1558483ac5cbaa63c282ed7eba808787f9d (diff) | |
parent | 8586baaf7593a848c4ef074eb9eb234a70f71e17 (diff) |
merge my (?) head with _the_ remote head
-rw-r--r-- | Carpet/Carpet/README | 2 | ||||
-rw-r--r-- | Carpet/README | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Carpet/Carpet/README b/Carpet/Carpet/README index 75caae781..3d0ca4eb1 100644 --- a/Carpet/Carpet/README +++ b/Carpet/Carpet/README @@ -4,7 +4,7 @@ Maintainer(s): Erik Schnetter <schnetter@cct.lsu.edu> Licence : GPLv2+ -------------------------------------------------------------------------- -1. Purpose +1. Purpose This thorn provides a parallel AMR (adaptive mesh refinement) driver with MPI. diff --git a/Carpet/README b/Carpet/README index e81985f71..f2ee9a87e 100644 --- a/Carpet/README +++ b/Carpet/README @@ -3,6 +3,7 @@ Arrangement Author(s) : Erik Schnetter <schnetter@cct.lsu.edu> Arrangement Maintainer(s) : Erik Schnetter <schnetter@cct.lsu.edu> -------------------------------------------------------------------------- + Purpose of the arrangement: This arrangement provides a parallel AMR (adaptive mesh refinement) |