diff options
| author | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2003-01-23 20:36:58 +0000 |
|---|---|---|
| committer | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2003-01-23 20:36:58 +0000 |
| commit | 989b9060c8a61612e6bc6a8a58785d23f96daa17 (patch) | |
| tree | 8faad399fb1bce9b8cf7d7236621a36c3ffc8dd7 | |
| parent | c13e54071288428f33064e351e32139c7f00108c (diff) | |
must define HAVE_DENSE_JACOBIAN or HAVE_ROW_SPARSE_JACOBIAN
in include/config.h rather than in elliptic/Jacobian.hh, since we
want these to be usable in #ifdefs in elliptic/*_wrapper.F77
(which only include config.h)
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@939 f88db872-0e4f-0410-b76b-b9085cfa78c5
| -rw-r--r-- | src/elliptic/Jacobian.hh | 14 | ||||
| -rw-r--r-- | src/include/config.h | 15 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/elliptic/Jacobian.hh b/src/elliptic/Jacobian.hh index 64ca182..4edd963 100644 --- a/src/elliptic/Jacobian.hh +++ b/src/elliptic/Jacobian.hh @@ -28,20 +28,10 @@ // dense_Jacobian__LAPACK // row_sparse_Jacobian // row_sparse_Jacobian__ILUCG -// each derived class is inside a corresponding #ifdef. The #ifdef -// symbols for linear solvers are specified in "../include/config.h"; -// those for sparsity patterns are specified below based on the ones -// for linear solvers. +// each derived class is inside a corresponding #ifdef (set or unset +// as appropriate, in "../include/config.h"). // -#ifdef HAVE_DENSE_JACOBIAN__LAPACK - #define HAVE_DENSE_JACOBIAN -#endif - -#ifdef HAVE_ROW_SPARSE_JACOBIAN__ILUCG - #define HAVE_ROW_SPARSE_JACOBIAN -#endif - //****************************************************************************** // diff --git a/src/include/config.h b/src/include/config.h index 78bf89a..c1cb69c 100644 --- a/src/include/config.h +++ b/src/include/config.h @@ -75,3 +75,18 @@ typedef CCTK_INT integer; /* store as row-oriented sparse matrix, solve with ILUCG */ #define HAVE_ROW_SPARSE_JACOBIAN__ILUCG + +/**************************************/ + +/* + * The following #ifdefs and #defines shouldn't need to be changed; + * they decode the previous set of Jacobian storage format and linear + * solver #defines to determine which storage formats we are using. + */ +#ifdef HAVE_DENSE_JACOBIAN__LAPACK +#define HAVE_DENSE_JACOBIAN +#endif + +#ifdef HAVE_ROW_SPARSE_JACOBIAN__ILUCG +#define HAVE_ROW_SPARSE_JACOBIAN +#endif |