From 8c0136a5b79ff50f80ee2aec1f66311ecb4123f6 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 29 Dec 2023 20:04:10 +0000 Subject: [PATCH 1/6] Per #2776, delete stale prob_pair_info.h/.cc, wwmca_utils.h/.cc, and rmw_analysis_utils.h/.cc files that were not being compiled by their Makefiles. --- src/libcode/vx_tc_util/prob_pair_info.cc | 225 ------------------ src/libcode/vx_tc_util/prob_pair_info.h | 81 ------- src/tools/other/wwmca_tool/wwmca_utils.cc | 181 -------------- src/tools/other/wwmca_tool/wwmca_utils.h | 77 ------ .../rmw_analysis/rmw_analysis_utils.cc | 6 - .../rmw_analysis/rmw_analysis_utils.h | 1 - 6 files changed, 571 deletions(-) delete mode 100644 src/libcode/vx_tc_util/prob_pair_info.cc delete mode 100644 src/libcode/vx_tc_util/prob_pair_info.h delete mode 100644 src/tools/other/wwmca_tool/wwmca_utils.cc delete mode 100644 src/tools/other/wwmca_tool/wwmca_utils.h delete mode 100644 src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.cc delete mode 100644 src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.h diff --git a/src/libcode/vx_tc_util/prob_pair_info.cc b/src/libcode/vx_tc_util/prob_pair_info.cc deleted file mode 100644 index 754ba05df2..0000000000 --- a/src/libcode/vx_tc_util/prob_pair_info.cc +++ /dev/null @@ -1,225 +0,0 @@ -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* -// ** Copyright UCAR (c) 1992 - 2023 -// ** University Corporation for Atmospheric Research (UCAR) -// ** National Center for Atmospheric Research (NCAR) -// ** Research Applications Lab (RAL) -// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* - -//////////////////////////////////////////////////////////////////////// - -using namespace std; - -#include -#include -#include -#include -#include -#include - -#include "prob_pair_info_base.h" -#include "prob_rirw_pair_info.h" -#include "prob_pair_info_array.h" - -//////////////////////////////////////////////////////////////////////// -// -// Code for class ProbPairInfoArray -// -//////////////////////////////////////////////////////////////////////// - -ProbPairInfoArray::ProbPairInfoArray() { - - init_from_scratch(); -} - -//////////////////////////////////////////////////////////////////////// - -ProbPairInfoArray::~ProbPairInfoArray() { - - clear(); -} - -//////////////////////////////////////////////////////////////////////// - -ProbPairInfoArray::ProbPairInfoArray(const ProbPairInfoArray & t) { - - init_from_scratch(); - - assign(t); -} - -//////////////////////////////////////////////////////////////////////// - -ProbPairInfoArray & ProbPairInfoArray::operator=(const ProbPairInfoArray & t) { - - if(this == &t) return(*this); - - assign(t); - - return(*this); -} - -//////////////////////////////////////////////////////////////////////// - -void ProbPairInfoArray::init_from_scratch() { - - clear(); - - return; -} - -//////////////////////////////////////////////////////////////////////// - -void ProbPairInfoArray::clear() { - - // Deallocate memory for each entry - for(int i=0; idump(out, indent_depth+1); - } - - out << flush; - - return; -} - -//////////////////////////////////////////////////////////////////////// - -ConcatString ProbPairInfoArray::serialize() const { - ConcatString s; - - s << "ProbPairInfoArray: " - << "NPairs = " << n_pairs(); - - return(s); -} - -//////////////////////////////////////////////////////////////////////// - -ConcatString ProbPairInfoArray::serialize_r(int indent_depth) const { - Indent prefix(indent_depth); - ConcatString s; - - s << prefix << serialize() << ", Pairs:\n"; - - for(int i=0; iserialize_r(i+1, indent_depth+1); - } - - return(s); -} - -//////////////////////////////////////////////////////////////////////// - -void ProbPairInfoArray::assign(const ProbPairInfoArray &p) { - - clear(); - - // Allocate space and copy each element - for(int i=0; itype())); - *(Pair[i]) = *(p.Pair[i]); - } - - return; -} - -//////////////////////////////////////////////////////////////////////// - -const ProbPairInfoBase * ProbPairInfoArray::operator[](int n) const { - - // Check range - if((n < 0) || (n >= Pair.size())) { - mlog << Error - << "\nProbPairInfoArray::operator[](int) -> " - << "range check error for index value " << n << "\n\n"; - exit(1); - } - - return(Pair[n]); -} - -//////////////////////////////////////////////////////////////////////// - -bool ProbPairInfoArray::add(const ATCFProbLine &l, bool check_dup) { - - // Check for no pairs or a mismatch with the latest entry - if( Pair.size() == 0 || - (Pair.size() > 0 && !Pair[Pair.size()-1]->add(l, check_dup))) { - - // Allocate and store new pair - Pair.push_back(new_prob_pair(l.type())); - - // Add current line to new pair - if(!Pair[Pair.size()-1]->add(l, check_dup)) { - mlog << Warning - << "\nbool ProbPairInfoArray::add(const ATCFProbLine &l, bool check_dup) -> " - << "cannot store ATCFProbLine:\n" << l.get_line() << "\n\n"; - return(false); - } - } - - return(true); -} - -//////////////////////////////////////////////////////////////////////// - -bool ProbPairInfoArray::add(const ProbPairInfoBase *p) { - ProbPairInfoBase *new_pair; - - // Allocate new pair, set its value, and store it - new_pair = new_prob_pair(p->type()); - *(new_pair) = *(p); - Pair.push_back(new_pair); - - return(true); -} - -//////////////////////////////////////////////////////////////////////// - -ProbPairInfoBase * new_prob_pair(const ATCFLineType t) { - ProbPairInfoBase *new_pair = (ProbPairInfoBase *) 0; - - switch(t) { - case ATCFLineType_ProbRI: - new_pair = new ProbRIRWPairInfo; - break; - - default: - mlog << Warning - << "\nProbPairInfoBase * new_prob_pair(const ATCFLineType t) -> " - << "unexpected ATCF line type (" - << atcflinetype_to_string(t) << ")\n\n"; - break; - } - - if(!new_pair) { - mlog << Error - << "\nProbPairInfoBase * new_prob_pair(const ATCFLineType t) -> " - << "memory allocation error!\n\n"; - exit(1); - } - - return(new_pair); -} - -//////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_tc_util/prob_pair_info.h b/src/libcode/vx_tc_util/prob_pair_info.h deleted file mode 100644 index e83626527d..0000000000 --- a/src/libcode/vx_tc_util/prob_pair_info.h +++ /dev/null @@ -1,81 +0,0 @@ -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* -// ** Copyright UCAR (c) 1992 - 2023 -// ** University Corporation for Atmospheric Research (UCAR) -// ** National Center for Atmospheric Research (NCAR) -// ** Research Applications Lab (RAL) -// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* - -//////////////////////////////////////////////////////////////////////// - -#ifndef __VX_PROB_PAIR_INFO_H__ -#define __VX_PROB_PAIR_INFO_H__ - -//////////////////////////////////////////////////////////////////////// - -#include -#include - -#include "atcf_prob_line.h" -#include "prob_info_array.h" - -#include "vx_util.h" - -//////////////////////////////////////////////////////////////////////// -// -// ProbPairInfo class stores a ProbInfoBase class pointer and a -// verifying -// -//////////////////////////////////////////////////////////////////////// - -class ProbPairInfo { - - protected: - - void init_from_scratch(); - void assign(const ProbPairInfo &); - - vector Pair; - - public: - - ProbPairInfo(); - ~ProbPairInfo(); - ProbPairInfo(const ProbPairInfo &); - ProbPairInfo & operator=(const ProbPairInfo &); - - void clear(); - - void dump(std::ostream &, int = 0) const; - ConcatString serialize() const; - ConcatString serialize_r(int = 0) const; - - // - // get stuff - // - - const ProbPairInfoBase * operator[](int) const; - int n_pairs() const; - - // - // do stuff - // - - bool add(const ATCFProbLine &, bool check_dup = false); - bool add(const ProbPairInfoBase *); - -}; - -//////////////////////////////////////////////////////////////////////// - -inline int ProbPairInfo::n_pairs() const { return(Pair.size()); } - -//////////////////////////////////////////////////////////////////////// - -extern ProbPairInfoBase * new_prob_pair(const ATCFLineType); - -//////////////////////////////////////////////////////////////////////// - -#endif /* __VX_PROB_PAIR_INFO_H__ */ - -//////////////////////////////////////////////////////////////////////// diff --git a/src/tools/other/wwmca_tool/wwmca_utils.cc b/src/tools/other/wwmca_tool/wwmca_utils.cc deleted file mode 100644 index 2be5deb979..0000000000 --- a/src/tools/other/wwmca_tool/wwmca_utils.cc +++ /dev/null @@ -1,181 +0,0 @@ -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* -// ** Copyright UCAR (c) 1992 - 2023 -// ** University Corporation for Atmospheric Research (UCAR) -// ** National Center for Atmospheric Research (NCAR) -// ** Research Applications Lab (RAL) -// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* - - -//////////////////////////////////////////////////////////////////////// - - -static const bool west_longitude_positive = true; - - -//////////////////////////////////////////////////////////////////////// - - -using namespace std; - -#include -#include -#include -#include -#include - -#include "wwmca_utils.h" - - -//////////////////////////////////////////////////////////////////////// - - -GridHemisphere find_grid_hemisphere(const Grid & grid) - -{ - -int j; -double x, y, lat, lon; -bool nh = false; -bool sh = false; -const int Nx = grid.nx(); -const int Ny = grid.ny(); - - // - // bottom, top - // - -for (j=0; j 0.0 ) nh = true; - if ( lat < 0.0 ) sh = true; - - grid.xy_to_latlon(x, Ny - 1.0, lat, lon); - - if ( lat > 0.0 ) nh = true; - if ( lat < 0.0 ) sh = true; - -} - -if ( nh && sh ) return ( both_hemispheres ); - - // - // left, right - // - -for (j=0; j 0.0 ) nh = true; - if ( lat < 0.0 ) sh = true; - - grid.xy_to_latlon(Nx - 1.0, y, lat, lon); - - if ( lat > 0.0 ) nh = true; - if ( lat < 0.0 ) sh = true; - -} - -if ( nh && sh ) return ( both_hemispheres ); - -if ( nh ) return ( north_hemisphere ); -if ( sh ) return ( south_hemisphere ); - - // - // done - // - -return ( no_hemisphere ); // this shouldn't happen - -} - - -//////////////////////////////////////////////////////////////////////// - - -Interpolator * get_interpolator(wwmca_regrid_Conf & config) - -{ - -int width, good_percent; -int n_good_needed; -ConcatString method; -Ave_Interp ave; -Nearest_Interp nearest; -Min_Interp mini; -Max_Interp maxi; - - -width = config.interp_width(); - -good_percent = config.good_percent(); - -n_good_needed = nint(ceil(0.01*good_percent*width)); - -method = (const char *) config.interp_method(); - - // - // get to work - // - -if ( method == "average" ) { - - ave.set_size(width); - - ave.set_ngood_needed(n_good_needed); - - return ( ave.copy() ); - -} - - -if ( method == "nearest" ) { - - nearest.set_size(width); - - nearest.set_ngood_needed(n_good_needed); - - return ( nearest.copy() ); - -} - - -if ( method == "min" ) { - - mini.set_size(width); - - mini.set_ngood_needed(n_good_needed); - - return ( mini.copy() ); - -} - - -if ( method == "max" ) { - - maxi.set_size(width); - - maxi.set_ngood_needed(n_good_needed); - - return ( maxi.copy() ); - -} - - - // - // nope - // - -return ( (Interpolator *) 0 ); - -} - - -//////////////////////////////////////////////////////////////////////// diff --git a/src/tools/other/wwmca_tool/wwmca_utils.h b/src/tools/other/wwmca_tool/wwmca_utils.h deleted file mode 100644 index 3728c9ae81..0000000000 --- a/src/tools/other/wwmca_tool/wwmca_utils.h +++ /dev/null @@ -1,77 +0,0 @@ -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* -// ** Copyright UCAR (c) 1992 - 2023 -// ** University Corporation for Atmospheric Research (UCAR) -// ** National Center for Atmospheric Research (NCAR) -// ** Research Applications Lab (RAL) -// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA -// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* - - -//////////////////////////////////////////////////////////////////////// - - -#ifndef __WWMCA_UTILS_H__ -#define __WWMCA_UTILS_H__ - - -//////////////////////////////////////////////////////////////////////// - - -#include "wwmca_regrid_Conf.h" - -#include "interp_base.h" -#include "max_interp.h" -#include "min_interp.h" -#include "ave_interp.h" -#include "nearest_interp.h" - -#include "vx_grid.h" - - -//////////////////////////////////////////////////////////////////////// - - - // - // Is the given grid confined to either the north - // - // or south hemisphere, or does it straddle the - // - // equator? - // - - -extern GridHemisphere find_grid_hemisphere(const Grid &); - - -//////////////////////////////////////////////////////////////////////// - - - // - // Create an interpolator instance given the info - // - // from the config file - // - - -extern Interpolator * get_interpolator(wwmca_regrid_Conf &); - - -//////////////////////////////////////////////////////////////////////// - - - // - // Create the "to" grid from the grid info string in the config file - // - -// extern GridInfo get_grid(const char * gridinfo_string); - - -//////////////////////////////////////////////////////////////////////// - - -#endif /* __WWMCA_UTILS_H__ */ - - -//////////////////////////////////////////////////////////////////////// - - diff --git a/src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.cc b/src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.cc deleted file mode 100644 index c06c7b219a..0000000000 --- a/src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include "rmw_analysis_utils.h" - -bool filter_track_point() { - - return true; -} diff --git a/src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.h b/src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.h deleted file mode 100644 index 217a08f9c1..0000000000 --- a/src/tools/tc_utils/rmw_analysis/rmw_analysis_utils.h +++ /dev/null @@ -1 +0,0 @@ -bool filter_track_point(); From e95fe8a259595d499ce5067f6b3711292349eddd Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 29 Dec 2023 20:05:13 +0000 Subject: [PATCH 2/6] Per #2776, update Makefile to compile the test_read_rmw utility. --- .../test_util/libcode/vx_tc_util/.gitignore | 3 +- .../test_util/libcode/vx_tc_util/Makefile.am | 39 +++++++++- .../test_util/libcode/vx_tc_util/Makefile.in | 77 ++++++++++++++++++- .../libcode/vx_tc_util/test_read_rmw.cc | 3 + 4 files changed, 116 insertions(+), 6 deletions(-) diff --git a/internal/test_util/libcode/vx_tc_util/.gitignore b/internal/test_util/libcode/vx_tc_util/.gitignore index b5e28af92c..635d358e43 100644 --- a/internal/test_util/libcode/vx_tc_util/.gitignore +++ b/internal/test_util/libcode/vx_tc_util/.gitignore @@ -1,5 +1,6 @@ -test_read_prob test_read +test_read_prob +test_read_rmw *.o *.a .deps diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.am b/internal/test_util/libcode/vx_tc_util/Makefile.am index 1aca803372..6c19dad86e 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.am +++ b/internal/test_util/libcode/vx_tc_util/Makefile.am @@ -15,7 +15,8 @@ endif # Test programs noinst_PROGRAMS = test_read \ - test_read_prob + test_read_prob \ + test_read_rmw test_read_SOURCES = test_read.cc test_read_CPPFLAGS = ${MET_CPPFLAGS} @@ -88,3 +89,39 @@ test_read_prob_LDADD = -lvx_stat_out \ -lvx_log \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util +test_read_rmw_SOURCES = test_read_rmw.cc +test_read_rmw_CPPFLAGS = ${MET_CPPFLAGS} +test_read_rmw_LDFLAGS = -L. ${MET_LDFLAGS} +test_read_rmw_LDADD = -lvx_stat_out \ + -lvx_statistics \ + -lvx_shapedata \ + -lvx_gsl_prob \ + -lvx_analysis_util \ + -lvx_tc_util \ + -lvx_shapedata \ + -lvx_util_math \ + -lvx_util \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_statistics \ + -lvx_data2d_factory \ + -lvx_data2d_nc_met \ + -lvx_data2d_nc_pinterp \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_data2d_nccf \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d \ + -lvx_nc_util \ + -lvx_regrid \ + -lvx_grid \ + -lvx_geodesy \ + -lvx_config \ + -lvx_gsl_prob \ + -lvx_cal \ + -lvx_nav \ + -lvx_util_math \ + -lvx_util \ + -lvx_math \ + -lvx_color \ + -lvx_log \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index 9ba04b2a14..ed6e1a58d6 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -89,7 +89,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @ENABLE_PYTHON_TRUE@am__append_1 = -lvx_python3_utils -noinst_PROGRAMS = test_read$(EXEEXT) test_read_prob$(EXEEXT) +noinst_PROGRAMS = test_read$(EXEEXT) test_read_prob$(EXEEXT) \ + test_read_rmw$(EXEEXT) subdir = internal/test_util/libcode/vx_tc_util ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -117,6 +118,14 @@ test_read_prob_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) test_read_prob_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_prob_LDFLAGS) $(LDFLAGS) -o $@ +am_test_read_rmw_OBJECTS = test_read_rmw-test_read_rmw.$(OBJEXT) +test_read_rmw_OBJECTS = $(am_test_read_rmw_OBJECTS) +test_read_rmw_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +test_read_rmw_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(test_read_rmw_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -133,7 +142,8 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/test_read-test_read.Po \ - ./$(DEPDIR)/test_read_prob-test_read_prob.Po + ./$(DEPDIR)/test_read_prob-test_read_prob.Po \ + ./$(DEPDIR)/test_read_rmw-test_read_rmw.Po am__mv = mv -f AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -152,8 +162,10 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(test_read_SOURCES) $(test_read_prob_SOURCES) -DIST_SOURCES = $(test_read_SOURCES) $(test_read_prob_SOURCES) +SOURCES = $(test_read_SOURCES) $(test_read_prob_SOURCES) \ + $(test_read_rmw_SOURCES) +DIST_SOURCES = $(test_read_SOURCES) $(test_read_prob_SOURCES) \ + $(test_read_rmw_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -408,6 +420,42 @@ test_read_prob_LDADD = -lvx_stat_out \ -lvx_log \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util +test_read_rmw_SOURCES = test_read_rmw.cc +test_read_rmw_CPPFLAGS = ${MET_CPPFLAGS} +test_read_rmw_LDFLAGS = -L. ${MET_LDFLAGS} +test_read_rmw_LDADD = -lvx_stat_out \ + -lvx_statistics \ + -lvx_shapedata \ + -lvx_gsl_prob \ + -lvx_analysis_util \ + -lvx_tc_util \ + -lvx_shapedata \ + -lvx_util_math \ + -lvx_util \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_statistics \ + -lvx_data2d_factory \ + -lvx_data2d_nc_met \ + -lvx_data2d_nc_pinterp \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_data2d_nccf \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d \ + -lvx_nc_util \ + -lvx_regrid \ + -lvx_grid \ + -lvx_geodesy \ + -lvx_config \ + -lvx_gsl_prob \ + -lvx_cal \ + -lvx_nav \ + -lvx_util_math \ + -lvx_util \ + -lvx_math \ + -lvx_color \ + -lvx_log \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + all: all-am .SUFFIXES: @@ -453,6 +501,10 @@ test_read_prob$(EXEEXT): $(test_read_prob_OBJECTS) $(test_read_prob_DEPENDENCIES @rm -f test_read_prob$(EXEEXT) $(AM_V_CXXLD)$(test_read_prob_LINK) $(test_read_prob_OBJECTS) $(test_read_prob_LDADD) $(LIBS) +test_read_rmw$(EXEEXT): $(test_read_rmw_OBJECTS) $(test_read_rmw_DEPENDENCIES) $(EXTRA_test_read_rmw_DEPENDENCIES) + @rm -f test_read_rmw$(EXEEXT) + $(AM_V_CXXLD)$(test_read_rmw_LINK) $(test_read_rmw_OBJECTS) $(test_read_rmw_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -461,6 +513,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_read-test_read.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_read_prob-test_read_prob.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_read_rmw-test_read_rmw.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -510,6 +563,20 @@ test_read_prob-test_read_prob.obj: test_read_prob.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_read_prob_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_read_prob-test_read_prob.obj `if test -f 'test_read_prob.cc'; then $(CYGPATH_W) 'test_read_prob.cc'; else $(CYGPATH_W) '$(srcdir)/test_read_prob.cc'; fi` +test_read_rmw-test_read_rmw.o: test_read_rmw.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_read_rmw_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_read_rmw-test_read_rmw.o -MD -MP -MF $(DEPDIR)/test_read_rmw-test_read_rmw.Tpo -c -o test_read_rmw-test_read_rmw.o `test -f 'test_read_rmw.cc' || echo '$(srcdir)/'`test_read_rmw.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_read_rmw-test_read_rmw.Tpo $(DEPDIR)/test_read_rmw-test_read_rmw.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_read_rmw.cc' object='test_read_rmw-test_read_rmw.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_read_rmw_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_read_rmw-test_read_rmw.o `test -f 'test_read_rmw.cc' || echo '$(srcdir)/'`test_read_rmw.cc + +test_read_rmw-test_read_rmw.obj: test_read_rmw.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_read_rmw_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_read_rmw-test_read_rmw.obj -MD -MP -MF $(DEPDIR)/test_read_rmw-test_read_rmw.Tpo -c -o test_read_rmw-test_read_rmw.obj `if test -f 'test_read_rmw.cc'; then $(CYGPATH_W) 'test_read_rmw.cc'; else $(CYGPATH_W) '$(srcdir)/test_read_rmw.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_read_rmw-test_read_rmw.Tpo $(DEPDIR)/test_read_rmw-test_read_rmw.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_read_rmw.cc' object='test_read_rmw-test_read_rmw.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_read_rmw_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_read_rmw-test_read_rmw.obj `if test -f 'test_read_rmw.cc'; then $(CYGPATH_W) 'test_read_rmw.cc'; else $(CYGPATH_W) '$(srcdir)/test_read_rmw.cc'; fi` + ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique tags: tags-am @@ -636,6 +703,7 @@ clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -f ./$(DEPDIR)/test_read-test_read.Po -rm -f ./$(DEPDIR)/test_read_prob-test_read_prob.Po + -rm -f ./$(DEPDIR)/test_read_rmw-test_read_rmw.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -683,6 +751,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/test_read-test_read.Po -rm -f ./$(DEPDIR)/test_read_prob-test_read_prob.Po + -rm -f ./$(DEPDIR)/test_read_rmw-test_read_rmw.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/internal/test_util/libcode/vx_tc_util/test_read_rmw.cc b/internal/test_util/libcode/vx_tc_util/test_read_rmw.cc index 72eacbe4ae..ff813e27cb 100644 --- a/internal/test_util/libcode/vx_tc_util/test_read_rmw.cc +++ b/internal/test_util/libcode/vx_tc_util/test_read_rmw.cc @@ -15,6 +15,9 @@ using namespace std; #include #include +#include +using namespace netCDF; + #include "vx_util.h" #include "vx_nc_util.h" #include "vx_tc_util.h" From 3bd5fa5b9d8913cb722e8cb31ca916c4bda5e5d0 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 29 Dec 2023 20:55:40 +0000 Subject: [PATCH 3/6] Per #2776, add Makefile for the vx_python3_utils test utility directory. --- configure | 3 +- configure.ac | 1 + internal/test_util/libcode/Makefile.am | 4 + internal/test_util/libcode/Makefile.in | 25 +- .../test_util/libcode/vx_data2d/Makefile.am | 2 +- .../libcode/vx_python3_utils/.gitignore | 7 + .../libcode/vx_python3_utils/Makefile.am | 37 + .../libcode/vx_python3_utils/Makefile.in | 672 ++++++++++++++++++ .../libcode/vx_python3_utils/test_get.cc | 4 +- 9 files changed, 735 insertions(+), 20 deletions(-) create mode 100644 internal/test_util/libcode/vx_python3_utils/.gitignore create mode 100644 internal/test_util/libcode/vx_python3_utils/Makefile.am create mode 100644 internal/test_util/libcode/vx_python3_utils/Makefile.in diff --git a/configure b/configure index 3ad1c25c0f..c5ed5eb60b 100755 --- a/configure +++ b/configure @@ -10128,7 +10128,7 @@ ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rsc if test -n "$MET_DEVELOPMENT"; then - ac_config_files="$ac_config_files src/tools/dev_utils/Makefile src/tools/dev_utils/shapefiles/Makefile internal/test_util/Makefile internal/test_util/basic/Makefile internal/test_util/basic/vx_config/Makefile internal/test_util/basic/vx_log/Makefile internal/test_util/basic/vx_util/Makefile internal/test_util/libcode/Makefile internal/test_util/libcode/vx_data2d/Makefile internal/test_util/libcode/vx_data2d_factory/Makefile internal/test_util/libcode/vx_data2d_grib/Makefile internal/test_util/libcode/vx_data2d_nc_met/Makefile internal/test_util/libcode/vx_data2d_nccf/Makefile internal/test_util/libcode/vx_geodesy/Makefile internal/test_util/libcode/vx_grid/Makefile internal/test_util/libcode/vx_plot_util/Makefile internal/test_util/libcode/vx_ps/Makefile internal/test_util/libcode/vx_tc_util/Makefile internal/test_util/libcode/vx_nc_util/Makefile internal/test_util/libcode/vx_physics/Makefile internal/test_util/libcode/vx_series_data/Makefile internal/test_util/libcode/vx_solar/Makefile internal/test_util/tools/Makefile internal/test_util/tools/other/Makefile internal/test_util/tools/other/mode_time_domain/Makefile" + ac_config_files="$ac_config_files src/tools/dev_utils/Makefile src/tools/dev_utils/shapefiles/Makefile internal/test_util/Makefile internal/test_util/basic/Makefile internal/test_util/basic/vx_config/Makefile internal/test_util/basic/vx_log/Makefile internal/test_util/basic/vx_util/Makefile internal/test_util/libcode/Makefile internal/test_util/libcode/vx_data2d/Makefile internal/test_util/libcode/vx_data2d_factory/Makefile internal/test_util/libcode/vx_data2d_grib/Makefile internal/test_util/libcode/vx_data2d_nc_met/Makefile internal/test_util/libcode/vx_data2d_nccf/Makefile internal/test_util/libcode/vx_geodesy/Makefile internal/test_util/libcode/vx_grid/Makefile internal/test_util/libcode/vx_plot_util/Makefile internal/test_util/libcode/vx_ps/Makefile internal/test_util/libcode/vx_tc_util/Makefile internal/test_util/libcode/vx_nc_util/Makefile internal/test_util/libcode/vx_python3_utils/Makefile internal/test_util/libcode/vx_physics/Makefile internal/test_util/libcode/vx_series_data/Makefile internal/test_util/libcode/vx_solar/Makefile internal/test_util/tools/Makefile internal/test_util/tools/other/Makefile internal/test_util/tools/other/mode_time_domain/Makefile" fi @@ -11145,6 +11145,7 @@ do "internal/test_util/libcode/vx_ps/Makefile") CONFIG_FILES="$CONFIG_FILES internal/test_util/libcode/vx_ps/Makefile" ;; "internal/test_util/libcode/vx_tc_util/Makefile") CONFIG_FILES="$CONFIG_FILES internal/test_util/libcode/vx_tc_util/Makefile" ;; "internal/test_util/libcode/vx_nc_util/Makefile") CONFIG_FILES="$CONFIG_FILES internal/test_util/libcode/vx_nc_util/Makefile" ;; + "internal/test_util/libcode/vx_python3_utils/Makefile") CONFIG_FILES="$CONFIG_FILES internal/test_util/libcode/vx_python3_utils/Makefile" ;; "internal/test_util/libcode/vx_physics/Makefile") CONFIG_FILES="$CONFIG_FILES internal/test_util/libcode/vx_physics/Makefile" ;; "internal/test_util/libcode/vx_series_data/Makefile") CONFIG_FILES="$CONFIG_FILES internal/test_util/libcode/vx_series_data/Makefile" ;; "internal/test_util/libcode/vx_solar/Makefile") CONFIG_FILES="$CONFIG_FILES internal/test_util/libcode/vx_solar/Makefile" ;; diff --git a/configure.ac b/configure.ac index c190104288..9963616341 100644 --- a/configure.ac +++ b/configure.ac @@ -1403,6 +1403,7 @@ if test -n "$MET_DEVELOPMENT"; then internal/test_util/libcode/vx_ps/Makefile internal/test_util/libcode/vx_tc_util/Makefile internal/test_util/libcode/vx_nc_util/Makefile + internal/test_util/libcode/vx_python3_utils/Makefile internal/test_util/libcode/vx_physics/Makefile internal/test_util/libcode/vx_series_data/Makefile internal/test_util/libcode/vx_solar/Makefile diff --git a/internal/test_util/libcode/Makefile.am b/internal/test_util/libcode/Makefile.am index 64403c660a..e05a0595fc 100644 --- a/internal/test_util/libcode/Makefile.am +++ b/internal/test_util/libcode/Makefile.am @@ -31,4 +31,8 @@ SUBDIRS = vx_data2d \ vx_physics \ vx_series_data +if ENABLE_PYTHON + SUBDIRS += vx_python3_utils +endif + MAINTAINERCLEANFILES = Makefile.in diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index d83ed27ca1..2f708a52b2 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -87,6 +87,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_PYTHON_TRUE@am__append_1 = vx_python3_utils subdir = internal/test_util/libcode ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -149,7 +150,10 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = vx_data2d vx_data2d_grib vx_data2d_nc_met \ + vx_data2d_nccf vx_data2d_factory vx_geodesy vx_grid vx_ps \ + vx_solar vx_plot_util vx_tc_util vx_nc_util vx_physics \ + vx_series_data vx_python3_utils am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -335,21 +339,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = vx_data2d \ - vx_data2d_grib \ - vx_data2d_nc_met \ - vx_data2d_nccf \ - vx_data2d_factory \ - vx_geodesy \ - vx_grid \ - vx_ps \ - vx_solar \ - vx_plot_util \ - vx_tc_util \ - vx_nc_util \ - vx_physics \ - vx_series_data - +SUBDIRS = vx_data2d vx_data2d_grib vx_data2d_nc_met vx_data2d_nccf \ + vx_data2d_factory vx_geodesy vx_grid vx_ps vx_solar \ + vx_plot_util vx_tc_util vx_nc_util vx_physics vx_series_data \ + $(am__append_1) MAINTAINERCLEANFILES = Makefile.in all: all-recursive diff --git a/internal/test_util/libcode/vx_data2d/Makefile.am b/internal/test_util/libcode/vx_data2d/Makefile.am index 1759c4087c..72359847c8 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.am +++ b/internal/test_util/libcode/vx_data2d/Makefile.am @@ -11,7 +11,7 @@ include ${top_srcdir}/Make-include # Test programs noinst_PROGRAMS = test_table_read \ - dump_default_table + dump_default_table test_table_read_SOURCES = test_table_read.cc test_table_read_CPPFLAGS = ${MET_CPPFLAGS} diff --git a/internal/test_util/libcode/vx_python3_utils/.gitignore b/internal/test_util/libcode/vx_python3_utils/.gitignore new file mode 100644 index 0000000000..8aa7461ede --- /dev/null +++ b/internal/test_util/libcode/vx_python3_utils/.gitignore @@ -0,0 +1,7 @@ +test_get +test_numpy +*.o +*.a +.deps +Makefile +*.dSYM diff --git a/internal/test_util/libcode/vx_python3_utils/Makefile.am b/internal/test_util/libcode/vx_python3_utils/Makefile.am new file mode 100644 index 0000000000..ac5c10d6c3 --- /dev/null +++ b/internal/test_util/libcode/vx_python3_utils/Makefile.am @@ -0,0 +1,37 @@ +## @start 1 +## Makefile.am -- Process this file with automake to produce Makefile.in +## @end 1 + +MAINTAINERCLEANFILES = Makefile.in + +# Include the project definitions + +include ${top_srcdir}/Make-include + +# Test programs + +noinst_PROGRAMS = test_get \ + test_numpy + +test_get_SOURCES = test_get.cc +test_get_CPPFLAGS = ${MET_CPPFLAGS} +test_get_LDFLAGS = -L. ${MET_LDFLAGS} +test_get_LDADD = \ + -lvx_python3_utils \ + -lvx_util \ + -lvx_math \ + -lvx_cal \ + -lvx_log \ + $(PYTHON_DEP_LIBS) + +test_numpy_SOURCES = test_numpy.cc +test_numpy_CPPFLAGS = ${MET_CPPFLAGS} +test_numpy_LDFLAGS = -L. ${MET_LDFLAGS} +test_numpy_LDADD = \ + -lvx_python3_utils \ + -lvx_util \ + -lvx_math \ + -lvx_cal \ + -lvx_log \ + $(PYTHON_DEP_LIBS) + diff --git a/internal/test_util/libcode/vx_python3_utils/Makefile.in b/internal/test_util/libcode/vx_python3_utils/Makefile.in new file mode 100644 index 0000000000..3d3d12cefb --- /dev/null +++ b/internal/test_util/libcode/vx_python3_utils/Makefile.in @@ -0,0 +1,672 @@ +# Makefile.in generated by automake 1.16.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2021 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +noinst_PROGRAMS = test_get$(EXEEXT) test_numpy$(EXEEXT) +subdir = internal/test_util/libcode/vx_python3_utils +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +PROGRAMS = $(noinst_PROGRAMS) +am_test_get_OBJECTS = test_get-test_get.$(OBJEXT) +test_get_OBJECTS = $(am_test_get_OBJECTS) +am__DEPENDENCIES_1 = +test_get_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_get_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(test_get_LDFLAGS) $(LDFLAGS) -o $@ +am_test_numpy_OBJECTS = test_numpy-test_numpy.$(OBJEXT) +test_numpy_OBJECTS = $(am_test_numpy_OBJECTS) +test_numpy_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_numpy_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(test_numpy_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test_get-test_get.Po \ + ./$(DEPDIR)/test_numpy-test_numpy.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(test_get_SOURCES) $(test_numpy_SOURCES) +DIST_SOURCES = $(test_get_SOURCES) $(test_numpy_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUFRLIB_NAME = @BUFRLIB_NAME@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FC_LIBS = @FC_LIBS@ +FFLAGS = @FFLAGS@ +FLIBS = @FLIBS@ +GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ +MET_BUFR = @MET_BUFR@ +MET_BUFRLIB = @MET_BUFRLIB@ +MET_CAIRO = @MET_CAIRO@ +MET_CAIROINC = @MET_CAIROINC@ +MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ +MET_FREETYPE = @MET_FREETYPE@ +MET_FREETYPEINC = @MET_FREETYPEINC@ +MET_FREETYPELIB = @MET_FREETYPELIB@ +MET_GRIB2C = @MET_GRIB2C@ +MET_GRIB2CINC = @MET_GRIB2CINC@ +MET_GRIB2CLIB = @MET_GRIB2CLIB@ +MET_GSL = @MET_GSL@ +MET_GSLINC = @MET_GSLINC@ +MET_GSLLIB = @MET_GSLLIB@ +MET_HDF = @MET_HDF@ +MET_HDF5 = @MET_HDF5@ +MET_HDF5INC = @MET_HDF5INC@ +MET_HDF5LIB = @MET_HDF5LIB@ +MET_HDFEOS = @MET_HDFEOS@ +MET_HDFEOSINC = @MET_HDFEOSINC@ +MET_HDFEOSLIB = @MET_HDFEOSLIB@ +MET_HDFINC = @MET_HDFINC@ +MET_HDFLIB = @MET_HDFLIB@ +MET_NETCDF = @MET_NETCDF@ +MET_NETCDFINC = @MET_NETCDFINC@ +MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ +MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ +MET_PYTHON_CC = @MET_PYTHON_CC@ +MET_PYTHON_LD = @MET_PYTHON_LD@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +OPENMP_CFLAGS = @OPENMP_CFLAGS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ +VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +MAINTAINERCLEANFILES = Makefile.in +test_get_SOURCES = test_get.cc +test_get_CPPFLAGS = ${MET_CPPFLAGS} +test_get_LDFLAGS = -L. ${MET_LDFLAGS} +test_get_LDADD = \ + -lvx_python3_utils \ + -lvx_util \ + -lvx_math \ + -lvx_cal \ + -lvx_log \ + $(PYTHON_DEP_LIBS) + +test_numpy_SOURCES = test_numpy.cc +test_numpy_CPPFLAGS = ${MET_CPPFLAGS} +test_numpy_LDFLAGS = -L. ${MET_LDFLAGS} +test_numpy_LDADD = \ + -lvx_python3_utils \ + -lvx_util \ + -lvx_math \ + -lvx_cal \ + -lvx_log \ + $(PYTHON_DEP_LIBS) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .cc .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign internal/test_util/libcode/vx_python3_utils/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign internal/test_util/libcode/vx_python3_utils/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + +test_get$(EXEEXT): $(test_get_OBJECTS) $(test_get_DEPENDENCIES) $(EXTRA_test_get_DEPENDENCIES) + @rm -f test_get$(EXEEXT) + $(AM_V_CXXLD)$(test_get_LINK) $(test_get_OBJECTS) $(test_get_LDADD) $(LIBS) + +test_numpy$(EXEEXT): $(test_numpy_OBJECTS) $(test_numpy_DEPENDENCIES) $(EXTRA_test_numpy_DEPENDENCIES) + @rm -f test_numpy$(EXEEXT) + $(AM_V_CXXLD)$(test_numpy_LINK) $(test_numpy_OBJECTS) $(test_numpy_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get-test_get.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_numpy-test_numpy.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +test_get-test_get.o: test_get.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_get_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_get-test_get.o -MD -MP -MF $(DEPDIR)/test_get-test_get.Tpo -c -o test_get-test_get.o `test -f 'test_get.cc' || echo '$(srcdir)/'`test_get.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_get-test_get.Tpo $(DEPDIR)/test_get-test_get.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_get.cc' object='test_get-test_get.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_get_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_get-test_get.o `test -f 'test_get.cc' || echo '$(srcdir)/'`test_get.cc + +test_get-test_get.obj: test_get.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_get_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_get-test_get.obj -MD -MP -MF $(DEPDIR)/test_get-test_get.Tpo -c -o test_get-test_get.obj `if test -f 'test_get.cc'; then $(CYGPATH_W) 'test_get.cc'; else $(CYGPATH_W) '$(srcdir)/test_get.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_get-test_get.Tpo $(DEPDIR)/test_get-test_get.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_get.cc' object='test_get-test_get.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_get_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_get-test_get.obj `if test -f 'test_get.cc'; then $(CYGPATH_W) 'test_get.cc'; else $(CYGPATH_W) '$(srcdir)/test_get.cc'; fi` + +test_numpy-test_numpy.o: test_numpy.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_numpy_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_numpy-test_numpy.o -MD -MP -MF $(DEPDIR)/test_numpy-test_numpy.Tpo -c -o test_numpy-test_numpy.o `test -f 'test_numpy.cc' || echo '$(srcdir)/'`test_numpy.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_numpy-test_numpy.Tpo $(DEPDIR)/test_numpy-test_numpy.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_numpy.cc' object='test_numpy-test_numpy.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_numpy_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_numpy-test_numpy.o `test -f 'test_numpy.cc' || echo '$(srcdir)/'`test_numpy.cc + +test_numpy-test_numpy.obj: test_numpy.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_numpy_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_numpy-test_numpy.obj -MD -MP -MF $(DEPDIR)/test_numpy-test_numpy.Tpo -c -o test_numpy-test_numpy.obj `if test -f 'test_numpy.cc'; then $(CYGPATH_W) 'test_numpy.cc'; else $(CYGPATH_W) '$(srcdir)/test_numpy.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_numpy-test_numpy.Tpo $(DEPDIR)/test_numpy-test_numpy.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_numpy.cc' object='test_numpy-test_numpy.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_numpy_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_numpy-test_numpy.obj `if test -f 'test_numpy.cc'; then $(CYGPATH_W) 'test_numpy.cc'; else $(CYGPATH_W) '$(srcdir)/test_numpy.cc'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/test_get-test_get.Po + -rm -f ./$(DEPDIR)/test_numpy-test_numpy.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/test_get-test_get.Po + -rm -f ./$(DEPDIR)/test_numpy-test_numpy.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +# Include the project definitions + +include ${top_srcdir}/Make-include + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/internal/test_util/libcode/vx_python3_utils/test_get.cc b/internal/test_util/libcode/vx_python3_utils/test_get.cc index eedf339389..eae1428bda 100644 --- a/internal/test_util/libcode/vx_python3_utils/test_get.cc +++ b/internal/test_util/libcode/vx_python3_utils/test_get.cc @@ -60,12 +60,12 @@ ConcatString variable_name = argv[2]; script_name.chomp(".py"); -Python3_Script script(script_name); +Python3_Script script(script_name.c_str()); PyObject * var = 0; -var = script.lookup(variable_name); +var = script.lookup(variable_name.c_str()); if ( var ) { From 2fdb9698239f205404aff87fb195ab570e1d6045 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Thu, 28 Dec 2023 22:05:16 +0000 Subject: [PATCH 4/6] add rpath for atlas and eckit lib dirs so dynamic libraries can be found when running on seneca --- internal/scripts/environment/development.seneca | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/scripts/environment/development.seneca b/internal/scripts/environment/development.seneca index 928cee18db..7007241362 100644 --- a/internal/scripts/environment/development.seneca +++ b/internal/scripts/environment/development.seneca @@ -39,7 +39,7 @@ export CXXFLAGS=${CFLAGS} export LDFLAGS="-Wl,--disable-new-dtags" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_PROJ}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_HDFLIB}:${MET_HDF5}/lib:${MET_GSL}/lib:${MET_PYTHON}/lib:${JASPER}/lib" -export LDFLAGS="${LDFLAGS} -L${JASPER}/lib" +export LDFLAGS="${LDFLAGS} -L${JASPER}/lib -Wl,-rpath,${MET_ATLAS}/lib -Wl,-rpath,${MET_ECKIT}/lib" # Variables required to run MET export MET_TEST_INPUT=${MET_PROJ_DIR}/MET_test_data/unit_test From 337f3471718a89eac0c4db30624f73bbb9af2ac6 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Thu, 28 Dec 2023 19:34:27 +0000 Subject: [PATCH 5/6] only set -L and -I arguments for atlas and eckit if the appropriate environment variable is set -- this matches how it is handled for other external library dependencies --- configure | 12 ++++++++++-- configure.ac | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/configure b/configure index c5ed5eb60b..2d1220c965 100755 --- a/configure +++ b/configure @@ -5376,6 +5376,11 @@ fi # AC_SUBST command line variables. +if (test -n "$MET_ATLASLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC}" + LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB}" +fi + # # Look for the Eckit library. # @@ -5403,6 +5408,10 @@ fi # AC_SUBST command line variables. +if (test -n "$MET_ECKITLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" + LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" +fi # # Look for the NetCDF library. # @@ -6948,8 +6957,7 @@ printf "%s\n" "#define ENABLE_UGRID /**/" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: unstructured grid support will be compiled" >&5 printf "%s\n" "$as_me: unstructured grid support will be compiled" >&6;} - CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" - LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" + CPPFLAGS="${CPPFLAGS} -DWITH_UGRID" UGRID_MET_LIBS="-lvx_data2d_ugrid" UGRID_DEP_LIBS="-latlas -leckit -leckit_mpi -leckit_geometry" else diff --git a/configure.ac b/configure.ac index 9963616341..f8e2ac7b97 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,11 @@ fi # AC_SUBST command line variables. +if (test -n "$MET_ATLASLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC}" + LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB}" +fi + # # Look for the Eckit library. # @@ -101,6 +106,10 @@ fi # AC_SUBST command line variables. +if (test -n "$MET_ECKITLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" + LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" +fi # # Look for the NetCDF library. # @@ -1128,8 +1137,7 @@ AM_CONDITIONAL([ENABLE_UGRID], [test "x$ENABLE_UGRID" = "xyes" || test "x$ENABLE if test "x$ENABLE_UGRID" = "xyes" || test "x$ENABLE_ALL" = "xyes"; then AC_DEFINE([ENABLE_UGRID], [], ["build unstructured grid support"]) AC_MSG_NOTICE([unstructured grid support will be compiled]) - CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" - LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" + CPPFLAGS="${CPPFLAGS} -DWITH_UGRID" UGRID_MET_LIBS="-lvx_data2d_ugrid" UGRID_DEP_LIBS="-latlas -leckit -leckit_mpi -leckit_geometry" else From 28cb0e06c3eae036b2ecb9182f1aa0c873679b28 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 29 Dec 2023 21:36:30 +0000 Subject: [PATCH 6/6] Per #2776, just whitespace and capitalization --- configure | 3 ++- configure.ac | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2d1220c965..b7d9098c4f 100755 --- a/configure +++ b/configure @@ -5382,7 +5382,7 @@ if (test -n "$MET_ATLASLIB"); then fi # -# Look for the Eckit library. +# Look for the ecKit library. # # Configure the variables. The help text will appear if the user uses "configure --help". @@ -5412,6 +5412,7 @@ if (test -n "$MET_ECKITLIB"); then CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" fi + # # Look for the NetCDF library. # diff --git a/configure.ac b/configure.ac index f8e2ac7b97..f7b2a73453 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ if (test -n "$MET_ATLASLIB"); then fi # -# Look for the Eckit library. +# Look for the ecKit library. # # Configure the variables. The help text will appear if the user uses "configure --help". @@ -110,6 +110,7 @@ if (test -n "$MET_ECKITLIB"); then CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" fi + # # Look for the NetCDF library. #