Applied patch from Erik Schnetter: rename PUGHi_GenerateTopology to

                                   PUGH_GenerateTopology an export it
                                   to other thorns.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@481 b61c5cb5-eaca-4651-9a7a-d64986f99364

4 files changed, 15 insertions, 15 deletions

diff --git a/src/Registration.c b/src/Registration.c
index 549eff7..b975fb8 100644
--- a/src/Registration.c
+++ b/src/Registration.c
@@ -64,11 +64,11 @@ static int LogicalToPhysicalUnavailable(void *table, int num);
  *********************  Local Data  *********************************
  ********************************************************************/
 
-int (*PUGHi_GenerateTopology) (int dim, 
-                               int total_procs, 
-                               const int *nsize, 
-                               const int *nghostzones, 
-                               int *nprocs) = GenerateTopologyUnavailable;
+int (*PUGH_GenerateTopology) (int dim, 
+                              int total_procs, 
+                              const int *nsize, 
+                              const int *nghostzones, 
+                              int *nprocs) = GenerateTopologyUnavailable;
 
 void *(*PUGHi_CreateP2LTranslation) (int dim, 
                                      int *nprocs, 
@@ -109,7 +109,7 @@ int PUGH_RegisterGenerateTopology(int (*GenerateTopology) (int dim,
   
   if (CCTK_Equals(processor_topology, topologyname))
   {
-    if (PUGHi_GenerateTopology != GenerateTopologyUnavailable)
+    if (PUGH_GenerateTopology != GenerateTopologyUnavailable)
     {
       CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                  "Attempted to register topology generator %s more than once!", 
@@ -117,7 +117,7 @@ int PUGH_RegisterGenerateTopology(int (*GenerateTopology) (int dim,
     }
     else
     {
-      PUGHi_GenerateTopology = GenerateTopology;
+      PUGH_GenerateTopology = GenerateTopology;
       CCTK_VInfo(CCTK_THORNSTRING, "Using topology generator: %s", 
                  topologyname);
       
diff --git a/src/SetupPGV.c b/src/SetupPGV.c
index 149eaa0..2375f2d 100644
--- a/src/SetupPGV.c
+++ b/src/SetupPGV.c
@@ -238,8 +238,8 @@ pConnectivity *PUGH_SetupConnectivity(int dim,
       this->neighbours[i] = this->neighbours[0]+(2*dim*i);
     }
 
-    PUGHi_GenerateTopology(dim, total_procs, nsize, nghostzones, 
-                             this->nprocs);
+    PUGH_GenerateTopology(dim, total_procs, nsize, nghostzones, 
+                          this->nprocs);
 
     PUGH_GenerateNeighbours(dim, total_procs, this->nprocs, this->neighbours,
                             this->perme);
diff --git a/src/include/pugh.h b/src/include/pugh.h
index 222b2f6..16bdd70 100644
--- a/src/include/pugh.h
+++ b/src/include/pugh.h
@@ -178,6 +178,12 @@ const int *PUGH_Topology(const cGH *GH, int dim);
 
 int PUGH_SetTopology (int dim, const int topology[]);
 
+extern int (*PUGH_GenerateTopology)(int dim, 
+                                    int total_procs, 
+                                    const int *nsize,
+                                    const int *nghostzones, 
+                                    int *nprocs);
+
 #ifdef CCTK_MPI
 MPI_Datatype PUGH_MPIDataType (const pGH *pughGH, int cctk_type);
 #endif
diff --git a/src/include/pughi.h b/src/include/pughi.h
index 8b4083c..a37b85a 100644
--- a/src/include/pughi.h
+++ b/src/include/pughi.h
@@ -20,12 +20,6 @@ extern int (*PUGHi_DestroyP2LTranslation) (void *table);
 extern int (*PUGHi_PhysicalToLogical) (void *table, int proc);
 extern int (*PUGHi_LogicalToPhysical) (void *table, int num);
 
-extern int (*PUGHi_GenerateTopology)(int dim, 
-                                     int total_procs, 
-                                     const int *nsize,
-                                     const int *nghostzones, 
-                                     int *nprocs);
-
 extern void *(*PUGHi_CreateP2LTranslation)(int dim, 
                                            int *nprocs, 
                                            int np);