CCTK function name changes

Reorganising file structure


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1296 17b73243-c579-4c4c-a9d2-2d5706c11dac

5 files changed, 62 insertions, 99 deletions

diff --git a/src/comm/CactusComm.c b/src/comm/CactusComm.c
deleted file mode 100644
index c39eaac3..00000000
--- a/src/comm/CactusComm.c
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-#include <stdio.h>
-
-#include "cctk.h"
-#include "cctk_Flesh.h"
-#include "cctk_Comm.h"
-#include "cctk_GHExtensions.h"
-
-int *CCTK_ArrayGroupSizeI(cGH *GH, int dir, int index)
-{
-  return CCTK_ArrayGroupSizeB(GH,dir,index,NULL);
-}
-
-int *CCTK_ArrayGroupSize(cGH *GH, int dir, const char *groupname)
-{
-  return CCTK_ArrayGroupSizeB(GH,dir,-1,groupname);
-}
-
-int CCTK_QueryGroupStorageI(cGH *GH, int index)
-{
-  return CCTK_QueryGroupStorageB(GH,index , NULL);
-}
-
-int CCTK_QueryGroupStorage(cGH *GH, const char *groupname)
-{
-  return CCTK_QueryGroupStorageB(GH, -1, groupname);
-}
diff --git a/src/comm/CactusSync.c b/src/comm/CactusSync.c
index 59eb77b9..1d3c162b 100644
--- a/src/comm/CactusSync.c
+++ b/src/comm/CactusSync.c
@@ -19,41 +19,41 @@
    @enddesc 
  @@*/
 
-void CCTK_SyncGroupI(cGH *GH, int gi) {
-  char *groupname = CCTK_GroupName(gi);
+void CCTK_SyncGroupI(cGH *GH, int groupi) {
+  char *groupname = CCTK_GroupName(groupi);
 
   CCTK_SyncGroup(GH,groupname);
   free(groupname);
 }
 
-void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupI)(cGH *GH, int *gi) {
-  CCTK_SyncGroupI(GH, *gi);
+void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupI)(cGH *GH, int *groupi) {
+  CCTK_SyncGroupI(GH, *groupi);
 }
 
 
 
-void CCTK_SyncGroupWithVar(cGH *GH, const char *impvarname) {
-  int gi;
-  gi = CCTK_GroupIndexFromVarI(CCTK_VarIndex(impvarname));
-  CCTK_SyncGroupI(GH,gi);
+void CCTK_SyncGroupWithVar(cGH *GH, const char *varn) {
+  int groupi;
+  groupi = CCTK_GroupIndexFromVarI(CCTK_VarIndex(varn));
+  CCTK_SyncGroupI(GH,groupi);
 }
 
 void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupWithVar)(cGH *GH, ONE_FORTSTRING_ARG) {
-  ONE_FORTSTRING_CREATE(impvarname);
-  CCTK_SyncGroupWithVar(GH,impvarname);
-  free(impvarname);
+  ONE_FORTSTRING_CREATE(varn);
+  CCTK_SyncGroupWithVar(GH,varn);
+  free(varn);
 }
 
 
 
-void CCTK_SyncGroupWithVarI(cGH *GH, int vi) {
-  int gi;
-  gi = CCTK_GroupIndexFromVarI(vi);
-  CCTK_SyncGroupI(GH,gi);
+void CCTK_SyncGroupWithVarI(cGH *GH, int vari) {
+  int groupi;
+  groupi = CCTK_GroupIndexFromVarI(vari);
+  CCTK_SyncGroupI(GH,groupi);
 }
 
-void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupWithVarI)(cGH *GH, int *vi) {
-  CCTK_SyncGroupWithVarI(GH,*vi);
+void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupWithVarI)(cGH *GH, int *vari) {
+  CCTK_SyncGroupWithVarI(GH,*vari);
 }
 
 
