From 9cdfcec8a2dc9e8f330f51797058e03e29104689 Mon Sep 17 00:00:00 2001 From: allen Date: Wed, 10 May 2000 12:12:44 +0000 Subject: New macros for calling C from fortran using PUGH_pGH git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllSOR/trunk@56 fa3da13c-9f13-4301-a575-cf5b8c5e1907 --- src/sor_confmetric.F | 2 +- src/sor_flat.F | 2 +- src/sor_wrapper.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sor_confmetric.F b/src/sor_confmetric.F index 8c7867a..bee8e8e 100644 --- a/src/sor_confmetric.F +++ b/src/sor_confmetric.F @@ -305,7 +305,7 @@ c Apply Robin boundary endif c Apply octant Symmetries - call CartSymBCVarI(ierr, cctkGH, var_idx) + call CartSymVI(ierr, cctkGH, var_idx) enddo diff --git a/src/sor_flat.F b/src/sor_flat.F index d71738a..904f66d 100644 --- a/src/sor_flat.F +++ b/src/sor_flat.F @@ -250,7 +250,7 @@ c call Ell_GetStringKey(nchar, mybound,"EllLinFlat::Bnd") endif c Apply octant Symmetries - call CartSymBCVarI(ierr, cctkGH, var_idx) + call CartSymVI(ierr, cctkGH, var_idx) enddo diff --git a/src/sor_wrapper.c b/src/sor_wrapper.c index 9da5dbd..d05e646 100644 --- a/src/sor_wrapper.c +++ b/src/sor_wrapper.c @@ -22,7 +22,7 @@ #include "cctk_Parameters.h" #include "cctk_FortranString.h" -void FORTRAN_NAME(sor_confmetric_core3d) +void CCTK_FNAME(sor_confmetric_core3d) (_CCTK_C2F_PROTO(GH), int *, CCTK_REAL *, @@ -40,7 +40,7 @@ void FORTRAN_NAME(sor_confmetric_core3d) CCTK_REAL *, CCTK_REAL *); -void FORTRAN_NAME(sor_flat_core3d) +void CCTK_FNAME(sor_flat_core3d) (int *ierr, _CCTK_C2F_PROTO(GH), int *, @@ -117,7 +117,7 @@ void sor_confmetric(cGH *GH, /* call the fortran routine */ - FORTRAN_NAME(sor_confmetric_core3d)(_PASS_CCTK_C2F(GH), + CCTK_FNAME(sor_confmetric_core3d)(_PASS_CCTK_C2F(GH), Mlinear_lsh, Mlinear, Nsource_lsh, Nsources, gxx,gxy,gxz,gyy,gyz,gzz,psi, @@ -161,7 +161,7 @@ int sor_flat(cGH *GH, } /* call the fortran routine */ - FORTRAN_NAME(sor_flat_core3d) + CCTK_FNAME(sor_flat_core3d) (&ierr, _PASS_CCTK_C2F(GH), Mlinear_lsh, -- cgit v1.2.3