Merge remote-tracking branch 'origin/develop' into feature_2769_tc_di…

…ag_driver_v0.11.0
dtcenter · Jan 17, 2024 · ba5f156 · ba5f156
2 parents 0a564a6 + 51227b9
commit ba5f156
Show file tree

Hide file tree

Showing 59 changed files with 1,784 additions and 1,057 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/docs/Users_Guide/reformat_point.rst b/docs/Users_Guide/reformat_point.rst
@@ -456,6 +456,8 @@ While initial versions of the ASCII2NC tool only supported a simple 11 column AS
 
 • `National Data Buoy (NDBC) Standard Meteorlogical Data format <https://www.ndbc.noaa.gov/measdes.shtml>`_. See the :ref:`MET_NDBC_STATIONS` environment variable.
 
+• `International Soil Moisture Network (ISMN) Data format <https://ismn.bafg.de/en/>`_.
+
 • `AErosol RObotic NEtwork (AERONET) versions 2 and 3 format <http://aeronet.gsfc.nasa.gov/>`_
 
 • Python embedding of point observations, as described in :numref:`pyembed-point-obs-data`. See example below in :numref:`ascii2nc-pyembed`.
@@ -539,7 +541,7 @@ Required Arguments for ascii2nc
 Optional Arguments for ascii2nc
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-3. The **-format ASCII_format** option may be set to "met_point", "little_r", "surfrad", "wwsis", "airnowhourlyaqobs", "airnowhourly", "airnowdaily_v2", "ndbc_standard", "aeronet", "aeronetv2", "aeronetv3", or "python". If passing in ISIS data, use the "surfrad" format flag.
+3. The **-format ASCII_format** option may be set to "met_point", "little_r", "surfrad", "wwsis", "airnowhourlyaqobs", "airnowhourly", "airnowdaily_v2", "ndbc_standard", "ismn", "aeronet", "aeronetv2", "aeronetv3", or "python". If passing in ISIS data, use the "surfrad" format flag.
 
 4. The **-config file** option is the configuration file for generating time summaries.
 

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