Merge branch 'develop' of github.com:dtcenter/MET into feature_2588_i…

…nstall_rewrite
dtcenter · Jan 12, 2024 · 8f2be51 · 8f2be51
2 parents 6f815c5 + ce97b05
commit 8f2be51
Show file tree

Hide file tree

Showing 27 changed files with 1,033 additions and 624 deletions.
diff --git a/configure b/configure
@@ -5376,8 +5376,13 @@ 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.
+# Look for the ecKit library.
 #
 
 # Configure the variables. The help text will appear if the user uses "configure --help".
@@ -5403,6 +5408,11 @@ 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 +6958,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
@@ -10128,7 +10137,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 +11154,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
@@ -74,8 +74,13 @@ 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.
+# Look for the ecKit library.
 #
 
 # Configure the variables. The help text will appear if the user uses "configure --help".
@@ -101,6 +106,11 @@ 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 +1138,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
@@ -1403,6 +1412,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/docs/Users_Guide/config_options.rst b/docs/Users_Guide/config_options.rst
@@ -1084,7 +1084,19 @@ File-format specific settings for the "field" entry:
     * The "GRIB2_perc_val" is an integer specifying the requested percentile
       value (0 to 100) to be used. This applies only to GRIB2 product
       definition templates 4.6 and 4.10.
-
+
+    * The "GRIB2_aerosol_type" is an integer specifying the aerosol type
+      (Table 4.233). This applies only to GRIB2 product defintion templates
+      4.46 and 4.48.
+
+    * The "GRIB2_aerosol_interval_type" is an integer specifying the aerosol
+      size interval (Table 4.91). This applies only to GRIB2 product defintion
+      templates 4.46 and 4.48.
+
+    * The "GRIB2_aerosol_size_lower" and "GRIB2_aerosol_size_upper" are doubles
+      specifying the endpoints of the aerosol size interval. These applies only
+      to GRIB2 product defintion templates 4.46 and 4.48.
+
     * The "GRIB2_ipdtmpl_index" and "GRIB2_ipdtmpl_val" entries are arrays
       of integers which specify the product description template values to
       be used. The indices are 0-based. For example, use the following to

diff --git 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

diff --git a/internal/test_unit/xml/unit_plot_data_plane.xml b/internal/test_unit/xml/unit_plot_data_plane.xml
@@ -564,4 +564,21 @@
     </output>
   </test>
 
+  <test name="plot_data_plane_GRIB2_TABLE_4.48">
+    <exec>&MET_BIN;/plot_data_plane</exec>
+    <param> \
+      &DATA_DIR_MODEL;/grib2/rrfs/rrfs.t00z.prslev.f036.conus_3km.MASSDEN.grib2 \
+      &OUTPUT_DIR;/plot_data_plane/RRFS_GRIB2_TABLE_4.48_MASSDEN.ps \
+      'name="MASSDEN"; level="Z8"; \
+       GRIB2_aerosol_type=62001; \
+       GRIB2_aerosol_interval_type=0; \
+       GRIB2_aerosol_size_lower=2.5e-06;' \
+       -title "Mass Density of Dry Dust up to 2.5e-06" \
+       -v 1
+    </param>
+    <output>
+      <ps>&OUTPUT_DIR;/plot_data_plane/RRFS_GRIB2_TABLE_4.48_MASSDEN.ps</ps>
+    </output>
+  </test>
+
 </met_test>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)
+