OK,

it builds... Isn't carefully tested, but at least it builds.
I got rid of an awful lot of extraneous crap and in particular
*all* of the static global variables.  We can add crap
back when its clear that it is a necessity.

For some reason CCTK_INT8 was an unrecognized type in the
build.  You might want to add that back to the Socket.c
if its clear why this type was not recognized.  This only
affects the subroutine IsoWriteDataToClients()


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

1 files changed, 18 insertions, 6 deletions

diff --git a/src/IsoSurfacerGH.h b/src/IsoSurfacerGH.h
index 6612e6c..ac299e7 100644
--- a/src/IsoSurfacerGH.h
+++ b/src/IsoSurfacerGH.h
@@ -2,27 +2,39 @@
 #ifndef __IsoSurface_GH_h_
 #define __IsoSurface_GH_h_
 
+#include "cctk.h"
+
 #define BIN      1
 #define ASCII    2
 #define UCD      4
 #define VRML     8
 #define SOCK     16
 #define ISOHDF5  32
-#define NONE     64
+#define NONE     64 /* sounds kooky, but its for forcing the 
+		       surfacer to run without output for
+		       benchmarking purposes */
+
+typedef struct polypatch
+{
+  CCTK_REAL4    *verts;
+  CCTK_INT4      nverts;
+  CCTK_INT4     *polys;
+  CCTK_INT4      npolys;
+} polypatch;
 
 typedef struct isosurfacerGH
 {
-  char       *funcName;
-  CCTK_REAL4 isovalue;
+  char       *funcName; /* will be an array of names & vals later */
+  CCTK_REAL   isovalue; /* must be same as GF data for efficiency */
+  CCTK_REAL   minval,maxval; /* range of this grid function */
   short int   formats;
   short int   outfreq;
   short int   firstIteration;
-  short int   resolution;
-  short int   uniq_verts;
   short int   RunIsoSurfacer;
+  polypatch   perprocessor,totals; // un-collected geometry for this node
 } isosurfacerGH;
 
-typedef isosurfacerGH isoparms_st;
+// typedef isosurfacerGH isoparms_st;
 
 typedef enum {Byte=0,Int8=0,Int16=1,Int32=2,Int64=3,
               Float32=4,Float64=5,