diff options
| author | schnetter <schnetter@b2a53a04-0f4f-0410-87ed-f9f25ced00cf> | 2004-10-20 22:17:55 +0000 |
|---|---|---|
| committer | schnetter <schnetter@b2a53a04-0f4f-0410-87ed-f9f25ced00cf> | 2004-10-20 22:17:55 +0000 |
| commit | 7ca07d73e19ff65d5eaa3762ccad0242650498ff (patch) | |
| tree | e4e8c2960ca1ca5170418ccd330c1c5361f52b2b | |
| parent | 9bfb372b21b2a6a3fcdc34c4fc988a22c2bf101a (diff) | |
Declare some local functions statically to prevent name clashes with BAM.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TwoPunctures/trunk@25 b2a53a04-0f4f-0410-87ed-f9f25ced00cf
| -rw-r--r-- | src/Newton.c | 27 | ||||
| -rw-r--r-- | src/TwoPunctures.h | 11 |
2 files changed, 20 insertions, 18 deletions
diff --git a/src/Newton.c b/src/Newton.c index c1af7f3..2eefea1 100644 --- a/src/Newton.c +++ b/src/Newton.c @@ -9,11 +9,24 @@ #include "TP_utilities.h" #include "TwoPunctures.h" -static void relax (double *dv, int nvar, int n1, int n2, int n3, double *rhs, - int *ncols, int **cols, double **JFD); - +static int +bicgstab (CCTK_POINTER_TO_CONST cctkGH, + int nvar, int n1, int n2, int n3, derivs v, + derivs dv, int output, int itmax, double tol, double *normres); +static void +relax (double *dv, int nvar, int n1, int n2, int n3, + double *rhs, int *ncols, int **cols, double **JFD); +static void +resid (double *res, int ntotal, double *dv, double *rhs, + int *ncols, int **cols, double **JFD); +static void +LineRelax_al (double *dv, int j, int k, int nvar, int n1, int n2, int n3, + double *rhs, int *ncols, int **cols, double **JFD); +static void +LineRelax_be (double *dv, int i, int k, int nvar, int n1, int n2, int n3, + double *rhs, int *ncols, int **cols, double **JFD); // ----------------------------------------------------------------------------------- -void +static void resid (double *res, int ntotal, double *dv, double *rhs, int *ncols, int **cols, double **JFD) { @@ -30,7 +43,7 @@ resid (double *res, int ntotal, double *dv, double *rhs, } // ----------------------------------------------------------------------------------- -void +static void LineRelax_al (double *dv, int j, int k, int nvar, int n1, int n2, int n3, double *rhs, int *ncols, int **cols, double **JFD) { @@ -84,7 +97,7 @@ LineRelax_al (double *dv, int j, int k, int nvar, int n1, int n2, int n3, } // ----------------------------------------------------------------------------------- -void +static void LineRelax_be (double *dv, int i, int k, int nvar, int n1, int n2, int n3, double *rhs, int *ncols, int **cols, double **JFD) { @@ -228,7 +241,7 @@ TestRelax (CCTK_POINTER_TO_CONST cctkGH, } // ----------------------------------------------------------------------------------- -int +static int bicgstab (CCTK_POINTER_TO_CONST cctkGH, int nvar, int n1, int n2, int n3, derivs v, derivs dv, int output, int itmax, double tol, double *normres) diff --git a/src/TwoPunctures.h b/src/TwoPunctures.h index 19763e7..f04145c 100644 --- a/src/TwoPunctures.h +++ b/src/TwoPunctures.h @@ -71,19 +71,8 @@ void LinEquations (double A, double B, double X, double R, double y, double z, derivs dU, derivs U, double *values); // Routines in "Newton.c" -void resid (double *res, int ntotal, double *dv, double *rhs, - int *ncols, int **cols, double **JFD); -void LineRelax_al (double *dv, int j, int k, int nvar, int n1, int n2, int n3, - double *rhs, int *ncols, int **cols, double **JFD); -void LineRelax_be (double *dv, int i, int k, int nvar, int n1, int n2, int n3, - double *rhs, int *ncols, int **cols, double **JFD); -void relax (double *dv, int nvar, int n1, int n2, int n3, double *rhs, - int *ncols, int **cols, double **JFD); void TestRelax (CCTK_POINTER_TO_CONST cctkGH, int nvar, int n1, int n2, int n3, derivs v, double *dv); -int bicgstab (CCTK_POINTER_TO_CONST cctkGH, - int nvar, int n1, int n2, int n3, derivs v, - derivs dv, int output, int itmax, double tol, double *normres); void Newton (CCTK_POINTER_TO_CONST cctkGH, int nvar, int n1, int n2, int n3, derivs v, double tol, int itmax); |