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

Feature 1473 python errors #1615

Merged
merged 9 commits into from
Jan 25, 2021
Merged

Feature 1473 python errors #1615

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f98bdbd
Added sample script to read ascii data and create an xarray.
Dec 21, 2020
a6475fc
Disabled use_xarray exit for testing.
Dec 21, 2020
3fcb7cd
Get attrs from DataArray if using xarray.
Dec 28, 2020
ea23872
Merge branch 'feature_1534_xarray' into feature_1473_python_errors
Dec 29, 2020
08260ae
Removed some comments.
Dec 29, 2020
1a0b53c
Revised error messages for use with both numpy and xarray.
Dec 29, 2020
5a1a196
Removing commented out code.
JohnHalleyGotway Dec 29, 2020
e2307e8
Merge branch 'feature_1534_xarray' into feature_1473_python_errors
Jan 5, 2021
8505a34
Resolve conflicts with develop branch.
Jan 25, 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
8 changes: 4 additions & 4 deletions met/src/libcode/vx_data2d_python/dataplane_from_numpy_array.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ int nrows, ncols, Nx, Ny;

if ( np.n_dims() != 2 ) {

mlog << Error << "\ndataplane_from_numpy_array() -> "
<< "numpy array is not 2-dimensional! ... "
mlog << Error << "\ndataplane_from_data_array() -> "
<< "data array is not 2-dimensional! ... "
<< "(dim = " << (np.n_dims()) << ")\n\n";

exit ( 1 );
Expand Down Expand Up @@ -170,8 +170,8 @@ else if ( dtype == ">f8" ) load_numpy <double> (np.buffer(), Nx, Ny, bi

else {

mlog << Error << "\ndataplane_from_numpy_array() -> "
<< "unsupported numpy data type \"" << dtype << "\"\n\n";
mlog << Error << "\ndataplane_from_data_array() -> "
<< "unsupported data type \"" << dtype << "\"\n\n";

exit ( 1 );

Expand Down