diff --git a/src/comm/FortranBindings.c b/src/comm/FortranBindings.c
deleted file mode 100644
index 2a273b7c..00000000
--- a/src/comm/FortranBindings.c
+++ /dev/null
@@ -1,50 +0,0 @@
- /*@@
-   @file      FortranBindings.c
-   @date      Thu Feb  18 14:27:18 1999
-   @author    Gabrielle Allen
-   @desc 
-   Fortran bindings for the comm functions
-   @enddesc 
- @@*/
-
-#include <stdlib.h>
-#include "cctk_Flesh.h"
-#include "cctk_FortranString.h"
-#include "cctk_Comm.h"
-
-int FMODIFIER FORTRAN_NAME(CCTK_Exit)(cGH *GH)
-{
-  CCTK_Exit(GH);
-  return 0;
-}
-
-int FMODIFIER FORTRAN_NAME(CCTK_ParallelInit)(cGH *GH)
-{
-  CCTK_ParallelInit(GH);
-  return 0;
-}
-
-int FMODIFIER FORTRAN_NAME(CCTK_Abort)(cGH *GH)
-{
-  CCTK_Abort(GH);
-  return 0;
-}
-
-int FMODIFIER FORTRAN_NAME(CCTK_SyncGroup)(cGH *GH, ONE_FORTSTRING_ARG)
-{
-  ONE_FORTSTRING_CREATE(group_name)
-  CCTK_SyncGroup(GH,group_name);
-  free(group_name); 
-  return 0;
-}
-
-int FMODIFIER FORTRAN_NAME(CCTK_nProcs)(cGH *GH)
-{
-  return CCTK_nProcs(GH);
-}
- 
-int FMODIFIER FORTRAN_NAME(CCTK_MyProc)(cGH *GH)
-{
-  return CCTK_MyProc(GH);
-}
- 
diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c
index f6300a94..c1f31533 100644
--- a/src/comm/OverloadComm.c
+++ b/src/comm/OverloadComm.c
@@ -14,6 +14,7 @@
 #include <stdarg.h>
 
 #include "cctk_Flesh.h"
+#include "cctk_FortranString.h"
 #include "OverloadMacros.h"
 #include "cctk_WarnLevel.h"
 
@@ -47,7 +48,7 @@ static char *rcsid="$Header$";
 
 
  /*@@
-   @routine    SetupCommFunctions(void)
+   @routine    CCTKi_SetupCommFunctions
    @date       Thu Feb  4 08:21:26 1999
    @author     Tom Goodale
    @desc 
@@ -60,7 +61,7 @@ static char *rcsid="$Header$";
    @endhistory 
 
 @@*/
-int SetupCommFunctions(void)
+int CCTKi_SetupCommFunctions(void)
 {
 
 #define OVERLOADABLE(name) OVERLOADABLE_CHECK(name)
@@ -89,3 +90,45 @@ int SetupCommFunctions(void)
 
 #undef OVERLOADABLE
 
+
+
+/*    Fortran bindings for the comm functions */
+
+
+
+int FMODIFIER FORTRAN_NAME(CCTK_Exit)(cGH *GH)
+{
+  CCTK_Exit(GH);
+  return 0;
+}
+
+int FMODIFIER FORTRAN_NAME(CCTK_ParallelInit)(cGH *GH)
+{
+  CCTK_ParallelInit(GH);
+  return 0;
+}
+
+int FMODIFIER FORTRAN_NAME(CCTK_Abort)(cGH *GH)
+{
+  CCTK_Abort(GH);
+  return 0;
+}
+
+int FMODIFIER FORTRAN_NAME(CCTK_SyncGroup)(cGH *GH, ONE_FORTSTRING_ARG)
+{
+  ONE_FORTSTRING_CREATE(group_name)
+  CCTK_SyncGroup(GH,group_name);
+  free(group_name); 
+  return 0;
+}
+
+int FMODIFIER FORTRAN_NAME(CCTK_nProcs)(cGH *GH)
+{
+  return CCTK_nProcs(GH);
+}
+ 
+int FMODIFIER FORTRAN_NAME(CCTK_MyProc)(cGH *GH)
+{
+  return CCTK_MyProc(GH);
+}
+ 
diff --git a/src/comm/make.code.defn b/src/comm/make.code.defn
index 2696c48d..a6a2ec84 100644
--- a/src/comm/make.code.defn
+++ b/src/comm/make.code.defn
@@ -1,9 +1,7 @@
 SRCS=\
-CactusComm.c\
 CactusSync.c\
 CactusDefaultComm.c\
 OverloadComm.c\
-FortranBindings.c\
 Interp.c\
 Reduction.c