From b121c565add721183d8e13364409b25e4dec6e27 Mon Sep 17 00:00:00 2001 From: Paul Wessel Date: Tue, 6 Nov 2018 16:40:44 -1000 Subject: [PATCH] Less hard-ass in checking for regions Allow a slop up to 10^-4 instead of 10^-8 in w/e/s/n comparisons to fix issue #164 --- src/gmt_nc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gmt_nc.c b/src/gmt_nc.c index f3c74c277a9..af82ab0559d 100644 --- a/src/gmt_nc.c +++ b/src/gmt_nc.c @@ -1279,9 +1279,8 @@ GMT_LOCAL int gmtnc_grd_prep_io (struct GMT_CTRL *GMT, struct GMT_GRID_HEADER *h wesn[XHI] += 360; } } - else - assert ((wesn[XLO]+GMT_CONV8_LIMIT*header->inc[GMT_X]) >= header->wesn[XLO] && (wesn[XHI]-GMT_CONV8_LIMIT*header->inc[GMT_X]) <= header->wesn[XHI]); - //assert (wesn[XLO] >= header->wesn[XLO] && wesn[XHI] <= header->wesn[XHI]); /* Too harsh */ + else /* Apply a 10^-4 times inc sloppiness in the test [it was zero which was too harsh for sloppy grids] */ + assert ((wesn[XLO]+GMT_CONV4_LIMIT*header->inc[GMT_X]) >= header->wesn[XLO] && (wesn[XHI]-GMT_CONV4_LIMIT*header->inc[GMT_X]) <= header->wesn[XHI]); /* Get dimension of subregion */ *width = urint ((wesn[XHI] - wesn[XLO]) * HH->r_inc[GMT_X]) + is_gridline_reg;