curveopt.py: wip

[moebius3.git] / findcurve.c

diff --git a/findcurve.c b/findcurve.c
index 32050acde23644aa4bf675cf8a8cba4358f699ee..077f31c06c5c6a8815fcb3b2246820846d21eee0 100644 (file)
--- a/findcurve.c
+++ b/findcurve.c
@@ -33,8 +33,7 @@ static void prepare(double X[] /* startpoint */) {
 
 static double cb_Efunc(void *xp) {
   const double *X = xp;
-  double F[3], G[3];
-
+  DECLARE_F_G;
   CALCULATE_F_G;
 
   double e = 0;
@@ -71,9 +70,13 @@ static double cb_metric(void *xp, void *yp) {
 }
 
 static void printcore(const double *X) {
-  int i;
+  int i, j;
+  DECLARE_F_G;
+  CALCULATE_F_G;
   printf("[");
-  for (i=0; i<NX; i++) printf(" %.18g,", X[i]);
+  for (i=0; i<NP; i++)
+    for (j=0; j<3; j++)
+      printf(" %.18g,", POINT(i)[i]);
   printf(" ]\n");
 }