Per #2760, move mask_filters.h/.cc from vx_pointdata_python library t…

…o vx_data2d. Note that mask_filters.h/.cc depend on MaskPlane in vx_data2d, Grid in vx_grid, and MaskPoly in vx_util. And the vx_pointdata_python library depends on it. Based on the existing library linking order in the Ensemble-Stat Makefile.am file, this could logically be moved to vx_data2d, vx_nc_obs, vx_seeps, vx_nc_util, or vx_grid. Based on the contents of those libraries, I chose vx_data2d as the best, although not perfect, spot.
dtcenter · Dec 13, 2023 · d95ec29 · d95ec29
1 parent 0ae6c03
commit d95ec29
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1 deletion.
diff --git a/src/libcode/vx_data2d/Makefile.am b/src/libcode/vx_data2d/Makefile.am
@@ -18,6 +18,7 @@ libvx_data2d_a_SOURCES = \
               data_class.cc data_class.h \
               data2d_utils.cc data2d_utils.h \
               table_lookup.cc table_lookup.h \
+              mask_filters.cc mask_filters.h \
               vx_data2d.h
 libvx_data2d_a_CPPFLAGS = ${MET_CPPFLAGS}
 

diff --git a/...bcode/vx_pointdata_python/mask_filters.cc → src/libcode/vx_data2d/mask_filters.cc b/...bcode/vx_pointdata_python/mask_filters.cc → src/libcode/vx_data2d/mask_filters.cc
diff --git a/...ibcode/vx_pointdata_python/mask_filters.h → src/libcode/vx_data2d/mask_filters.h b/...ibcode/vx_pointdata_python/mask_filters.h → src/libcode/vx_data2d/mask_filters.h
diff --git a/src/libcode/vx_data2d/vx_data2d.h b/src/libcode/vx_data2d/vx_data2d.h
@@ -29,6 +29,7 @@
 #include "leveltype_to_string.h"
 #include "var_info.h"
 #include "table_lookup.h"
+#include "mask_filters.h"
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_pointdata_python/Makefile.am b/src/libcode/vx_pointdata_python/Makefile.am
@@ -12,7 +12,6 @@ include ${top_srcdir}/Make-include
 
 noinst_LIBRARIES = libvx_pointdata_python.a
 libvx_pointdata_python_a_SOURCES = \
-              mask_filters.h mask_filters.cc \
               pointdata_python.h pointdata_python.cc \
               pointdata_from_array.h pointdata_from_array.cc pointdata_from_array.hpp \
               python_pointdata.h python_pointdata.cc python_pointdata.hpp