Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update develop-ref after #1704 and #1708 #1712

Merged
merged 31 commits into from
Mar 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ab0f2c6
Per #1429, enhance error message from DataLine::get_item(). (#1682)
JohnHalleyGotway Feb 26, 2021
b2754b4
Feature 1429 tc_log second try (#1686)
JohnHalleyGotway Feb 26, 2021
a1aead4
Feature 1588 ps_log (#1687)
JohnHalleyGotway Feb 26, 2021
2ba6cd9
#1454 Disabled plot_data_plane_CESM_SSMI_microwave and plot_data_plan…
Feb 26, 2021
fe5f318
#1454 Moved NC attribute name to nc_utils.h
Feb 26, 2021
c1463b2
#1454 Corrected sanity checking for lat/lon projection based on the p…
Feb 26, 2021
ac4d7f9
#1454 Corrected sanity checking for lat/lon projection based on the p…
Feb 26, 2021
371dd2c
#1454 Corrected data.delta_lon
Mar 1, 2021
24c2bd8
#1454 Change bact to use diff instead of absolute value of diff
Mar 1, 2021
e224ce1
454 Deleted instea dof commenting out
Mar 1, 2021
c8e9049
454 Deleted instea dof commenting out
Mar 1, 2021
0f5366c
Merge pull request #1688 from dtcenter/feature_1454_nccf_grid_definition
hsoh-u Mar 1, 2021
996197c
Feature 1684 bss and 1685 single reference model (#1689)
JohnHalleyGotway Mar 2, 2021
40b57af
Per #1691, add met-10.0.0-beta4 release notes. (#1692)
JohnHalleyGotway Mar 2, 2021
23dc482
Updated Python documentation
jprestop Mar 3, 2021
9c9c54c
Per #1694, add VarInfo::magic_str_attr() to construct a field summary…
JohnHalleyGotway Mar 4, 2021
a16bebc
Per #1694, fixing 2 issues here. There was a bug in the computation o…
JohnHalleyGotway Mar 4, 2021
21e3eb7
Per #1694, just switching to consistent variable name.
JohnHalleyGotway Mar 5, 2021
0f84a5a
Just consistent spacing.
JohnHalleyGotway Mar 5, 2021
5f551d2
Merge pull request #1696 from dtcenter/bugfix_1694_grid_diag
davidfillmore Mar 5, 2021
9224844
Adding files for ReadTheDocs
jprestop Mar 5, 2021
1b41a0a
Adding .yaml file for ReadTheDocs
jprestop Mar 5, 2021
8382b33
Updated path to requirements.txt file
jprestop Mar 5, 2021
0303f1f
Updated path to conf.py file
jprestop Mar 5, 2021
99a6363
Removing ReadTheDocs files and working in separate branch
jprestop Mar 5, 2021
592c937
Trying different options for formats (#1702)
jprestop Mar 9, 2021
d80aafa
Per #1706, add bugfix to the develop branch. Also add a new job to un…
JohnHalleyGotway Mar 10, 2021
6ed8fc4
Feature 1471 python_grid (#1704)
JohnHalleyGotway Mar 10, 2021
0f08b74
Committing a fix for unit_python.xml directly to the develop branch. …
Mar 11, 2021
2b5e37f
Merge branch 'develop-ref' into develop
JohnHalleyGotway Mar 11, 2021
48bb906
Add *.dSYM to the .gitignore files in the src and internal_tests dire…
JohnHalleyGotway Mar 11, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -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
30 changes: 26 additions & 4 deletions met/docs/Users_Guide/appendixF.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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:

Expand Down
19 changes: 9 additions & 10 deletions met/docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions met/internal_tests/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/basic/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/basic/vx_config/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ test_config
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/basic/vx_log/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ test_logger
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/basic/vx_util/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ test_add_rows
.deps
Makefile
Makefile.in
*.dSYM
30 changes: 21 additions & 9 deletions met/internal_tests/basic/vx_util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions met/internal_tests/libcode/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_data2d/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ dump_default_table
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_data2d_factory/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ test_factory
.deps
Makefile
Makefile.in
*.dSYM
11 changes: 9 additions & 2 deletions met/internal_tests/libcode/vx_data2d_factory/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_data2d_grib/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_read_grib1
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_data2d_nc_met/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_read_nc_met
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_data2d_nccf/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_read_nccf
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_geodesy/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_spheroid
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_grid/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_grid_area
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_nc_util/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_pressure_levels
.deps
Makefile
Makefile.in
*.dSYM
29 changes: 20 additions & 9 deletions met/internal_tests/libcode/vx_nc_util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_physics/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_thermo
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_plot_util/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_map_region
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_ps/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_ps
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_series_data/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_series_data
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_solar/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test_ra_dec
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/libcode/vx_tc_util/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ test_read
.deps
Makefile
Makefile.in
*.dSYM
63 changes: 44 additions & 19 deletions met/internal_tests/libcode/vx_tc_util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions met/internal_tests/tools/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.deps
Makefile
Makefile.in
*.dSYM
1 change: 1 addition & 0 deletions met/internal_tests/tools/other/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.deps
Makefile
Makefile.in
*.dSYM
Loading