diff options
author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-12-16 10:19:20 +0000 |
---|---|---|
committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-12-16 10:19:20 +0000 |
commit | 2629e17375cee5c4dcf3495b7ca4249c7e22b523 (patch) | |
tree | cbfe3f79ffd56bf11b41ceeed261864bb192a455 /src/util | |
parent | e87727e709c9bf280b12d5d8f447dfc1ea9930a4 (diff) |
Fix for negative parameters from Eric Schnetter
Cactus/186
Also fix for closed ranges of parameters
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1200 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Misc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/util/Misc.c b/src/util/Misc.c index f4ca28e2..43ef71d7 100644 --- a/src/util/Misc.c +++ b/src/util/Misc.c @@ -450,7 +450,7 @@ int Util_DoubleInRange(double inval, const char *range) else { /* No start range given, so use the smallest float available. */ - start = FLT_MIN; + start = -FLT_MAX; } /* Next find the end of the range */ @@ -494,8 +494,8 @@ int Util_DoubleInRange(double inval, const char *range) end_closed = 1; } - if(inval > start /*+ !start_closed */&& - inval < end /* - !end_closed */ /* && + if(inval >= start /*+ !start_closed */&& + inval <= end /* - !end_closed */ /* && ! ((inval-start) % step)*/) { retval = 1; @@ -965,7 +965,7 @@ int CCTK_RegexMatch(const char *string, /*@@ - @routine getoutpfx + @routine CCTK_FortranString @date Thu Jan 22 14:44:39 1998 @author Paul Walker @desc @@ -974,9 +974,10 @@ int CCTK_RegexMatch(const char *string, @@*/ -void FORTRAN_NAME(CCTK_FortranString)(CCTK_INT *nchar, char **cstring,ONE_FORTSTRING_ARG) +void FORTRAN_NAME(CCTK_FortranString)(CCTK_INT *nchar, + char **cstring, + ONE_FORTSTRING_ARG) { - int i; ONE_FORTSTRING_CREATE(fstring) ONE_FORTSTRING_PTR(fptr) |