Make "Erik" branch the default trunk for AHFinderDirect.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1526 f88db872-0e4f-0410-b76b-b9085cfa78c5

1 files changed, 20 insertions, 61 deletions

diff --git a/README b/README
index 4dc8325..1093194 100644
--- a/README
+++ b/README
@@ -34,13 +34,10 @@ take to port this thorn to a non-Cactus numerical relativity code.
 
 See below in this file for notes on compiling this thorn.
 
-See the "Visualization" section in the thorn guide for some notes
-on visualizing AHFinderDirect horizons.
-
 
 Publications
 ============
-The algorithms used in this thorn are described in the paper
+The algorithms used in this thorn are described in the papers
 @article{
 	Thornburg2003:AH-finding,
 	author = "Jonathan Thornburg",
@@ -55,7 +52,7 @@ The algorithms used in this thorn are described in the paper
 	eprint = "gr-qc/0306056",
 	note   = "gr-qc/0306056",
 	}
-and to a lesser extent in the paper
+and
 @article{
 	Thornburg-1996-horizon-finding,
 	author = "Jonathan Thornburg",
@@ -66,14 +63,14 @@ and to a lesser extent in the paper
 	year = 1996, month = "October 15",
 	eprint = "gr-qc/9508014",
 	}
-As a courtesy, I ask that both these papers be cited in any published
-research which uses this thorn, or which uses code from this thorn.
+As a courtesy, I ask that these papers be cited in any published research
+which uses this thorn, or which uses code from this thorn.
 
 
 Copyright
 =========
 
-This thorn is copyright (C) 2001-2005
+This thorn is copyright (C) 2001-2004
 by Jonathan Thornburg <jthorn@aei.mpg.de>.
 
 This thorn is free software; you can redistribute it and/or modify
@@ -123,37 +120,26 @@ Timothy A. Davis, and is subect to the UMFPACK License:
 Other Software Required
 =======================
 
-This thorn inherits from a number of other thorns (strictly speaking,
-implementations):
-
-Implementation		Typically provided by Thorn
---------------		---------------------------
-Grid			CactusBase/CartGrid3d
-IO			CactusBase/IOUtil
-ADMBase			CactusEinstein/ADMBase
-StaticConformal		CactusEinstein/StaticConformal
-SpaceMask		CactusEinstein/SpaceMask
-SphericalSurface	AEIThorns/SphericalSurface
-
-You can get CactusBase and CactusEinstein thorns from the same place
-you got Cactus itself.  You can get AEIThorns thorns by anonymous CVS
-checkout:
-  cvs -d cvs_anon@cvs.aei.mpg.de:/numrelcvs checkout AEIThorns/SphericalSurface
+This thorn inherits from Grid, ADMBase, StaticConformal, SpaceMask, IO
+(all in the CactusBase or CactusEinstein arrangements), and
+SphericalSurface (in the AEIThorns arrangement; you can get AEIThorns
+by anonymous CVS checkout from cvs_anon@cvs.aei.mpg.de:/numrelcvs, CVS
+path AEIThorns/SphericalSurface).
 
 By default this thorn uses various Cactus APIs which are supplied by
 other thorns:
 * This thorn uses CCTK_InterpGridArrays() for interpolating grid arrays.
-  This is supplied by a driver-specific global interpolation thorn,
-  such as PUGHInterp or CarpetInterp.
+  This is supplied by a driver-specific thorn, such as PUGHInterp or
+  CarpetInterp.
 * This thorn uses CCTK_ReduceLocArrayToArray1D() for interprocessor
   communication in the multiprocessor Newton solver.
 	[see src/driver/README.parallel for details]
-  This is supplied by a driver-specific thorn global reduction thorn,
-  such as PUGHReduce or CarpetReduce.
-* This thorn uses CCTK_InterpLocalUniform() for (processor-local)
-  interpatch and surface interpolation, and it needs various interpolation
-  options which at present are (only) supported by the
-  AEIThorns/AEILocalInterp local interpolator.
+  This is supplied by a driver-specific thorn; at present PUGHReduce
+  it this for the PUGH driver.
+* This thorn uses CCTK_InterpLocalUniform() for interpatch and surface
+  interpolation, and it needs various interpolation options which at
+  present are (only) supported by the AEIThorns/AEILocalInterp local
+  interpolator.
 
 This thorn is written in C++, so you'll need a C++ compiler -- in fact
 a fairly modern one -- to compile this thorn.  See the "Compilation Notes"
