Preliminary support for both the old and the new global interpolator API.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGHInterp/trunk@33 1c20744c-e24a-42ec-9533-f5004cb800e5

1 files changed, 25 insertions, 14 deletions

diff --git a/src/pughInterpGH.h b/src/pughInterpGH.h
index 23dc6ef..543d1d5 100644
--- a/src/pughInterpGH.h
+++ b/src/pughInterpGH.h
@@ -3,28 +3,33 @@
    @date      Sun Jul 04 1999
    @author    Thomas Radke
    @desc
-              Definition of GH extensions of thorn PUGHInterp and
-              declaration of function prototypes
+              Definition of GH extensions structure for thorn PUGHInterp
+              and declaration of function prototypes.
    @enddesc
-   @history
-   @endhistory
+   @version   $Header$
 @@*/
 
+#ifndef _PUGHINTERP_PUGHINTERP_H_
+#define _PUGHINTERP_PUGHINTERP_H_ 1
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
 typedef struct
 {
-  int *send_count;             /* number of elements to be sent */
-  int *send_displ;             /* offset of each element to be sent */
-  int *recv_count;             /* number of elements to be received */
-  int *recv_displ;             /* offset of each element to be received */
+  int *sendcnt;             /* number of elements to be sent */
+  int *senddispl;           /* offset of each element to be sent */
+  int *recvcnt;             /* number of elements to be received */
+  int *recvdispl;           /* offset of each element to be received */
 
-  CCTK_INT *num_points_to;     /* number of coordinate points to be sent */
-  CCTK_INT *num_points_from;   /* number of coordinate points to be received */
+  CCTK_INT *N_points_to;    /* number of coordinate points to be sent */
+  CCTK_INT *N_points_from;  /* number of coordinate points to be received */
 
-  int *whichproc;              /* which processor does point i belong to */
-  int *indices;                /* indices to sort from processor-sorted into
-                                  point-sorted order */
-} pughInterpGH;
+  int *whichproc;           /* which processor does point i belong to */
+  int *indices;             /* indices to sort from processor-sorted into */
+} pughInterpGH;             /* point-sorted order */
 
 
 /* prototypes of interpolation operators to be registered */
@@ -53,3 +58,9 @@ int PUGHInterp_Interpolate (int order,
                             const void *const in_arrays[ /* num_arrays */ ],
                             const int out_types[ /* num_arrays */ ],
                             void *const out_arrays[ /* num_arrays */ ]);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif  /* _PUGHINTERP_PUGHINTERP_H_ */