aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorallen <allen@b61c5cb5-eaca-4651-9a7a-d64986f99364>2000-04-03 21:45:12 +0000
committerallen <allen@b61c5cb5-eaca-4651-9a7a-d64986f99364>2000-04-03 21:45:12 +0000
commit3d5d36496a7f8df6d1b28c823cc739faa9c9e3fd (patch)
tree58e63914497efef396898189e43981a8d27346df /src/include
parent39c59ca314108602de8128628d5d517327418375 (diff)
Removing old files with pGFs
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@192 b61c5cb5-eaca-4651-9a7a-d64986f99364
Diffstat (limited to 'src/include')
-rw-r--r--src/include/pGF.h76
-rw-r--r--src/include/pGH.h5
-rw-r--r--src/include/pugh.h5
-rw-r--r--src/include/pughDriver.h68
-rw-r--r--src/include/pughProblem.h53
5 files changed, 1 insertions, 206 deletions
diff --git a/src/include/pGF.h b/src/include/pGF.h
deleted file mode 100644
index ab9e0d4..0000000
--- a/src/include/pGF.h
+++ /dev/null
@@ -1,76 +0,0 @@
- /*@@
- @header pGF.h
- @date Fri Feb 21 10:16:32 1997
- @author Paul Walker
- @desc
- The pugh Grid Function structure. This is the heart of
- the data storage and the like. You can't have a GF
- without a GH, so you'd better see @seefile pGH.h
- also.
- <p>
- One wonderfully new feature that a pGF has is that it contains
- both a CCTK_REAL* padddata and a CCTK_REAL* data. What is the difference?
- Well data is the base address of the fortran data set. It points
- into padddata. This allows us, if we want to, to explicitly move
- the starting point of the array to align with cache lines.
- Important on some architectures. So the deal is if we are
- in padding mode (see @seeroutine EnableGFDataStorage for more
- on that) padddata will be bigger than data, and data will point
- to an address insinde padddata and such that lnx * lny * lnz
- further down the data pointer is still in padddata. If we are
- not in padding mode, data = padddata as pointers.
- <p>
- The only place we explicitly reference padddata is when we
- create or de-allocate data. <b>All other operatoins shold
- be done on *data</a>
- @enddesc
- @version $Header$
- @@*/
-
-#ifndef _PGF_H_
-#define _PGF_H_ 1
-
-#define DATINDEX(GH,i,j,k) ((i) + GH->lnsize[0]*((j)+GH->lnsize[1]*(k)))
-/*#define DI(GH,i,j,k) ((i) + GH->lnx*((j)+GH->lny*(k)))*/
-/*#define GDATINDEX(GH,i,j,k) ((i) + GH->nx*((j)+GH->ny*(k)))*/
-
-#include "CactusTimers.h"
-
-typedef struct PGF
-{
- char *name; /* The name of the grid function */
- int gfno; /* My ID number in my GH parent. */
- int dim; /* dimension of GF */
- void *padddata; /* Storage for the data. */
- void *data; /* See the note above. */
- int buffer_sz[6]; /* Size of the face ghost zones */
- void **send_buffer; /* Storage for buffered Comm if */
- void **recv_buffer; /* we don't use derived types */
- int commflag; /* What is the comm flag set to? */
- int docomm[6]; /* Do we do comm or not? */
- int storage; /* Do we have storage or not? */
- int stagger; /* Only Vertex Centered now... */
-
- struct PGH *parentGH; /* The GH to which I belong */
- /* Note this is struct PGH whic is
- typedeffed to pGH in pGH.h, but
- that is included AFTER this so we
- need the full name for the lookahead
- structure reference thingy.
- */
-
- int varsize; /* The size of the data */
- int vtype; /* The type of the data */
-
-#ifdef MPI
- MPI_Request sreq[6], rreq[6]; /* Comm requests and statuses. */
- MPI_Status ms;
-#endif
-
- /*
- #include "pGF_Extensions.h"
- */
-
-} pGF;
-
-#endif /* _PGF_H_ */
diff --git a/src/include/pGH.h b/src/include/pGH.h
index ab2fe88..5bc3b5d 100644
--- a/src/include/pGH.h
+++ b/src/include/pGH.h
@@ -19,13 +19,11 @@ typedef struct PGH
/* pGH identifier */
void *callerid;
-
int dim; /* The dimension of the GH */
/* Size of the processor group */
int nprocs; /* Number of processors */
int myproc; /* My processor */
- /*int *nproc;*/ /* Processor topology */
int commmodel; /* Comm model is PUGH_ALLOCATEDBUFFERS */
/* or PUGH_DERIVEDTYPES. Currently unused */
@@ -36,7 +34,7 @@ typedef struct PGH
/* What time level we're on */
int timelevel;
- int *perme; /* Periodic in each direction? */
+ int *perme; /* Periodic in each direction? */
int periodic; /* Is the system periodic? */
int forceSync; /* force synchronisation of GFs with storage */
@@ -45,7 +43,6 @@ typedef struct PGH
/* Coordinate information */
CCTK_REAL dx0, dy0, dz0, dt0; /* Delta of our system */
CCTK_REAL lx0, ly0, lz0; /* Processor-Local coordinate origins */
- /* CCTK_REAL phys_time; */ /* physical time */
int GHiteration; /* iteration number on processor */
/* Indentification for a pGH */
diff --git a/src/include/pugh.h b/src/include/pugh.h
index af42aef..489ebe5 100644
--- a/src/include/pugh.h
+++ b/src/include/pugh.h
@@ -68,7 +68,6 @@
#include "pugh_constants.h"
#include "pGV.h"
-/*#include "pGF.h"*/
#include "pGH.h"
#ifdef MPI
@@ -137,8 +136,4 @@ int pugh_GetBounds(int dim,
}
#endif
-/*
-#include "pughDriver.h"
-*/
-
#endif /* defined _PUGH_H_ */
diff --git a/src/include/pughDriver.h b/src/include/pughDriver.h
deleted file mode 100644
index 28c3a92..0000000
--- a/src/include/pughDriver.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*@@
- @header pughDriver.h
- @author Paul Walker
- @date March 1997
- @desc
- This is stuff having to do with the driver, namely
- the problem and globals, as well as definitions of what
- the fort interfaces are. Also see @seefile pughProblem.h
- for what the cactus-specific stuff is. The macros FORT_ARGS
- and FORT_ARGS_PROTO passed from c routines must match
- FORT_GH_DECOMP and FORT_GHDECOMP_DECL received in fortran
- routines defined in @seefile pughFortran.h
- @enddesc
- @history
- @hauthor Gabrielle Allen
- @hdate Sep 10 @hdesc Added the GH iteration number to fortran macros
- @hauthor Gabrielle Allen @hdate 29 Sep 1998
- @hdesc Removed levfac
- @endhistory
- @version $Id$
- @@*/
-
-#ifdef 0
-extern pGHList *GHList;
-
-extern int nx0, ny0, nz0;
-extern int lb[3],ub[3],sh[3],bbox[6];
-extern int convergence;
-
-/* Timing variables */
-extern double commt[PUGH_NTIMERS];
-extern double elltime[PUGH_NTIMERS];
-
-/* How long to run */
-extern int itfirst, itlast, itout; /* Iteration runs */
-extern int itout3, itout2, itout1, itout0, itoutarr, itinfo;
-
-extern int _show_storage;
-
-/* termination flags: pe-local and global: */
-extern int cactus_terminate;
-
-/* FORT_ARGS must match FORT_ARGS_PROTO below, and FORT_GH_DECOMP,
- FORT_GHDECOMP_DECL in pughFortran.h */
-#define FORT_ARGS(xGH) xGH, \
- &(xGH->lnsize[0]),&(xGH->lnsize[1]), &(xGH->lnsize[2]),\
- lb,ub,sh,bbox, \
- &(xGH->nx),&(xGH->ny),&(xGH->nz),\
- &(xGH->cx0),&(xGH->cy0),&(xGH->cz0), \
- &(xGH->dx0),&(xGH->dy0),&(xGH->dz0),&(xGH->dt0), &(xGH->phys_time), \
- &(xGH->level), &(xGH->nprocs), &(xGH->myproc), \
- &(xGH->convlevel), &(xGH->stencil_width), &(xGH->GHiteration)
-
-/* FORT_ARGS_PROTO must match FORT_ARGS above, and FORT_GH_DECOMP,
- FORT_GHDECOMP_DECL in pughFortran.h */
-#define FORT_ARGS_PROTO pGH *, \
- int *, int *, int *, \
- int *, int *, int *, int *, \
- int *, int *, int *, \
- CCTK_REAL *, CCTK_REAL *, CCTK_REAL *, \
- CCTK_REAL *, CCTK_REAL *, CCTK_REAL *, CCTK_REAL *, CCTK_REAL *, \
- int *, int *, int *, \
- int *, int *, int *
-
-
-#include "pughProblem.h"
-
-#endif
diff --git a/src/include/pughProblem.h b/src/include/pughProblem.h
deleted file mode 100644
index 2024a09..0000000
--- a/src/include/pughProblem.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*@@
- @header pughProblem.h
- @author Paul Walker
- @date March 1997
- @desc
- This routine declares all the problem-specific globals
- and teaches the driver how to make the grid functions
- with the right names, and pass them to fortran. It
- isn't that exciting, but it's pretty damned important
- if you need to add new fields.
- @enddesc
- @version $Id$
- @@*/
-
-#ifdef 0
-#include "gfIndices.h"
-#include "pughProblemDefs.h"
-
-/* Variables that ALL codes use. */
-#define USER_VARS \
- int *_one;
-
-/* Main externals */
-extern int *_one;
-
-/* Historical: Two macros for the same thing. PW. */
-#define PASS_FORT_FIELDS(xGH) \
- PASS_FORT_FIELDS_SUBSET(xGH)
-
-
-/* If you add items to PASS_FORT_FIELDS make sure */
-/* you add the right type at the right position */
-/* in PROTO_FORT_FIELDS */
-#define PROTO_FORT_FIELDS \
- PROTO_FORT_FIELDS_SUBSET
-
-
-#ifdef WIN32
-#define FMODIFIER __stdcall
-#else
-#define FMODIFIER
-#endif
-
-#ifdef THORN_CHECKPOINT
- /* Is it possible to ifdef this? Or perhaps to rfr it? */
-#define f_recover FORTRAN_NAME(recover_,RECOVER,recover)
-void FMODIFIER f_recover(FORT_ARGS_PROTO,PROTO_FORT_FIELDS);
-#endif
-
-#include "cactus_constants.h"
-
-#endif
-