Skip to content
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

Expand table-like input options for pygmt.surface #1455

Merged
merged 8 commits into from
Sep 21, 2021
Merged

Expand table-like input options for pygmt.surface #1455

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8897946
Expand table-like input options for pygmt.surface
daroari Aug 19, 2021
c8cfb28
Update pygmt/src/surface.py
daroari Aug 19, 2021
6f05cc8
[format-command] fixes
actions-bot Aug 19, 2021
0eac0eb
Merge branch 'main' into Expand-table-like-input-options-surface
seisman Sep 20, 2021
3c74ccb
Remove unused imports and variables
seisman Sep 21, 2021
e5d25e4
Merge branch 'main' into Expand-table-like-input-options-surface
seisman Sep 21, 2021
f3510ff
Update docstring for data
seisman Sep 21, 2021
b407721
Remove unused imports
seisman Sep 21, 2021
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
12 changes: 4 additions & 8 deletions pygmt/src/surface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,10 @@ def surface(x=None, y=None, z=None, data=None, **kwargs):

with GMTTempFile(suffix=".nc") as tmpfile:
with Session() as lib:
if kind == "file":
file_context = dummy_context(data)
elif kind == "matrix":
file_context = lib.virtualfile_from_matrix(data)
elif kind == "vectors":
file_context = lib.virtualfile_from_vectors(x, y, z)
else:
raise GMTInvalidInput("Unrecognized data type: {}".format(type(data)))
# Choose how data will be passed into the module
file_context = lib.virtualfile_from_data(
check_kind="vector", data=data, x=x, y=y, z=z
)
with file_context as infile:
if "G" not in kwargs.keys(): # if outfile is unset, output to tmpfile
kwargs.update({"G": tmpfile.name})
Expand Down