redo excision mask:

* there are now 3 states (inside/buffer/outside)
* there is now a "noshrink" option
* many other changes too -- see thorn guide for details

the new excision support isn't very well tested yet :( :(


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

2 files changed, 31 insertions, 31 deletions

diff --git a/src/gr/expansion.cc b/src/gr/expansion.cc
index dd024c3..5030c0b 100644
--- a/src/gr/expansion.cc
+++ b/src/gr/expansion.cc
@@ -197,7 +197,7 @@ case geometry__local_interp_from_Cactus_grid:
 	if (status != expansion_success)
 	   then return status;				// *** ERROR RETURN ***
 	  }
-	if (active_flag && cgi.Cactus_conformal_metric)
+	if (active_flag && cgi.use_Cactus_conformal_metric)
 	   then convert_conformal_to_physical(*ps_ptr,
 					      print_msg_flag);
 	break;
@@ -300,7 +300,7 @@ if (print_msg_flag)
 //	partial_d_psi_k		# optional
 // at the nominal-grid trial horizon surface positions given by the
 // global_(x,y,z) angular gridfns in the patch system *ps_ptr.  The psi
-// interpolation is only done if the cgi.Cactus_conformal_metric flag
+// interpolation is only done if the cgi.use_Cactus_conformal_metric flag
 // is set.  Note that this function ignores the physical-vs-conformal
 // semantics of the gridfns; it just interpolates and takes derivatives
 // of the stored gridfn values.
@@ -366,7 +366,7 @@ const char* const global_local_str
 	= (gi.geometry_method == geometry__global_interp_from_Cactus_grid)
 	  ? "global"
 	  : "local";
-const bool psi_flag = cgi.Cactus_conformal_metric;
+const bool psi_flag = cgi.use_Cactus_conformal_metric;
 
 if (print_msg_flag)
    then CCTK_VInfo(CCTK_THORNSTRING,
@@ -422,19 +422,19 @@ const CCTK_INT input_array_type_codes[]
 	  };
 const void* const input_arrays[]
 	= {
-	  static_cast<const void*>(cgi.g_dd_11_data),
-	  static_cast<const void*>(cgi.g_dd_12_data),
-	  static_cast<const void*>(cgi.g_dd_13_data),
-	  static_cast<const void*>(cgi.g_dd_22_data),
-	  static_cast<const void*>(cgi.g_dd_23_data),
-	  static_cast<const void*>(cgi.g_dd_33_data),
-	  static_cast<const void*>(cgi.K_dd_11_data),
-	  static_cast<const void*>(cgi.K_dd_12_data),
-	  static_cast<const void*>(cgi.K_dd_13_data),
-	  static_cast<const void*>(cgi.K_dd_22_data),
-	  static_cast<const void*>(cgi.K_dd_23_data),
-	  static_cast<const void*>(cgi.K_dd_33_data),
-	  static_cast<const void*>(cgi.psi_data),
+	  static_cast<const void*>(cgi.g_dd_11_dataptr),
+	  static_cast<const void*>(cgi.g_dd_12_dataptr),
+	  static_cast<const void*>(cgi.g_dd_13_dataptr),
+	  static_cast<const void*>(cgi.g_dd_22_dataptr),
+	  static_cast<const void*>(cgi.g_dd_23_dataptr),
+	  static_cast<const void*>(cgi.g_dd_33_dataptr),
+	  static_cast<const void*>(cgi.K_dd_11_dataptr),
+	  static_cast<const void*>(cgi.K_dd_12_dataptr),
+	  static_cast<const void*>(cgi.K_dd_13_dataptr),
+	  static_cast<const void*>(cgi.K_dd_22_dataptr),
+	  static_cast<const void*>(cgi.K_dd_23_dataptr),
+	  static_cast<const void*>(cgi.K_dd_33_dataptr),
+	  static_cast<const void*>(cgi.psi_dataptr),
 	  };
 
 const int N_input_arrays_for_psi = 1;
diff --git a/src/gr/gr.hh b/src/gr/gr.hh
index b6720ae..bcc8702 100644
--- a/src/gr/gr.hh
+++ b/src/gr/gr.hh
@@ -75,7 +75,7 @@ struct	cactus_grid_info
 	// true ==> the Cactus g_ij are conformal values as per
 	//          CactusEinstein/StaticConformal and the  psi  gridfn
 	// false ==> the Cactus g_ij are the physical metric
-	bool Cactus_conformal_metric;
+	bool use_Cactus_conformal_metric;
 
 	// Cactus coordinate system
 	fp global_coord_origin[N_GRID_DIMS];	// global (x,y,z)
@@ -127,7 +127,7 @@ struct	cactus_grid_info
 	int K_dd_11_varindex, K_dd_12_varindex, K_dd_13_varindex,
 			      K_dd_22_varindex, K_dd_23_varindex,
 						K_dd_33_varindex;
-	int psi_varindex;		// unused if !Cactus_conformal_metric
+	int psi_varindex;	// unused if !use_Cactus_conformal_metric
 
 	//
 	// stuff for doing a local interpolation via CCTK_InterpLocalUniform()
@@ -136,19 +136,19 @@ struct	cactus_grid_info
 	//
 
 	// --> Cactus gridfn data for grid posn (0,0,0)
-	const fp* g_dd_11_data;
-	const fp* g_dd_12_data;
-	const fp* g_dd_13_data;
-	const fp* g_dd_22_data;
-	const fp* g_dd_23_data;
-	const fp* g_dd_33_data;
-	const fp* K_dd_11_data;
-	const fp* K_dd_12_data;
-	const fp* K_dd_13_data;
-	const fp* K_dd_22_data;
-	const fp* K_dd_23_data;
-	const fp* K_dd_33_data;
-	const fp* psi_data;		// NULL if !Cactus_conformal_metric
+	const fp* g_dd_11_dataptr;
+	const fp* g_dd_12_dataptr;
+	const fp* g_dd_13_dataptr;
+	const fp* g_dd_22_dataptr;
+	const fp* g_dd_23_dataptr;
+	const fp* g_dd_33_dataptr;
+	const fp* K_dd_11_dataptr;
+	const fp* K_dd_12_dataptr;
+	const fp* K_dd_13_dataptr;
+	const fp* K_dd_22_dataptr;
+	const fp* K_dd_23_dataptr;
+	const fp* K_dd_33_dataptr;
+	const fp* psi_dataptr;		// NULL if !use_Cactus_conformal_metric
 	};
 
 //