1 files changed, 6 insertions, 8 deletions
diff --git a/internal.h b/internal.h
index 87490e1..e0cbf60 100644
--- a/internal.h
+++ b/internal.h
@@ -55,20 +55,18 @@ typedef struct QFunc {
 } QFunc;
 
 typedef struct BDPriv {
-    const BasisSet *basis;
+    const BasisSet *basis[2];
     const QFunc    *q_func;
 
-    int nb_colloc_points;
-    int nb_colloc_points_rho;
-    int nb_colloc_points_z;
-
-    int colloc_grid_order_rho;
-    int colloc_grid_order_z;
-    int nb_coeffs;
+    int nb_colloc_points[2];
+    int nb_coeffs[2];
 
     double *coeffs;
 } BDPriv;
 
+#define NB_COEFFS(s)        (s->nb_coeffs[0]        * s->nb_coeffs[1])
+#define NB_COLLOC_POINTS(s) (s->nb_colloc_points[0] * s->nb_colloc_points[1])
+
 extern const BasisSet bdi_sb_even_basis;
 
 extern const QFunc bdi_q_func_gundlach;