diff options
-rw-r--r-- | src/Register.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Register.c b/src/Register.c index 7134e91..f9b232b 100644 --- a/src/Register.c +++ b/src/Register.c @@ -79,7 +79,7 @@ int EOS_RegisterMethod(const char *name) return handle; } -void FORTRAN_NAME(EOS_RegisterMethod)(int *handle, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterMethod)(int *handle, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) @@ -113,7 +113,7 @@ int EOS_Handle(const char *name) return handle; } -void FORTRAN_NAME(EOS_Handle)(int *handle, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(EOS_Handle)(int *handle, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) @@ -173,11 +173,11 @@ REGISTER_FUNCTION(DPressByDEps) } /* Functions to register Fortran EOS functions */ -void FORTRAN_NAME(EOS_RegisterPressure) REGISTER_FORTRAN_FUNCTION(Pressure) -void FORTRAN_NAME(EOS_RegisterSpecificIntEnergy) REGISTER_FORTRAN_FUNCTION(SpecificIntEnergy) -void FORTRAN_NAME(EOS_RegisterRestMassDens) REGISTER_FORTRAN_FUNCTION(RestMassDens) -void FORTRAN_NAME(EOS_RegisterDPressByDRho) REGISTER_FORTRAN_FUNCTION(DPressByDRho) -void FORTRAN_NAME(EOS_RegisterDPressByDEps) REGISTER_FORTRAN_FUNCTION(DPressByDEps) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterPressure) REGISTER_FORTRAN_FUNCTION(Pressure) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterSpecificIntEnergy) REGISTER_FORTRAN_FUNCTION(SpecificIntEnergy) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterRestMassDens) REGISTER_FORTRAN_FUNCTION(RestMassDens) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterDPressByDRho) REGISTER_FORTRAN_FUNCTION(DPressByDRho) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterDPressByDEps) REGISTER_FORTRAN_FUNCTION(DPressByDEps) #define CALL_FUNC(x) \ CCTK_REAL EOS_ ## x (int handle, CCTK_REAL a, CCTK_REAL b) \ @@ -239,9 +239,9 @@ CALL_FUNC(DPressByDEps) } /* Functions to call EOS functions from Fortran*/ -CCTK_REAL FORTRAN_NAME(EOS_Pressure) CALL_FORTRAN_FUNC(Pressure) -CCTK_REAL FORTRAN_NAME(EOS_SpecificIntEnergy) CALL_FORTRAN_FUNC(SpecificIntEnergy) -CCTK_REAL FORTRAN_NAME(EOS_RestMassDens) CALL_FORTRAN_FUNC(RestMassDens) -CCTK_REAL FORTRAN_NAME(EOS_DPressByDRho) CALL_FORTRAN_FUNC(DPressByDRho) -CCTK_REAL FORTRAN_NAME(EOS_DPressByDEps) CALL_FORTRAN_FUNC(DPressByDEps) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_Pressure) CALL_FORTRAN_FUNC(Pressure) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_SpecificIntEnergy) CALL_FORTRAN_FUNC(SpecificIntEnergy) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_RestMassDens) CALL_FORTRAN_FUNC(RestMassDens) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_DPressByDRho) CALL_FORTRAN_FUNC(DPressByDRho) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_DPressByDEps) CALL_FORTRAN_FUNC(DPressByDEps) |