Add the ability to set *both* the old-style (CCTK_REAL)

*and* new-style (CCTK_INT) mask simultaneously -- Frank Loeffler
asked for this, since Whiskey needs it (at least until all of
Cactus is converted to the new style...)


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

1 files changed, 7 insertions, 16 deletions

diff --git a/src/driver/driver.hh b/src/driver/driver.hh
index 5a45278..4511208 100644
--- a/src/driver/driver.hh
+++ b/src/driver/driver.hh
@@ -62,17 +62,6 @@ enum	horizon_file_format
 	horizon_file_format__HDF5 // no comma
 	};
 
-//
-// this enum holds the decoded  mask_type  parameter, i.e. it specifies
-// what type of mask grid function to use (if we're going to set a mask
-// at all)
-//
-enum	mask_type
-	{
-	mask_type__old_style,
-	mask_type__new_style // no comma
-	};
-
 //******************************************************************************
 
 //
@@ -176,17 +165,19 @@ struct	mask_info
 	bool do_mask;
 	const fp* radius_multiplier;	// --> array [hn] which we do *not* own
 	const fp* radius_offset;	// ditto
-	enum mask_type mask_type;
-	const char* mask_gridfn_name;
-	int mask_gridfn_varindex;
+	bool set_old_style_mask, set_new_style_mask;
 	struct	old_style_mask_info
 		{
-		CCTK_REAL* mask_gridfn_data;
+		const char* mask_gridfn_name;
+		int         mask_gridfn_varindex;
+		CCTK_REAL*  mask_gridfn_data;
 		CCTK_REAL inside_value, outside_value;
 		} old_style_mask_info;
 	struct	new_style_mask_info
 		{
-		CCTK_INT* mask_gridfn_data;
+		const char* mask_gridfn_name;
+		int         mask_gridfn_varindex;
+		CCTK_INT*   mask_gridfn_data;
 		CCTK_INT bitfield_mask, inside_value, outside_value;
 		} new_style_mask_info;
 	};