New macros for calling C from fortran

using PUGH_pGH


git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllBase/trunk@44 57bc7290-fb3d-4efd-a9b1-28e84cce6043

3 files changed, 15 insertions, 15 deletions

diff --git a/doc/ThornGuide.tex b/doc/ThornGuide.tex
index 18f6c6e..6dba57b 100644
--- a/doc/ThornGuide.tex
+++ b/doc/ThornGuide.tex
@@ -376,7 +376,7 @@ accessible by the elliptic registry).
 
 \begin{verbatim}
 /* Fortran wrapper for the routine Ell_SimpleEllSolver */
-void FMODIFIER FORTRAN_NAME(Ell_SimpelEllSolver)
+void CCTK_FCALL CCTK_FNAME(Ell_SimpelEllSolver)
      (cGH *GH, int *FieldIndex, int *MIndex, 
      int *AbsTol, int *RelTol, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(solver_name);
@@ -454,7 +454,7 @@ void FastSOR_wrapper(cGH *GH, int *FieldIndex, int *MIndex,
   }
 
   /* call the fortran routine */
-  FORTRAN_NAME(SimpleEll_Solver)(_PASS_CCTK_C2F(GH),
+  CCTK_FNAME(SimpleEll_Solver)(_PASS_CCTK_C2F(GH),
          Mlinear_lsh, Mlinear, var, 	
 	 AbsTol, RelTol);
 }
diff --git a/src/Ell_DBstructure.c b/src/Ell_DBstructure.c
index 2e812d3..ff0bf2b 100644
--- a/src/Ell_DBstructure.c
+++ b/src/Ell_DBstructure.c
@@ -91,7 +91,7 @@ int Ell_IsKey(const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_IsKey)(int *ierr, ONE_FORTSTRING_ARG) {
+void CCTK_FCALL CCTK_FNAME(Ell_IsKey)(int *ierr, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(key)
   *ierr = Ell_IsKey(key);
   free(key);
@@ -122,7 +122,7 @@ int Ell_DeleteKey(const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_DeleteKey)(int *ierr, ONE_FORTSTRING_ARG){
+void CCTK_FCALL CCTK_FNAME(Ell_DeleteKey)(int *ierr, ONE_FORTSTRING_ARG){
   ONE_FORTSTRING_CREATE(key);
   *ierr = Ell_DeleteKey(key);
   free(key);
@@ -153,7 +153,7 @@ int Ell_SetRealKey(CCTK_REAL value, const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_SetRealKey)
+void CCTK_FCALL CCTK_FNAME(Ell_SetRealKey)
      (int *ierr, CCTK_REAL *value, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(key)
   *ierr = Ell_SetRealKey(*value, key);
@@ -182,7 +182,7 @@ int Ell_SetIntKey(CCTK_INT value, const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_SetIntKey)
+void CCTK_FCALL CCTK_FNAME(Ell_SetIntKey)
      (int *ierr, CCTK_INT *value, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(key)
   *ierr = Ell_SetIntKey(*value, key);
@@ -210,7 +210,7 @@ int Ell_SetStrKey(char *value, const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_SetStringKey)
+void CCTK_FCALL CCTK_FNAME(Ell_SetStringKey)
      (int *ierr, TWO_FORTSTRINGS_ARGS) {
   TWO_FORTSTRINGS_CREATE(value,key)
   *ierr = Ell_SetStrKey(value, key);
@@ -255,7 +255,7 @@ int Ell_GetRealKey(CCTK_REAL *value, const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_GetRealKey)
+void CCTK_FCALL CCTK_FNAME(Ell_GetRealKey)
      (int *ierr, CCTK_REAL *value, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(key)
   *ierr = Ell_GetRealKey(value, key); 
@@ -290,7 +290,7 @@ int Ell_GetIntKey(CCTK_INT *value,const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_GetIntKey)
+void CCTK_FCALL CCTK_FNAME(Ell_GetIntKey)
      (int *ierr, CCTK_INT *value, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(key)
   *ierr = Ell_GetIntKey(value, key);
@@ -324,7 +324,7 @@ int Ell_GetStrKey(char *value, const char *keychain) {
   return(retval);
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_GetStrKey)
+void CCTK_FCALL CCTK_FNAME(Ell_GetStrKey)
      (int *nchar, char **cstring,ONE_FORTSTRING_ARG)
 {   
    int i;
diff --git a/src/Ell_Interface.c b/src/Ell_Interface.c
index c338110..a02ce21 100644
--- a/src/Ell_Interface.c
+++ b/src/Ell_Interface.c
@@ -93,7 +93,7 @@ int Ell_LinConfMetricSolver(cGH *GH,
 
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_LinConfMetricSolver)
+void CCTK_FCALL CCTK_FNAME(Ell_LinConfMetricSolver)
      (int *ierr, 
       cGH *GH, 
       int *MetricPsi, 
@@ -179,7 +179,7 @@ int Ell_LinMetricSolver(cGH *GH,
   return(retval);
 }
   
-void FMODIFIER FORTRAN_NAME(Ell_LinMetricSolver)
+void CCTK_FCALL CCTK_FNAME(Ell_LinMetricSolver)
      (int *ierr, 
       cGH *GH, 
       int *Metric, 
@@ -263,7 +263,7 @@ int Ell_LinFlatSolver(cGH *GH,
   return retval;
 }
   
-void FMODIFIER FORTRAN_NAME(Ell_LinFlatSolver)
+void CCTK_FCALL CCTK_FNAME(Ell_LinFlatSolver)
      (int *ierr, 
       cGH *GH, 
       int *FieldIndex, 
@@ -348,7 +348,7 @@ int Ell_BrBrConfMetricSolver(cGH *GH,
 
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_BrBrConfMetricSolver)
+void CCTK_FCALL CCTK_FNAME(Ell_BrBrConfMetricSolver)
      (int *ierr, 
       cGH *GH, 
       int *MetricPsi, 
@@ -435,7 +435,7 @@ int Ell_PolyConfMetricSolver(cGH *GH,
 
 }
 
-void FMODIFIER FORTRAN_NAME(Ell_PolyConfMetricSolver)
+void CCTK_FCALL CCTK_FNAME(Ell_PolyConfMetricSolver)
      (int *ierr, 
       cGH *GH, 
       int *MetricPsi,