@@ -191,7 +177,7 @@ In particular:
   form.)
 * <assert.h> is used fairly heavily for sanity checks.
 * To avoid various portability problems, none of the C++ standard
-  template library (STL) is used. :(
+  template library (STL) is used.
 
 
 Compiler Notes
@@ -208,7 +194,6 @@ x86
 * g++ (GCC) 3.2 for x86
 * g++ (GCC) 3.2.2 for x86
 * g++ (GCC) 3.3 for x86
-* g++ (GCC) 3.3.5 (propolice)
 * Intel(R) C++ Compiler for 32-bit applications, Version 5.0.1   Build 010730D0
 * Intel C++ Compiler for Linux, version 6.0
 * Intel(R) C++ Compiler for 32-bit applications, Version 7.0   Build 20021021Z
@@ -216,37 +201,11 @@ x86
   with
     LIBS="crypt F90 CEPCF90 intrins mkl mkl_lapack guide"
     LIBDIRS=/usr/local/intel/mkl/lib/32
-* Intel(R) C++ Compiler for 32-bit applications, Version 8.0   Build 20031231Z Package ID: l_cc_pc_8.0.058
-Intel(R) C++ Compiler for 32-bit applications, Version 8.0   Build 20040716Z Package ID: l_cc_pc_8.0.066_pe070.1
 * Portland Group pgCC 3.3-2
   On platinum.ncsa.uiuc.edu, Denis Pollney reports success configuring Cactus
   with
     LAPACK=yes
     LAPACK_DIR=/usr/local/pgi/linux86
-Note that the compilers
-* Intel(R) C++ Compiler for 32-bit applications, Version 8.1    Build 20040921Z Package ID: l_cc_pc_8.1.022
-* Intel(R) C++ Compiler for 32-bit applications, Version 8.1    Build 20041019Z Package ID: l_cc_pu_8.1.024
-* Intel(R) C++ Compiler for 32-bit applications, Version 9.0    Build 20050430Z Package ID: l_cc_p_9.0.021
-  do NOT work -- they have wierd bugs with anonymous namespaces when
-  optimizing, which show up as error messages like this:
-  > /home/swhite/aei/Cactus-Cott/Cactus/configs/new/lib/libAHFinderDirect.a(mask.cc.o)(.text+0x264e): 
-  > In function `set_mask_gridfn_to_inside_and_buffer_values':
-  > /home/swhite/aei/Cactus-Cott/Cactus/configs/new/build/AHFinderDirect/driver/mask.cc:629: 
-  > multiple definition of `__IPONAME0'
-  > /home/swhite/aei/Cactus-Cott/Cactus/configs/new/lib/libAHFinderDirect.a(find_horizons.cc.o)(.text+0x11f6):/home/swhite/aei/Cactus-Cott/Cactus/configs/new/build/AHFinderDirect/driver/find_horizons.cc:338: 
-  > first defined here
-  > ld: Warning: size of symbol `__IPONAME0' changed from 498 in 
-  > /home/swhite/aei/Cactus-Cott/Cactus/configs/new/lib/libAHFinderDirect.a(find_horizons.cc.o) 
-  > to 670 in 
-  > /home/swhite/aei/Cactus-Cott/Cactus/configs/new/lib/libAHFinderDirect.a(find_horizons.cc.o)
-
-  You can work around this compiler bug by switching compilers, or by
-  disabling interprocedural optimization when compiling AHFinderDirect.
-
-  See also the Intel Forum discussion "multiple definitions of __IPONAME0"
-  http://softwareforums.intel.com/ids/board/message?board.id=16&message.id=3504
-
-  
 
 ia64, a.k.a. Itanium
 ====================
@@ -285,7 +244,7 @@ IBM Power4 (AIX)
 
 Please let me (Jonathan) know of any other compilers which are ok.
 
-This thorn compiles, but does *NOT* work, using the following
+This thorn compiles, but does *NOT* work, using the folloing
 systems/compilers; the cure is to switch to a newer compiler version:
 x86
 ===