dtcenter · JohnHalleyGotway · Mar 11, 2021 · Feb 26, 2021 · Feb 26, 2021 · Feb 26, 2021
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,23 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required 
+version: 2
+
+# Build all formats (htmlzip, pdf, epub)
+#formats: all
+formats: []
+
+# Optionally set the version of Python and requirements required to build your
+# docs
+python:
+   version: 3.7
+   install:
+   - requirements: met/docs/requirements.txt
+
+# Configuration for Sphinx documentation (this is the default documentation
+# type)
+sphinx:
+  builder: html
+  configuration: met/docs/conf.py
diff --git a/met/docs/Users_Guide/appendixF.rst b/met/docs/Users_Guide/appendixF.rst
@@ -65,7 +65,9 @@ The data must be loaded into a 2D NumPy array named **met_data**. In addition th
      'long_name': 'FooBar',
      'level':     'Surface',
      'units':     'None',
-
+
+     # Define 'grid' as a string or a dictionary
+
      'grid': {
         'type': 'Lambert Conformal',
         'hemisphere': 'N',
@@ -83,12 +85,32 @@ The data must be loaded into a 2D NumPy array named **met_data**. In addition th
         'ny': 129,
       }
 
-     }
+  }
+
+
+In the dictionary, valid time, initialization time, lead time and accumulation time (if any) must be indicated by strings. Valid and initialization times must be given in YYYYMMDD[_HH[MMSS]] format, and lead and accumulation times must be given in HH[MMSS] format, where the square brackets indicate optional elements. The dictionary must also include strings for the name, long_name, level, and units to describe the data. The rest of the **attrs** dictionary gives the grid size and projection information in the same format that is used in the netCDF files written out by the MET tools. Those entries are also listed below. Note that the **grid** entry in the **attrs** dictionary can either be defined as a string or as a dictionary itself.
+
+If specified as a string, **grid** can be defined as follows:
+
+• As a named grid:
+
+.. code-block:: none
 
+  'grid': 'G212'
+
+• As a grid specification string, as described in :ref:`appendixB`:
+
+.. code-block:: none
+
+  'grid': 'lambert 185 129 12.19 -133.459 -95 40.635 6371.2 25 25 N'
+
+• As the path to an existing gridded data file:
+
+.. code-block:: none
 
-In the dictionary, valid time, initialization time, lead time and accumulation time (if any) must be indicated by strings. Valid and initialization times must be given in YYYYMMDD[_HH[MMSS]] format, and lead and accumulation times must be given in HH[MMSS] format, where the square brackets indicate optional elements. The dictionary must also include strings for the name, long_name, level, and units to describe the data. The rest of the **attrs** dictionary gives the grid size and projection information in the same format that is used in the netCDF files written out by the MET tools. Those entries are also listed below. Note that the **grid** entry in the **attrs** dictionary is itself a dictionary.
+  'grid': '/path/to/sample_data.grib'
 
-The supported grid **type** strings are described below:
+When specified as a dictionary, the contents of the **grid** dictionary vary based on the grid **type** string. The entries for the supported grid types are described below:
 
 • **Lambert Conformal** grid dictionary entries:
 

diff --git a/met/docs/requirements.txt b/met/docs/requirements.txt
@@ -1,11 +1,10 @@
-sphinx
-sphinx-gallery
-sphinx-rtd-theme
-sphinxcontrib-applehelp
+sphinx==2.4.4
+sphinx-gallery==0.7.0
+sphinx-rtd-theme==0.4.3
+sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-bibtex
-sphinxcontrib-devhelp
-sphinxcontrib-htmlhelp
-sphinxcontrib-jsmath
-sphinxcontrib-qthelp
-sphinxcontrib-serializinghtml
-
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.4
diff --git a/met/internal_tests/.gitignore b/met/internal_tests/.gitignore
@@ -3,3 +3,4 @@
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/basic/.gitignore b/met/internal_tests/basic/.gitignore
@@ -3,3 +3,4 @@
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/basic/vx_config/.gitignore b/met/internal_tests/basic/vx_config/.gitignore
@@ -12,3 +12,4 @@ test_config
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/basic/vx_log/.gitignore b/met/internal_tests/basic/vx_log/.gitignore
@@ -5,3 +5,4 @@ test_logger
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/basic/vx_util/.gitignore b/met/internal_tests/basic/vx_util/.gitignore
@@ -8,3 +8,4 @@ test_add_rows
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/basic/vx_util/Makefile.am b/met/internal_tests/basic/vx_util/Makefile.am
@@ -82,18 +82,30 @@ endif
 test_ascii_header_SOURCES = test_ascii_header.cc
 test_ascii_header_CPPFLAGS = ${MET_CPPFLAGS}
 test_ascii_header_LDFLAGS = -L. ${MET_LDFLAGS}
