More bugfixes and C++'ism removal.

Now it all compiles, but doesn't really talk to anything yet.
Sockets are next I guess.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IsoSurfacer/trunk@4 bfcf8e34-485d-4d46-a995-1fd6fa6fb178

1 files changed, 4 insertions, 32 deletions

diff --git a/src/IsoSurfacerGH.h b/src/IsoSurfacerGH.h
index 5e5de6b..63194a9 100644
--- a/src/IsoSurfacerGH.h
+++ b/src/IsoSurfacerGH.h
@@ -1,31 +1,6 @@
 //   The extensions to the GH structure from IsoSurfacer.
 #ifndef __IsoSurface_GH_h_
 #define __IsoSurface_GH_h_
-struct Isolevel
-{
-  float value;  
-  int	Ncolorinfo;
-  union
-  {
-    struct
-    {
-      CCTK_REAL4 transparency,
-	ForeGround_red, ForeGround_green, ForeGround_blue,
-	BackGround_red, BackGround_green, BackGround_blue;
-    }
-    colors;
-    
-    CCTK_REAL4 colorinfo[7];
-  };
-  
-  Isolevel()
-    : value(0.0)
-    , Ncolorinfo(0)
-  {
-    for(int i=0; i<7; i++)
-      colorinfo[i] = 0.7;
-  }
-};
 
 #define BIN      1
 #define ASCII    2
@@ -35,21 +10,18 @@ struct Isolevel
 #define ISOHDF5  32
 #define NONE     64
 
-typedef struct isoparms_st
+typedef struct isosurfacerGH
 {
   char       *funcName;
-  CCTK_REAL4 isolevel;
+  CCTK_REAL4 isovalue;
   short int   formats;
   short int   outfreq;
   short int   firstIteration;
   short int   resolution;
   short int   uniq_verts;
   short int   RunIsoSurfacer;
-} isoparms_st;
+} isosurfacerGH;
 
-struct isosurfacerGH
-{
-  isoparms_st isoparms;
-};
+typedef isosurfacerGH isoparms_st;
 
 #endif // __IsoSurface_GH_h_