Skip to content

Wrap grd2cpt#803

Merged
willschlitzer merged 76 commits intoGenericMappingTools:masterfrom
willschlitzer:wrap-grd2cpt
Feb 12, 2021
Merged

Wrap grd2cpt#803
willschlitzer merged 76 commits intoGenericMappingTools:masterfrom
willschlitzer:wrap-grd2cpt

Conversation

@willschlitzer
Copy link
Copy Markdown
Contributor

@willschlitzer willschlitzer commented Jan 23, 2021

Wraps the GMT function grd2cpt. Code and documentation borrowed heavily from grdcut and makecpt.

@willschlitzer
Add cyl_transverse_mercator.py
27f5d20
@willschlitzer
Add cyl_universal_transverse_mercator.py
d64983f
@willschlitzer
Changing land color to red in cyl_mercator.py to match GMT docs examp…
6ba8185 
…le; changing units from US to SI
@willschlitzer
Merge branch 'master' into cylindrical-projections
76850ee
@willschlitzer
Merge branch 'master' of https://github.com/GenericMappingTools/pygmt
48431db 
# Conflicts:
#	examples/projections/cyl/cyl_transverse_mercator.py
#	examples/projections/cyl/cyl_universal_transverse_mercator.py
@willschlitzer
Merge branch 'master' of https://github.com/GenericMappingTools/pygmt
01052d2
@willschlitzer
Merge remote-tracking branch 'origin/master'
c710988
@willschlitzer
Merge branch 'master' of https://github.com/GenericMappingTools/pygmt
b94e0a2
@willschlitzer
Merge branch 'master' of https://github.com/GenericMappingTools/pygmt
413fec1
@willschlitzer
Merge branch 'master' of https://github.com/GenericMappingTools/pygmt
be51e2c
@willschlitzer
Wrap grd2cpt and add it to pygmt init file
d0d697e
@willschlitzer willschlitzer added the feature Brand new feature label Jan 23, 2021
@willschlitzer willschlitzer added this to the 0.3.0 milestone Jan 23, 2021
@willschlitzer
Copy link
Copy Markdown
Contributor Author

willschlitzer commented Jan 23, 2021

Screenshot from 2021-01-23 16-17-57
For reasons I'm not sure, I'm getting a GMTImageComparisonFailure: images not close error when I run test_grd2cpt_grdimage. I'm confused because the code for both fig_ref and fig_test are identical (as I copy and pasted to make sure I didn't have a typo). When I ran the same code in a Jupyter notebook, I also had images that looked very different. Any idea what is causing this inconsistency?

@seisman
Copy link
Copy Markdown
Member

seisman commented Jan 23, 2021

I haven't checked it carefully, but it may be related to #372

@willschlitzer
Copy link
Copy Markdown
Contributor Author

willschlitzer commented Feb 10, 2021

I'm fine with deleting tests. I was mostly copying the format of test_makecpt.py, since that seems like the most similar module.

@seisman
Copy link
Copy Markdown
Member

seisman commented Feb 10, 2021

I'm fine with deleting tests. I was mostly copying the format of test_makecpt.py, since that seems like the most similar module.

Some of the makecpt tests make sense because they're using @pytest.mark.mpl_image_compare. I think we need to think more about these tests.

@weiji14 As you wrote the makecpt wrapper, I'll let you decide what to do.

seisman
seisman reviewed Feb 11, 2021
View reviewed changes
Comment thread pygmt/tests/test_grd2cpt.py Outdated
seisman
seisman reviewed Feb 12, 2021
View reviewed changes
Comment thread pygmt/tests/test_grd2cpt.py Outdated
@willschlitzer @seisman
Update pygmt/tests/test_grd2cpt.py
ea4244b 
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
weiji14
weiji14 reviewed Feb 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

Just a few minor comments, getting close!

Comment thread pygmt/src/grd2cpt.py Outdated
Comment thread pygmt/src/grd2cpt.py Outdated
Comment thread pygmt/src/grd2cpt.py Outdated
willschlitzer and others added 2 commits February 12, 2021 08:30
@willschlitzer @weiji14
Apply suggestions from code review
ecb7fdc 
Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
@willschlitzer
Add string input in overrule_bg docstring in makecpt.py
e0fd4ab
weiji14
weiji14 approved these changes Feb 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

Great! Thanks for your patience @willschlitzer, and also thank you @seisman for the comprehensive review!

@willschlitzer willschlitzer merged commit 2efcbba into GenericMappingTools:master Feb 12, 2021
@willschlitzer willschlitzer deleted the wrap-grd2cpt branch February 12, 2021 10:43
sixy6e pushed a commit to sixy6e/pygmt that referenced this pull request Dec 21, 2022
@willschlitzer @weiji14 @seisman
Wrap grd2cpt (GenericMappingTools#803)
c91e8fc 
*Wrap grd2cpt function
*Add tests for grd2cpt function
*Modify docstring in makecpt function

Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
@seisman seisman mentioned this pull request Apr 11, 2026
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@seisman seisman seisman left review comments

@weiji14 weiji14 weiji14 approved these changes

Assignees

No one assigned

Labels

feature Brand new feature

Projects

None yet

Milestone

0.3.0

Development

Successfully merging this pull request may close these issues.

4 participants

@willschlitzer @seisman @weiji14 @lhoupert