Skip to content

Implemented IGH Oceanic View #2226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rouault merged 24 commits into from
May 19, 2020
Merged

Implemented IGH Oceanic View #2226

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a6b972e
Implemented IGH Oceanic View
jkrasting May 15, 2020
d782832
Fixed table formatting error in igh_o.rst
jkrasting May 15, 2020
b46179a
Added test and image for igh_o projection
jkrasting May 15, 2020
f661d28
Updated igh_o testing values
jkrasting May 15, 2020
9f1d467
Added docstrings igh_o.cpp
jkrasting May 15, 2020
1aaa388
Edits to igh_o test values
jkrasting May 15, 2020
73f5d6f
Updated sign error on some igh_o test values
jkrasting May 15, 2020
4f1fced
Referenced igh_o rst doc file in index
jkrasting May 15, 2020
d34748b
Replaced d4044118 with phi_boundary
jkrasting May 15, 2020
bc96737
Changed int=0 to bool type
jkrasting May 15, 2020
cf4f889
Extended doc updates to igh.cpp
jkrasting May 15, 2020
28acad1
Replaced SETUP macro with setup_zone func
jkrasting May 15, 2020
c32875b
Removed trailing backslashes from setup_zone
jkrasting May 15, 2020
87761d4
Simplified 'struct pj_opaque *Q' call in igh*.cpp
jkrasting May 15, 2020
68e164a
Updated sub-projection boundaries for igh_o
jkrasting May 16, 2020
59813f1
Updated testing values for igh_o
jkrasting May 16, 2020
d2b5171
Fixed typo in plotdefs.json
jkrasting May 16, 2020
b785d2c
Sub-projection tests for igh and igh_o
jkrasting May 18, 2020
640d260
Update test/gie/builtins.gie
jkrasting May 17, 2020
5abdf10
Added roundtrip for igh_o subprojection tests
jkrasting May 18, 2020
93bee75
Updated if tests for bool vs int variables
jkrasting May 18, 2020
bf6a8dc
Changed boundary from zone 3 to zone 4 in igh_o
jkrasting May 18, 2020
a7105e3
Revert "Updated if tests for bool vs int variables"
jkrasting May 18, 2020
4dc21af
Fixed typo in igh_o zone definitions
jkrasting May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 100 additions & 0 deletions test/gie/builtins.gie
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2158,6 +2158,7 @@ expect 135 50
===============================================================================
# Interrupted Goode Homolosine
# PCyl, Sph.
# (Each of the 12 sub-projections tested separately)
===============================================================================

-------------------------------------------------------------------------------
Expand All @@ -2173,6 +2174,31 @@ expect -222857.740596992 111701.072127637
accept -2 -1
expect -223027.866740205 -111701.072127637

accept -100.0 22.0
expect -11170107.212763708 2457423.5868080168
accept -30.0 22.0
expect -2863013.673043605 2457423.586808016
accept -100.0 67.0
expect -11170107.212763708 7205942.523056464
accept -30.0 67.0
expect 17045.719482862 7205942.523056464
accept -160.0 -22.0
expect -17872171.540421933 -2457423.586808016
accept -60.0 -22.0
expect -6702064.327658225 -2457423.586808016
accept 20.0 -22.0
expect 2234021.442552742 -2457423.586808016
accept 140.0 -22.0
expect 15638150.097869191 -2457423.586808016
accept -160.0 -67.0
expect -17872171.540421933 -7205942.523056464
accept -60.0 -67.0
expect -6702064.327658225 -7205942.523056464
accept 20.0 -67.0
expect 2234021.442552742 -7205942.523056464
accept 140.0 -67.0
expect 15638150.097869191 -7205942.523056464

direction inverse
accept 200 100
expect 0.001790489 0.000895247
Expand All @@ -2183,10 +2209,35 @@ expect -0.001790497 0.000895247
accept -200 -100
expect -0.001790496 -0.000895247

accept -100.0 22.0
Copy link
Member

@rouault rouault May 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those points in the inverse direction are all close to lat=lon=0 and not super relevant. I would just remove them completely, but as suggested previously, after each expect statement above add a "roundtrip 1" line, that will check that when using the inverse path the values of expect are back projected to the ones of accept

Copy link
Contributor Author

@jkrasting jkrasting May 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added in the roundtrip option for all zones in my latest commit, but I am seeing failures with infs in zones 11 and 12. I am stumped. Do you see anything obvious with how I implemented the tests?

expect -0.000895247 0.000196954
accept -30.0 22.0
expect -0.000268574 0.000196954
accept -100.0 67.0
expect -0.000895248 0.000599815
accept -30.0 67.0
expect -0.000268576 0.000599815
accept -160.0 -22.0
expect -0.001432395 -0.000196954
accept -60.0 -22.0
expect -0.000537148 -0.000196954
accept 20.0 -22.0
expect 0.000179049 -0.000196954
accept 140.0 -22.0
expect 0.001253345 -0.000196954
accept -160.0 -67.0
expect -0.001432396 -0.000599815
accept -60.0 -67.0
expect -0.000537149 -0.000599815
accept 20.0 -67.0
expect 0.000179048 -0.000599815
accept 140.0 -67.0
expect 0.001253344 -0.000599815

===============================================================================
# Interrupted Goode Homolosine Ocean View
# PCyl, Sph.
# (Each of the 12 sub-projections tested separately)
===============================================================================

-------------------------------------------------------------------------------
Expand All @@ -2202,6 +2253,31 @@ expect -223197.992883418 111701.072127637
accept -2 -1
expect -223027.866740205 -111701.072127637

accept -140.0 22.0
expect -15638150.097869192 2457423.586808016
accept -10.0 22.0
expect -954337.891014535 2457423.586808016
accept 130.0 22.0
expect 14521139.376592822 2457423.586808016
accept -140.0 67.0
expect -15638150.097869191 7205942.523056464
accept -10.0 67.0
expect 5681.906494287 7205942.523056464
accept 130.0 67.0
expect 14521139.376592822 7205942.523056464
accept -110.0 -22.0
expect -12287117.934040081 -2457423.586808016
accept 20.0 -22.0
expect 2234021.442552742 -2457423.586808016
accept 150 -22.0
expect 16755160.819145568 -2457423.586808016
accept -110.0 -67.0
expect -12287117.934040081 -7205942.523056464
accept 20.0 -67.0
expect 2234021.442552742 -7205942.523056464
accept 150 -67.0
expect 16755160.819145564 -7205942.523056464

direction inverse
accept 200 100
expect 0.001790492 0.000895247
Expand All @@ -2212,6 +2288,30 @@ expect -0.001790494 0.000895247
accept -200 -100
expect -0.001790496 -0.000895247

accept -140.0 22.0
expect -0.001253345 0.000196954
accept -10.0 22.0
expect -0.000089525 0.000196954
accept 130.0 22.0
expect 0.001163820 0.000196954
accept -140.0 67.0
expect -0.001253346 0.000599815
accept -10.0 67.0
expect -0.000089525 0.000599815
accept 130.0 67.0
expect 0.001163820 0.000599815
accept -110.0 -22.0
expect -0.000984771 -0.000196954
accept 20.0 -22.0
expect 0.000179049 -0.000196954
accept 150 -22.0
expect 0.001342870 -0.000196954
accept -110.0 -67.0
expect -0.000984772 -0.000599815
accept 20.0 -67.0
expect 0.000179048 -0.000599815
accept 150 -67.0
expect 0.001342869 -0.000599815

===============================================================================
# International Map of the World Polyconic
Expand Down