diff options
| author | schnetter <schnetter@80bd93c7-81bc-453a-9e3f-619c0b4f6fe4> | 2006-06-13 01:43:32 +0000 |
|---|---|---|
| committer | schnetter <schnetter@80bd93c7-81bc-453a-9e3f-619c0b4f6fe4> | 2006-06-13 01:43:32 +0000 |
| commit | d08bdf1493bd917e7b5a31349d189d405681f563 (patch) | |
| tree | e0955c40d3cedf2618da9a8b5c4eadde066bb6e3 | |
| parent | 0a46717776addc7c1d01514d9ea4c76fb5179b75 (diff) | |
Correct types in the case where int and CCTK_INT are different:
Explicitly convert int[] to CCTK_INT[] when calling aliased functions.
Do not declare implementations of aliased functions as taking int[]
arguments.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMAnalysis/trunk@50 80bd93c7-81bc-453a-9e3f-619c0b4f6fe4
| -rw-r--r-- | src/ADMAnalysis.h | 6 | ||||
| -rw-r--r-- | src/Analysis.c | 16 | ||||
| -rw-r--r-- | src/CartToSphere.c | 4 | ||||
| -rw-r--r-- | src/Ricci.c | 6 | ||||
| -rw-r--r-- | src/Trace.c | 2 |
5 files changed, 22 insertions, 12 deletions
diff --git a/src/ADMAnalysis.h b/src/ADMAnalysis.h index ed3aee5..adbb39d 100644 --- a/src/ADMAnalysis.h +++ b/src/ADMAnalysis.h @@ -16,8 +16,8 @@ extern "C" { #endif -void ADMAnalysis_CartToSphere(const int *lsh, - int r2norm, +void ADMAnalysis_CartToSphere(const CCTK_INT *lsh, + CCTK_INT r2norm, const CCTK_REAL *x, const CCTK_REAL *y, const CCTK_REAL *z, @@ -35,7 +35,7 @@ void ADMAnalysis_CartToSphere(const int *lsh, CCTK_REAL *sphere_qp, CCTK_REAL *sphere_pp); -void ADMAnalysis_Trace(const int *lsh, +void ADMAnalysis_Trace(const CCTK_INT *lsh, const CCTK_REAL *g11, const CCTK_REAL *g12, const CCTK_REAL *g13, diff --git a/src/Analysis.c b/src/Analysis.c index d4ad471..72ee53a 100644 --- a/src/Analysis.c +++ b/src/Analysis.c @@ -68,11 +68,13 @@ void ADMAnalysis_CurvCartToSphere(CCTK_ARGUMENTS); @@*/ void ADMAnalysis_EvaltrK(CCTK_ARGUMENTS) { - int i; + int i, d; + CCTK_INT lsh[3]; DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - ADMAnalysis_Trace(cctk_lsh, + for (d=0; d<3; ++d) lsh[d] = cctk_lsh[d]; + ADMAnalysis_Trace(lsh, gxx, gxy, gxz, @@ -115,10 +117,13 @@ void ADMAnalysis_EvaltrK(CCTK_ARGUMENTS) @@*/ void ADMAnalysis_MetricCartToSphere(CCTK_ARGUMENTS) { + int d; + CCTK_INT lsh[3]; DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - ADMAnalysis_CartToSphere(cctk_lsh, + for (d=0; d<3; ++d) lsh[d] = cctk_lsh[d]; + ADMAnalysis_CartToSphere(lsh, normalize_dtheta_dphi, x, y, @@ -155,10 +160,13 @@ void ADMAnalysis_MetricCartToSphere(CCTK_ARGUMENTS) @@*/ void ADMAnalysis_CurvCartToSphere(CCTK_ARGUMENTS) { + int d; + CCTK_INT lsh[3]; DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - ADMAnalysis_CartToSphere(cctk_lsh, + for (d=0; d<3; ++d) lsh[d] = cctk_lsh[d]; + ADMAnalysis_CartToSphere(lsh, normalize_dtheta_dphi, x, y, diff --git a/src/CartToSphere.c b/src/CartToSphere.c index d51a085..951ab56 100644 --- a/src/CartToSphere.c +++ b/src/CartToSphere.c @@ -135,8 +135,8 @@ CCTK_FILEVERSION(CactusEinstein_ADMAnalysis_CartToSphere_c) @vio in @@*/ -void ADMAnalysis_CartToSphere(const int *lsh, - int project_rdtheta_rdphi, +void ADMAnalysis_CartToSphere(const CCTK_INT *lsh, + CCTK_INT project_rdtheta_rdphi, const CCTK_REAL *x, const CCTK_REAL *y, const CCTK_REAL *z, diff --git a/src/Ricci.c b/src/Ricci.c index 3c517d7..adb4693 100644 --- a/src/Ricci.c +++ b/src/Ricci.c @@ -67,7 +67,8 @@ void ADMAnalysis_Ricci(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; - CCTK_INT i,j,k, ijk, di, dj, dk, err; + CCTK_INT lsh[3]; + CCTK_INT i,j,k, d, ijk, di, dj, dk, err; #include "CactusEinstein/ADMMacros/src/macro/RICCI_declare.h" @@ -98,7 +99,8 @@ void ADMAnalysis_Ricci(CCTK_ARGUMENTS) #include "CactusEinstein/ADMMacros/src/macro/RICCI_undefine.h" - ADMAnalysis_Trace(cctk_lsh, gxx, gxy, gxz, gyy, gyz, gzz, + for (d=0; d<3; ++d) lsh[d] = cctk_lsh[d]; + ADMAnalysis_Trace(lsh, gxx, gxy, gxz, gyy, gyz, gzz, Ricci11, Ricci12, Ricci13, Ricci22, Ricci23, Ricci33, Ricci, detg); diff --git a/src/Trace.c b/src/Trace.c index 0808ae3..241900b 100644 --- a/src/Trace.c +++ b/src/Trace.c @@ -117,7 +117,7 @@ CCTK_FILEVERSION(CactusEinstein_ADMAnalysis_Trace_c) @endvar @@*/ -void ADMAnalysis_Trace(const int *lsh, +void ADMAnalysis_Trace(const CCTK_INT *lsh, const CCTK_REAL *g11, const CCTK_REAL *g12, const CCTK_REAL *g13, |