Convergence failure tests

Author: attipaci

include/novas.h

@@ -1267,7 +1267,9 @@ double novas_inv_refract(RefractionModel model, double jd_tt, const on_surface *
 #define HOURANGLE           (M_PI / 12.0)
 #define MAS                 (1e-3 * ASEC2RAD)
 
-#define INV_MAX_ITER        100
+#ifndef INV_MAX_ITER
+#  define INV_MAX_ITER      100                   ///< Maximum number of iterations for convergent inverse calculations
+#endif
 
 #  ifndef THREAD_LOCAL
 #    if __STDC_VERSION__ >= 201112L

src/frames.c

@@ -261,7 +261,7 @@ static int frame_aberration(const novas_frame *frame, int dir, double *pos) {
     }
   }
 
-  errno = ECANCELED;
+  novas_set_errno(ECANCELED, "frame_aberration", "failed to converge");
   return -1;
 }
 

src/novas.c

@@ -4458,8 +4458,7 @@ int grav_undo_planets(const double *pos_app, const double *pos_obs, enum novas_a
       pos0[j] -= pos_def[j] - pos_app[j];
   }
 
-  novas_set_errno(ECANCELED, fn, "failed to converge");
-  return -1;
+  return novas_error(-1, ECANCELED, fn, "failed to converge");
 }
 
 /**

test/Makefile

@@ -13,6 +13,7 @@ include ../config.mk
 
 #OBJECTS := $(subst obj/,,$(OBJECTS))
 OBJECTS := novas.o nutation.o solsys3.o frames.o timescale.o refract.o
+SOURCES := $(subst .o,.c,$(OBJECTS))
 
 .PHONY: run
 run: clean-cov clean-data test-compat test-cio_file test-super test-errors data ../cio_ra.bin bad-data
@@ -65,6 +66,10 @@ bad-cio-data:
 ../cio_ra.bin:
 	make -C .. cio_ra.bin
 
+test-errors: CPPFLAGS += -DINV_MAX_ITER=0
+test-errors: test-errors.o $(SOURCES) | Makefile data
+	$(CC) -o $@ $^ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+
 test-%: test-%.o $(OBJECTS) | Makefile data
 	$(CC) -o $@ $^ $(LDFLAGS)
 
@@ -86,10 +91,13 @@ clean-cov:
 clean-data:
 	rm -rf data cio_ra.bin bad-cio-data
 
-.PHONY: clean
-clean: clean-test clean-cov clean-data
+.PHONY: clean-obj
+clean-obj:
 	rm -f *.o
 
+.PHONY: clean
+clean: clean-obj clean-test clean-cov clean-data
+
 
 .PHONY: help
 help:

test/src/test-errors.c

@@ -167,6 +167,28 @@ static int test_refract() {
   return n;
 }
 
+static int test_refract_astro() {
+  on_surface surf = {};
+  int n = 0;
+
+  if(check_nan("refract_astro:converge", refract_astro(&surf, NOVAS_STANDARD_ATMOSPHERE, 85.0))) {
+    if(check("refract_astro:converge:errno", ECANCELED, errno)) n++;
+  }
+
+  return n;
+}
+
+static int test_inv_refract() {
+  on_surface surf = {};
+  int n = 0;
+
+  if(check_nan("inv_refract:converge", novas_inv_refract(novas_optical_refraction, NOVAS_JD_J2000, &surf, NOVAS_REFRACT_OBSERVED, 5.0))) {
+    if(check("inv_refract:converge:errno", ECANCELED, errno)) n++;
+  }
+
+  return n;
+}
+
 static int test_limb_angle() {
   double pos[3] = { 0.01 }, pn[3] = { -0.01 }, pz[3] = {}, a, b;
   int n = 0;
@@ -335,12 +357,16 @@ static int test_radec_planet() {
 }
 
 static int test_mean_star() {
-  double x;
+  double x, y;
   int n = 0;
 
-  if(check("mean_star:ira", -1, mean_star(0.0, 0.0, 0.0, NOVAS_FULL_ACCURACY, NULL, &x))) n++;
+  if(check("mean_star:ira", -1, mean_star(0.0, 0.0, 0.0, NOVAS_FULL_ACCURACY, NULL, &y))) n++;
   if(check("mean_star:idec", -1, mean_star(0.0, 0.0, 0.0, NOVAS_FULL_ACCURACY, &x, NULL))) n++;
 
+  if(check("mean_star:converge", 1, mean_star(NOVAS_JD_J2000, 0.0, 0.0, NOVAS_REDUCED_ACCURACY, &x, &y))) {
+    if(check("mean_star:converge:errno", ECANCELED, errno)) n++;
+  }
+
   return n;
 }
 
@@ -903,6 +929,11 @@ static int test_grav_undo_planets() {
   if(check("grav_undo_planets:pl_pos=pl_vel", -1, grav_undo_planets(p, po, NOVAS_REDUCED_ACCURACY, pl_mask, pb, pb, out))) n++;
   if(check("grav_undo_planets:pos_src", -1, grav_undo_planets(p, po, NOVAS_REDUCED_ACCURACY, pl_mask, pb, vb, NULL))) n++;
 
+  pl_mask = 1 << NOVAS_SUN;
+  if(check("grav_undo_planets:converge", -1, grav_undo_planets(p, po, NOVAS_REDUCED_ACCURACY, pl_mask, pb, vb, out))) {
+    if(check("grav_undo_planets:converge:errno", ECANCELED, errno)) n++;
+  }
+
   return n;
 }
 
@@ -1171,7 +1202,9 @@ static int test_app_to_geom() {
   if(check("app_to_geom:frame:init", -1, novas_app_to_geom(&frame, NOVAS_ICRS, 1.0, 2.0, 10.0, pos))) n++;
 
   novas_make_frame(NOVAS_REDUCED_ACCURACY, &obs, &ts, 0.0, 0.0, &frame);
-  if(check("app_to_geom:frame:ok", 0, novas_app_to_geom(&frame, NOVAS_ICRS, 1.0, 2.0, 10.0, pos))) n++;
+  if(check("app_to_geom:frame:converge", -1, novas_app_to_geom(&frame, NOVAS_ICRS, 1.0, 2.0, 10.0, pos))) {
+    if(check("app_to_geom:frame:converge:errno", ECANCELED, errno)) n++;
+  }
 
   if(check("app_to_geom:pos", -1, novas_app_to_geom(&frame, NOVAS_ICRS, 1.0, 2.0, 10.0, NULL))) n++;
   if(check("app_to_geom:sys:-1", -1, novas_app_to_geom(&frame, -1, 1.0, 2.0, 10.0, pos))) n++;
@@ -1336,6 +1369,8 @@ int main() {
   if(test_transform_hip()) n++;
 
   if(test_refract()) n++;
+  if(test_refract_astro()) n++;
+  if(test_inv_refract()) n++;
   if(test_limb_angle()) n++;
 
   if(test_ephemeris()) n++;