#2772 Removed python_key_point_data & python_key_point_data_list and …

…replaced them to tmp_point_var_name and tmp_point_data
dtcenter · Jan 29, 2024 · 1cba5ec · 1cba5ec
1 parent 118a2be
commit 1cba5ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/libcode/vx_pointdata_python/python_pointdata.cc b/src/libcode/vx_pointdata_python/python_pointdata.cc
@@ -543,18 +543,18 @@ if ( ! module_obj )  {
 }
 
 bool result = false;
-PyObject *met_point_data = get_python_object(module_obj, python_key_point_data);
+PyObject *met_point_data = get_python_object(module_obj, tmp_point_var_name);
 if ( met_point_data && met_point_data != &_Py_NoneStruct) {
    result = process_point_data(met_point_data, met_pd_out);
 }
 else {
-   PyObject *point_data = get_python_object(module_obj, python_key_point_data_list);
+   PyObject *point_data = get_python_object(module_obj, tmp_point_data);
    if ( point_data && point_data != &_Py_NoneStruct)
       result = process_point_data_list(point_data, met_pd_out, filters);
    else {
       mlog << Warning << "\n" << method_name
-           << "no \"" << python_key_point_data << "\" and \""
-           << python_key_point_data_list << "\" from "
+           << "no \"" << tmp_point_var_name << "\" and \""
+           << tmp_point_data << "\" from "
            << script_name << "\"\n\n";
    }
 }
@@ -626,7 +626,7 @@ if ( ! tmp_dir )  tmp_dir = default_tmp_dir;
 
 path << cs_erase
      << tmp_dir << '/'
-     << tmp_nc_base_name;
+     << tmp_py_base_name;
 
 tmp_nc_path = make_temp_file_name(path.text(), 0);
 
@@ -722,12 +722,12 @@ if ( ! module_obj )  {
    //
 
 
-PyObject *met_point_data = get_python_object(module_obj, python_key_point_data);
+PyObject *met_point_data = get_python_object(module_obj, tmp_point_var_name);
 if ( met_point_data ) {
    process_point_data(met_point_data, met_pd_out);
 }
 else {
-   PyObject *point_data = get_python_object(module_obj, python_key_point_data_list);
+   PyObject *point_data = get_python_object(module_obj, tmp_point_data);
    process_point_data_list(point_data, met_pd_out, filters);
 }
 

diff --git a/src/libcode/vx_pointdata_python/python_pointdata.h b/src/libcode/vx_pointdata_python/python_pointdata.h
@@ -29,9 +29,6 @@ extern "C" {
 
 ////////////////////////////////////////////////////////////////////////
 
-static const char python_key_point_data     [] = "met_point_data";
-static const char python_key_point_data_list[] = "point_data";
-
 static const char python_key_nhdr           [] = "nhdr";
 //static const char python_key_npbhdr         [] = "npbhdr";
 static const char python_use_var_id         [] = "use_var_id";