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

5 files changed, 8 insertions, 19 deletions

diff --git a/src/elliptic/Jacobian.cc b/src/elliptic/Jacobian.cc
index 8a1cfa4..facd5cb 100644
--- a/src/elliptic/Jacobian.cc
+++ b/src/elliptic/Jacobian.cc
@@ -15,6 +15,7 @@
 
 #include "util_Table.h"
 #include "cctk.h"
+#include "cctk_Arguments.h"
 
 #include "config.h"
 #include "stdc.h"
@@ -22,6 +23,7 @@
 #include "../jtutil/array.hh"
 #include "../jtutil/cpm_map.hh"
 #include "../jtutil/linear_map.hh"
+using jtutil::error_exit;
 
 #include "../patch/coords.hh"
 #include "../patch/grid.hh"
@@ -39,7 +41,6 @@
 // all the code in this file is inside this namespace
 namespace AHFinderDirect
 	  {
-using jtutil::error_exit;
 
 //******************************************************************************
 //******************************************************************************
diff --git a/src/elliptic/Jacobian.hh b/src/elliptic/Jacobian.hh
index 0dcf14b..26f913a 100644
--- a/src/elliptic/Jacobian.hh
+++ b/src/elliptic/Jacobian.hh
@@ -160,7 +160,7 @@ protected:
 	// the constructor only uses  ps  to get the size of the matrix
 	Jacobian(patch_system& ps)
 		: ps_(ps),
-		  N_rows_(ps.N_grid_points())
+		  N_rows_(ps.N_grid_points() + ps.N_additional_points())
 		{ }
 public:
 	virtual ~Jacobian() { }
diff --git a/src/elliptic/dense_Jacobian.cc b/src/elliptic/dense_Jacobian.cc
index 61e3a8e..6deaab1 100644
--- a/src/elliptic/dense_Jacobian.cc
+++ b/src/elliptic/dense_Jacobian.cc
@@ -23,6 +23,7 @@
 
 #include "util_Table.h"
 #include "cctk.h"
+#include "cctk_Arguments.h"
 
 #include "config.h"
 #include "stdc.h"
@@ -30,6 +31,7 @@
 #include "../jtutil/array.hh"
 #include "../jtutil/cpm_map.hh"
 #include "../jtutil/linear_map.hh"
+using jtutil::error_exit;
 
 #include "../patch/coords.hh"
 #include "../patch/grid.hh"
@@ -46,7 +48,6 @@
 // all the code in this file is inside this namespace
 namespace AHFinderDirect
 	  {
-using jtutil::error_exit;
 
 //******************************************************************************
 //******************************************************************************
diff --git a/src/elliptic/make.code.defn b/src/elliptic/make.code.defn
index 72552f9..8f7883d 100644
--- a/src/elliptic/make.code.defn
+++ b/src/elliptic/make.code.defn
@@ -8,17 +8,3 @@ SRCS = Jacobian.cc \
 
 # Subdirectories containing source files
 SUBDIRS =
-
-# disable automatic template instantiation on DEC Alphas cxx compiler
-ifeq ($(shell uname), OSF1)
-  ifeq ($(CXX), cxx)
-    CXXFLAGS += -nopt
-  endif
-endif
-
-# disable automagic template instantiation on SGI Irix CC compiler
-ifneq (,$(findstring IRIX,$(shell uname)))
-  ifeq ($(notdir $(CXX)), CC)
-    CXXFLAGS += -no_auto_include
-  endif
-endif
diff --git a/src/elliptic/row_sparse_Jacobian.cc b/src/elliptic/row_sparse_Jacobian.cc
index 6b1152f..46da285 100644
--- a/src/elliptic/row_sparse_Jacobian.cc
+++ b/src/elliptic/row_sparse_Jacobian.cc
@@ -43,6 +43,7 @@
 
 #include "util_Table.h"
 #include "cctk.h"
+#include "cctk_Arguments.h"
 
 #include "config.h"
 #include "stdc.h"
@@ -86,6 +87,7 @@ extern "C"
 #include "../jtutil/array.hh"
 #include "../jtutil/cpm_map.hh"
 #include "../jtutil/linear_map.hh"
+using jtutil::error_exit;
 
 #include "../patch/coords.hh"
 #include "../patch/grid.hh"
@@ -102,7 +104,6 @@ extern "C"
 // all the code in this file is inside this namespace
 namespace AHFinderDirect
 	  {
-using jtutil::error_exit;
 
 //******************************************************************************
 //******************************************************************************
@@ -443,7 +444,7 @@ int max_N_in_row = 0;
 	  {
 	for (int II = 0 ; II < N_rows_ ; ++II)
 	{
-	max_N_in_row = jtutil::max(max_N_in_row, IA_[II+1]-IA_[II]);
+        max_N_in_row = jtutil::max(max_N_in_row, IA_[II+1]-IA_[II]);
 	}
 	  }