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

Jump to bottom

Bugfix #2575 develop python_convert #2576

Merged
merged 2 commits into from
Jun 15, 2023
Merged

Bugfix #2575 develop python_convert #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b44837
Per #2575, port the fix over to develop branch
JohnHalleyGotway Jun 14, 2023
fdead17
Per #2575, update the MET-11.1.0-rc1 release notes and release date.
JohnHalleyGotway Jun 14, 2023
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
3 changes: 2 additions & 1 deletion docs/Users_Guide/release-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ When applicable, release notes are followed by the GitHub issue number which des
enhancement, or new feature (`MET GitHub issues <https://github.com/dtcenter/MET/issues>`_).
Important issues are listed **in bold** for emphasis.

MET Version 11.1.0-rc1 release notes (20230614)
MET Version 11.1.0-rc1 release notes (20230615)
-----------------------------------------------

.. dropdown:: Repository, build, and test
Expand Down Expand Up @@ -50,6 +50,7 @@ MET Version 11.1.0-rc1 release notes (20230614)
* Bugfix: Fix the Clang compilation of MET version 11 (`#2514 <https://github.com/dtcenter/MET/issues/2514>`_).
* Bugfix: Fix the fill value setting used in the write_tmp_dataplane internal Python embedding script (`#2525 <https://github.com/dtcenter/MET/issues/2525>`_).
* Bugfix: Fix the TC-Stat RIRW runtime error when computing CTS statistics from an empty contingency table (`#2542 <https://github.com/dtcenter/MET/issues/2542>`_).
* Bugfix: Fix logic for Python embedding with data censoring and/or conversion (`#2575 <https://github.com/dtcenter/MET/issues/2575>`_).

MET Version 11.1.0-beta2 release notes (20230505)
-------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
verinfo = version
release = f'{version}'
release_year = '2023'
release_date = f'{release_year}-06-14'
release_date = f'{release_year}-06-15'
copyright = f'{release_year}, {author}'

# -- General configuration ---------------------------------------------------
Expand Down
21 changes: 16 additions & 5 deletions src/libcode/vx_data2d_python/data2d_python.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,16 +360,20 @@ if ( PythonCommand.empty() || PythonCommand != vinfo.req_name() ) {

}

if ( status ) status = process_data_plane(&vinfo, Plane);
if ( status ) {

plane = Plane;

status = process_data_plane(&vinfo, plane);

}

if ( !status ) return ( false );

//
// ok
//

plane = Plane;

//
// store the VarInfo metadata without completely overwritting it
//
Expand All @@ -393,6 +397,7 @@ int MetPythonDataFile::data_plane_array(VarInfo &vinfo, DataPlaneArray &plane_ar
{

bool status = true;
DataPlane plane;

//
// the python command is specified by VarInfo::Name
Expand Down Expand Up @@ -421,7 +426,13 @@ if ( PythonCommand.empty() || PythonCommand != vinfo.req_name() ) {

}

if ( status ) status = process_data_plane(&vinfo, Plane);
if ( status ) {

plane = Plane;

status = process_data_plane(&vinfo, plane);

}

if ( !status ) return ( 0 );

Expand All @@ -431,7 +442,7 @@ if ( !status ) return ( 0 );

plane_array.clear();

plane_array.add(Plane, 0.0, 0.0);
plane_array.add(plane, 0.0, 0.0);

//
// store the VarInfo metadata without completely overwritting it
Expand Down