Changeset 2093

Show
Ignore:
Timestamp:
05/26/08 12:48:42 (6 months ago)
Author:
gary
Message:

a grid written as the following:

hden vary
grid 5 3 1

stopped in the parser with the error that the increment (1) is greater than the different in the limits. Added fabs to difference to this test now works.

the grid does work, although it does not come out in the expected 5, 4, 3 order. also tested 2d form and this also works, but with parameters sorted into increasing order even when written in decreasing order as above.

this situation is better than it was but perhaps not optical - is anything conceptually wrong with a decreasing loop?

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/source/parse_grid.cpp

    r1842 r2093  
    4949                } 
    5050 
    51                 if( grid.paramIncrements[optimize.nparm-1] > ( optimize.varang[optimize.nparm-1][1] - optimize.varang[optimize.nparm-1][0] ) ) 
     51                if( grid.paramIncrements[optimize.nparm-1] > fabs( optimize.varang[optimize.nparm-1][1] - optimize.varang[optimize.nparm-1][0] ) ) 
    5252                { 
    5353                        fprintf( ioQQQ," The increment (third parameter) must not be greater than the difference between the limits (first and second parameters.\n" );