-test_ascii_header_LDADD = -lvx_util \
+test_ascii_header_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
+	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_shapedata \
+	-lvx_util \
+	$(PYTHON_LIBS) \
+	-lvx_statistics \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_data2d \
+	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lgsl -lgslcblas
-
-if ENABLE_PYTHON
-test_ascii_header_LDADD += $(MET_PYTHON_LD) -lvx_data2d_python -lvx_python3_utils -lvx_data2d_python -lvx_python3_utils -lvx_math 
-test_ascii_header_LDADD += -lvx_data2d_python -lvx_python3_utils -lvx_data2d_python -lvx_python3_utils
-test_ascii_header_LDADD += -lvx_math -lvx_grid -lvx_util -lvx_data2d -lvx_config -lvx_gsl_prob -lvx_cal -lvx_math -lvx_util
-endif
-
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util
diff --git a/met/internal_tests/libcode/.gitignore b/met/internal_tests/libcode/.gitignore
@@ -3,3 +3,4 @@
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_data2d/.gitignore b/met/internal_tests/libcode/vx_data2d/.gitignore
@@ -5,3 +5,4 @@ dump_default_table
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_data2d_factory/.gitignore b/met/internal_tests/libcode/vx_data2d_factory/.gitignore
@@ -5,3 +5,4 @@ test_factory
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_data2d_factory/Makefile.am b/met/internal_tests/libcode/vx_data2d_factory/Makefile.am
@@ -25,20 +25,27 @@ test_is_grib_LDADD = -lvx_data2d_factory \
 test_factory_SOURCES = test_factory.cc
 test_factory_CPPFLAGS = ${MET_CPPFLAGS}
 test_factory_LDFLAGS = -L. ${MET_LDFLAGS}
-test_factory_LDADD = -lvx_data2d_factory \
+test_factory_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
+	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_data2d_factory \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
+	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
+	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \
-	-lvx_cal \
 	-lvx_log \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
diff --git a/met/internal_tests/libcode/vx_data2d_grib/.gitignore b/met/internal_tests/libcode/vx_data2d_grib/.gitignore
@@ -4,3 +4,4 @@ test_read_grib1
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_data2d_nc_met/.gitignore b/met/internal_tests/libcode/vx_data2d_nc_met/.gitignore
@@ -4,3 +4,4 @@ test_read_nc_met
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_data2d_nccf/.gitignore b/met/internal_tests/libcode/vx_data2d_nccf/.gitignore
@@ -4,3 +4,4 @@ test_read_nccf
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_geodesy/.gitignore b/met/internal_tests/libcode/vx_geodesy/.gitignore
@@ -4,3 +4,4 @@ test_spheroid
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_grid/.gitignore b/met/internal_tests/libcode/vx_grid/.gitignore
@@ -4,3 +4,4 @@ test_grid_area
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_nc_util/.gitignore b/met/internal_tests/libcode/vx_nc_util/.gitignore
@@ -4,3 +4,4 @@ test_pressure_levels
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_nc_util/Makefile.am b/met/internal_tests/libcode/vx_nc_util/Makefile.am
@@ -19,21 +19,32 @@ noinst_PROGRAMS = test_pressure_levels
 test_pressure_levels_SOURCES = test_pressure_levels.cc
 test_pressure_levels_CPPFLAGS = ${MET_CPPFLAGS}
 test_pressure_levels_LDFLAGS = -L. ${MET_LDFLAGS}
