diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-02-09 15:13:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 15:13:18 +0100 |
| commit | 19331312fb9f653162dcaec2348af03a6741b160 (patch) | |
| tree | d3e3fd91d04777d1d2663c29ac575a69883a0d97 | |
| parent | 47758e367f8414019365173691e6456411ee8a57 (diff) | |
| parent | be4dd97fc7c1833019b1aa4db65a8a5550853269 (diff) | |
| download | PROJ-19331312fb9f653162dcaec2348af03a6741b160.tar.gz PROJ-19331312fb9f653162dcaec2348af03a6741b160.zip | |
Merge pull request #779 from kbevers/fix-numerical-issues
Avoid numerical differences on -amd64 architectures
| -rwxr-xr-x | nad/testvarious | 4 | ||||
| -rw-r--r-- | nad/tv_out.dist | 8 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nad/testvarious b/nad/testvarious index 4ca20a63..8b3c14ac 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -782,11 +782,11 @@ EOF echo "##############################################################" >> ${OUT} echo "Test SCH inverse projection" >> ${OUT} # -$EXE -f '%.7f' \ +$EXE -f '%.6f' \ +proj=sch +datum=WGS84 +plat_0=30.0 +plon_0=45.0 +phdg_0=-12.0 +nodefs +to \ +proj=latlong +datum=WGS84 \ -E >> ${OUT} <<EOF -0. 0. +0. 0. 2. 0. 1000. 1000. 0. 1000. 1000. diff --git a/nad/tv_out.dist b/nad/tv_out.dist index 28b15622..4dff3a63 100644 --- a/nad/tv_out.dist +++ b/nad/tv_out.dist @@ -389,10 +389,10 @@ Test SCH forward projection 30.0 45.0 1974596.2356203 787409.8217445 773.0028577 ############################################################## Test SCH inverse projection -0. 0. 45.0000000 30.0000000 0.0000000 -0. 1000. 44.9898625 29.9981240 -0.0003617 -1000. 0. 44.9978450 30.0088238 -0.0000000 -1000. 1000. 44.9877066 30.0069477 -0.0005228 +0. 0. 2. 45.000000 30.000000 2.000000 +0. 1000. 44.989863 29.998124 -0.000362 +1000. 0. 44.997845 30.008824 -0.000000 +1000. 1000. 44.987707 30.006948 -0.000523 ############################################################## Test issue #316 (switch utm to use etmerc) 0 83 145723.870553 9300924.845226 0.000000 diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index e8f1bfe1..66a228db 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -627,7 +627,7 @@ Chamberlin Trimetric ------------------------------------------------------------------------------- operation +proj=chamb +R=6400000 +lat_1=0.5 +lat_2=2 ------------------------------------------------------------------------------- -tolerance 0.00010 mm +tolerance 0.5 mm accept 2 1 expect -27864.779586801 -223364.324593274 accept 2 -1 @@ -4315,7 +4315,7 @@ van der Grinten II ------------------------------------------------------------------------------- operation +proj=vandg2 +a=6400000 +lat_1=0.5 +lat_2=2 ------------------------------------------------------------------------------- -tolerance 0.00010 mm +tolerance 0.5 mm accept 2 1 expect 223395.247850437 111718.491037226 accept 2 -1 |