qfunc: disentangle the API from the global solver API

1 files changed, 3 insertions, 12 deletions

diff --git a/internal.h b/internal.h
index 19e6d7f..ae9932a 100644
--- a/internal.h
+++ b/internal.h
@@ -22,6 +22,8 @@
 
 #include "brill_data.h"
 
+#include "qfunc.h"
+
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 #define SQR(x) ((x) * (x))
 
@@ -50,18 +52,9 @@ typedef struct BasisSet {
     double (*colloc_point)(int order, int idx, double sf);
 } BasisSet;
 
-typedef struct QFunc {
-    double         (*q)(const BDContext *bd, double rho, double z);
-    double    (*dq_rho)(const BDContext *bd, double rho, double z);
-    double      (*dq_z)(const BDContext *bd, double rho, double z);
-    double   (*d2q_rho)(const BDContext *bd, double rho, double z);
-    double     (*d2q_z)(const BDContext *bd, double rho, double z);
-    double (*d2q_rho_z)(const BDContext *bd, double rho, double z);
-} QFunc;
-
 typedef struct BDPriv {
     const BasisSet *basis[2];
-    const QFunc    *q_func;
+    QFuncContext    *qfunc;
 
     int nb_colloc_points[2];
     int nb_coeffs[2];
@@ -75,8 +68,6 @@ typedef struct BDPriv {
 
 extern const BasisSet bdi_sb_even_basis;
 
-extern const QFunc bdi_q_func_gundlach;
-extern const QFunc bdi_q_func_eppley;
 
 int bdi_solve(BDContext *bd);