-test_pressure_levels_LDADD = -lvx_tc_util \
+test_pressure_levels_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
+	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_tc_util \
+	-lvx_shapedata \
+	-lvx_util \
+	$(PYTHON_LIBS) \
+	-lvx_statistics \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d \
 	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util
 
-if ENABLE_PYTHON
-test_pressure_levels_LDADD += $(MET_PYTHON_LD)
-test_pressure_levels_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_pressure_levels_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_pressure_levels_LDADD += -lvx_grid -lvx_util -lvx_config
-test_pressure_levels_LDADD += -lvx_data2d -lvx_gsl_prob -lvx_util -lvx_math -lvx_cal -lvx_config
-endif
diff --git a/met/internal_tests/libcode/vx_physics/.gitignore b/met/internal_tests/libcode/vx_physics/.gitignore
@@ -4,3 +4,4 @@ test_thermo
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_plot_util/.gitignore b/met/internal_tests/libcode/vx_plot_util/.gitignore
@@ -4,3 +4,4 @@ test_map_region
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_ps/.gitignore b/met/internal_tests/libcode/vx_ps/.gitignore
@@ -4,3 +4,4 @@ test_ps
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_series_data/.gitignore b/met/internal_tests/libcode/vx_series_data/.gitignore
@@ -4,3 +4,4 @@ test_series_data
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_solar/.gitignore b/met/internal_tests/libcode/vx_solar/.gitignore
@@ -4,3 +4,4 @@ test_ra_dec
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_tc_util/.gitignore b/met/internal_tests/libcode/vx_tc_util/.gitignore
@@ -5,3 +5,4 @@ test_read
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/libcode/vx_tc_util/Makefile.am b/met/internal_tests/libcode/vx_tc_util/Makefile.am
@@ -20,39 +20,64 @@ noinst_PROGRAMS = test_read \
 test_read_SOURCES = test_read.cc
 test_read_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_LDFLAGS = -L. ${MET_LDFLAGS}
-test_read_LDADD = -lvx_tc_util \
+test_read_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
+	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_tc_util \
+	-lvx_shapedata \
+	-lvx_util \
+	$(PYTHON_LIBS) \
+	-lvx_statistics \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_data2d \
+	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lgsl -lgslcblas
-
-if ENABLE_PYTHON
-test_read_LDADD += $(MET_PYTHON_LD)
-test_read_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_LDADD += -lvx_grid -lvx_util -lvx_config
-test_read_LDADD += -lvx_data2d -lvx_gsl_prob -lvx_util -lvx_math -lvx_cal -lvx_config
-endif
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util
 
 test_read_prob_SOURCES = test_read_prob.cc
 test_read_prob_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_prob_LDFLAGS = -L. ${MET_LDFLAGS}
-test_read_prob_LDADD = -lvx_tc_util \
+test_read_prob_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
+	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_tc_util \
+	-lvx_shapedata \
+	-lvx_util \
+	$(PYTHON_LIBS) \
+	-lvx_statistics \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_data2d \
+	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lgsl -lgslcblas
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util
 
-if ENABLE_PYTHON
-test_read_prob_LDADD += $(MET_PYTHON_LD)
-test_read_prob_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_prob_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_prob_LDADD += -lvx_grid -lvx_util -lvx_config
-test_read_prob_LDADD += -lvx_data2d -lvx_gsl_prob -lvx_util -lvx_math -lvx_cal -lvx_config
-endif
diff --git a/met/internal_tests/tools/.gitignore b/met/internal_tests/tools/.gitignore
@@ -3,3 +3,4 @@
 .deps
 Makefile
 Makefile.in
+*.dSYM
diff --git a/met/internal_tests/tools/other/.gitignore b/met/internal_tests/tools/other/.gitignore
@@ -3,3 +3,4 @@
 .deps
 Makefile
 Makefile.in
+*.dSYM