From 9b44837b070d7835c6088746c9392430ef7fc049 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Wed, 14 Jun 2023 16:41:26 -0600 Subject: [PATCH 1/2] Per #2575, port the fix over to develop branch --- src/libcode/vx_data2d_python/data2d_python.cc | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/libcode/vx_data2d_python/data2d_python.cc b/src/libcode/vx_data2d_python/data2d_python.cc index 5e07656e95..9251fb0d21 100644 --- a/src/libcode/vx_data2d_python/data2d_python.cc +++ b/src/libcode/vx_data2d_python/data2d_python.cc @@ -360,7 +360,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 ( false ); @@ -368,8 +374,6 @@ if ( !status ) return ( false ); // ok // -plane = Plane; - // // store the VarInfo metadata without completely overwritting it // @@ -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 @@ -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 ); @@ -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 From fdead17ed71c24b260bf52d06a4d9a34d58d760c Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Wed, 14 Jun 2023 16:43:38 -0600 Subject: [PATCH 2/2] Per #2575, update the MET-11.1.0-rc1 release notes and release date. --- docs/Users_Guide/release-notes.rst | 3 ++- docs/conf.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst index c38bc7ce89..a82082c86a 100644 --- a/docs/Users_Guide/release-notes.rst +++ b/docs/Users_Guide/release-notes.rst @@ -9,7 +9,7 @@ When applicable, release notes are followed by the GitHub issue number which des enhancement, or new feature (`MET GitHub 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 @@ -50,6 +50,7 @@ MET Version 11.1.0-rc1 release notes (20230614) * Bugfix: Fix the Clang compilation of MET version 11 (`#2514 `_). * Bugfix: Fix the fill value setting used in the write_tmp_dataplane internal Python embedding script (`#2525 `_). * Bugfix: Fix the TC-Stat RIRW runtime error when computing CTS statistics from an empty contingency table (`#2542 `_). + * Bugfix: Fix logic for Python embedding with data censoring and/or conversion (`#2575 `_). MET Version 11.1.0-beta2 release notes (20230505) ------------------------------------------------- diff --git a/docs/conf.py b/docs/conf.py index 70cc0b28fd..7213e62693 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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 ---------------------------------------------------