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.

Sign up for GitHub

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

Feature #2285 read_point_data #2509

Merged
merged 88 commits into from
Apr 20, 2023
Merged

Feature #2285 read_point_data #2509

Show file tree
Hide file tree
Changes from 79 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
ff94154
#2285 Read temporary file as CSV if failas as NetCDF to support point…
Mar 9, 2023
1622220
#2285 Write a temporary file as CSV if point_data variable exists
Mar 9, 2023
1cfd0ce
#2285 Separeted write_tmp_ascii and make the main code not to be exec…
Mar 9, 2023
e4dc068
#22285 Added mask_filters.h and mask_filters.cc
Mar 14, 2023
9e0fba7
#2285 Moved files at scripts/utility to scripts/python/utility
Mar 23, 2023
b252b8b
#2285 Moved files at scripts/utility to scripts/python/utility
Mar 23, 2023
47ad200
#2285 Moved files at data/wrappers to scripts/python/pyembed
Mar 23, 2023
fd184ac
#2285 Moved python script from python to python/examples
Apr 3, 2023
e04ebc8
#2285 Moved python script from python to python/examples
Apr 3, 2023
33c8194
#2285 Merged from met_point_obs_nc.py
Apr 3, 2023
c565ade
#2285 Initial release
Apr 3, 2023
e081ec7
#2285 Initial release
Apr 3, 2023
9c84de7
#2285 Moved read_met_point_obs.py Initial release
Apr 3, 2023
a824085
#2285 Restructure python scripts
Apr 4, 2023
57f2b46
#2285 Restructure python scripts: moved to scripts/python/pyemded
Apr 4, 2023
838929d
#2285 Restructure python scripts: moved to scripts/python/pyemded
Apr 4, 2023
4455c7d
#2285 Initial release
Apr 7, 2023
b1324b2
#2285 Initial release
Apr 7, 2023
48c10b4
#2285 Restructure python scripts
Apr 7, 2023
a14085d
#2285 Restructure python scripts
Apr 7, 2023
0c1aaad
#2285 Adjusted the path for python scripts
Apr 7, 2023
6308f78
#2285 Adjusted the path for python scripts
Apr 7, 2023
30e28bf
#2285 Adjusted the path for python scripts
Apr 7, 2023
521fb14
#2285 Removed xarray and added MaskFilters
Apr 7, 2023
a5a16fe
#2285 Uses MaskFilters
Apr 7, 2023
c80ecea
#2285 Removed xarry
Apr 7, 2023
1c7f41e
#2285 Adjusted the path for python scripts
Apr 7, 2023
c355f4b
#2285 Adjusted the path for python scripts
Apr 7, 2023
ea11ed0
Merge branch 'develop' into feature_2285_read_point_data
Apr 7, 2023
d6086ec
#2285 Imnport importlib.util instead of importlib
Apr 10, 2023
3074aa8
#2285 Change back
Apr 10, 2023
ddfe1c3
#2285 Changed importing importlib
Apr 10, 2023
179eb88
Merge branch 'feature_2285_read_point_data' of github.com:dtcenter/ME…
Apr 10, 2023
2feccc9
#2285 Merged scripts/python/met_point_obs_nc.py to scripts/python/met…
Apr 10, 2023
09aaf11
Fixes typo in installation chapter.
DanielAdriaansen Apr 11, 2023
4e4cc42
Updates to reflect new directory structure.
DanielAdriaansen Apr 11, 2023
95f4964
Changes to the section about building MET with Python Embedding support.
DanielAdriaansen Apr 11, 2023
7e18acf
Changes to the section about MET_PYTHON_EXE.
DanielAdriaansen Apr 11, 2023
3a0a095
Adds overview of supported data structures.
DanielAdriaansen Apr 11, 2023
d254988
Fixes sub-section headers.
DanielAdriaansen Apr 11, 2023
5568924
Adds note about sample commands.
DanielAdriaansen Apr 11, 2023
113db08
Fixes table references and also adds note about assumed path location…
DanielAdriaansen Apr 11, 2023
e1e298a
Big overhaul to the beginning of the 2D dataplane section.
DanielAdriaansen Apr 11, 2023
dc74182
Fixes table problems.
DanielAdriaansen Apr 11, 2023
5aeeea9
Updates the rest of the gridded data section.
DanielAdriaansen Apr 11, 2023
43319b6
Fixes warning and tweaks table.
DanielAdriaansen Apr 11, 2023
549aa68
Adds required Python version and attempts to fix RST link warning.
DanielAdriaansen Apr 11, 2023
38952d6
Adds placeholder for examples of pyembed with 2D gridded dataplanes.
DanielAdriaansen Apr 11, 2023
489b6e8
Adds a better table name for the 2D attribute table.
DanielAdriaansen Apr 11, 2023
993ec8c
#2285 Changed argument usecols to col_start and col_last for read_mpr
Apr 13, 2023
9fae26f
#2285 Changed argument usecols to col_start and col_last for read_mpr
Apr 13, 2023
236d59c
#2285 Changed spaces for indent (4 to 3)
Apr 13, 2023
632dcf1
#2285 Renamed load_txt to read_2d_text_input. Removed get_grid_metada…
Apr 13, 2023
b4ac64f
Merge branch 'feature_2285_read_point_data' of github.com:dtcenter/ME…
Apr 13, 2023
f33b3a5
Some more tweaks to the 2D gridded dataplane section.
DanielAdriaansen Apr 14, 2023
97d3ec7
Adds sample GridStat Python Embedding example.
DanielAdriaansen Apr 14, 2023
f71cb4e
Updates to the point observation section and adds stub for the MET Py…
DanielAdriaansen Apr 14, 2023
1b92a9d
More updates for point observations section.
DanielAdriaansen Apr 14, 2023
f5a164d
#2474 renamed create_header_attrs to set_dataplane_attrs
Apr 14, 2023
d0516f8
Removes subsection to consolidate info for point observations.
DanielAdriaansen Apr 14, 2023
55dc1a9
#2474 Corrected API name, get_sample_point_obs
Apr 14, 2023
32d0f5b
#2474 Formating (intend)
Apr 14, 2023
3f09e21
@2474 Updated comments
Apr 14, 2023
d4c8844
#2474 Removed the convertion option
Apr 14, 2023
f921a9a
Merge branch 'feature_2285_read_point_data' of github.com:dtcenter/ME…
Apr 14, 2023
9b1134c
Cleans up code-block formatting and adds captions to relevant code bl…
DanielAdriaansen Apr 14, 2023
7d70498
Adds example of dual Python embedding for PointStat.
DanielAdriaansen Apr 14, 2023
abad322
Updates to the MPR section.
DanielAdriaansen Apr 14, 2023
38a7478
Removes Python embedding example and moves to Appendix F.
DanielAdriaansen Apr 14, 2023
aadfb92
Corrects RST error.
DanielAdriaansen Apr 14, 2023
e179642
RST link errors.
DanielAdriaansen Apr 14, 2023
47af55d
#2474 Formating (intend), Moved convert_point_data to under met_point…
Apr 14, 2023
aa395e5
Merge branch 'feature_2285_read_point_data' of github.com:dtcenter/ME…
Apr 14, 2023
c893ed0
#2474 Formating (intend), Moved convert_point_data to under met_point…
Apr 14, 2023
08aeeec
#2285 Check and give wwarning if met_point_data or point_data is miss…
Apr 17, 2023
465be3e
A few grammar/typo fixes.
DanielAdriaansen Apr 17, 2023
d28d550
Adds error messages for Python embedding if MET is not Python enabled.
DanielAdriaansen Apr 17, 2023
8b5989d
Removes examples for MPR/StatAnalysis since it's really just command …
DanielAdriaansen Apr 17, 2023
716f922
Adds brief blurb about the MET Python package.
DanielAdriaansen Apr 17, 2023
5244b66
Corrects path in MPR example and removes MET_BASE.
DanielAdriaansen Apr 17, 2023
d199e17
Update docs/Users_Guide/appendixF.rst
DanielAdriaansen Apr 17, 2023
fb43a77
Update docs/Users_Guide/appendixF.rst
DanielAdriaansen Apr 17, 2023
9890fd8
Adds missing scripts directory for two commands.
DanielAdriaansen Apr 17, 2023
2334d1a
Merge branch 'feature_2285_read_point_data' of github.com:dtcenter/ME…
DanielAdriaansen Apr 17, 2023
9364ae1
Update appendixF.rst
DanielAdriaansen Apr 18, 2023
ccd2612
Updates the MET_PYTHON_INPUT_ARG section of the documentation.
DanielAdriaansen Apr 19, 2023
7eef4df
Merge branch 'feature_2285_read_point_data' of github.com:dtcenter/ME…
DanielAdriaansen Apr 19, 2023
a849167
Breaks long command into 2 lines for readability.
DanielAdriaansen Apr 19, 2023
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
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

ACLOCAL_AMFLAGS = -I m4

SUBDIRS = data src scripts/Rscripts scripts/python scripts/utility
SUBDIRS = data src scripts/Rscripts scripts/python

if ENABLE_DEVELOPMENT
SUBDIRS += internal/test_util
Expand Down
5 changes: 2 additions & 3 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = data src scripts/Rscripts scripts/python \
scripts/utility internal/test_util
internal/test_util
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in INSTALL \
compile config.guess config.sub depcomp install-sh missing \
ylwrap
Expand Down Expand Up @@ -350,8 +350,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = data src scripts/Rscripts scripts/python scripts/utility \
$(am__append_1)
SUBDIRS = data src scripts/Rscripts scripts/python $(am__append_1)
MAINTAINERCLEANFILES = \
Makefile.in \
aclocal.m4 \
Expand Down
8 changes: 5 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8874,7 +8874,7 @@ done

# Create configured files

ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile scripts/utility/Makefile data/Makefile data/climo/Makefile data/climo/seeps/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/wrappers/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/basic/vx_util_math/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_pinterp/Makefile src/libcode/vx_data2d_nccf/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/libcode/vx_seeps/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile"
ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile scripts/python/examples/Makefile scripts/python/met/Makefile scripts/python/pyembed/Makefile scripts/python/utility/Makefile data/Makefile data/climo/Makefile data/climo/seeps/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/basic/vx_util_math/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_pinterp/Makefile src/libcode/vx_data2d_nccf/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/libcode/vx_seeps/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile"


if test -n "$MET_DEVELOPMENT"; then
Expand Down Expand Up @@ -9762,7 +9762,10 @@ do
"scripts/Rscripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Rscripts/Makefile" ;;
"scripts/Rscripts/include/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Rscripts/include/Makefile" ;;
"scripts/python/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/python/Makefile" ;;
"scripts/utility/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/utility/Makefile" ;;
"scripts/python/examples/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/python/examples/Makefile" ;;
"scripts/python/met/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/python/met/Makefile" ;;
"scripts/python/pyembed/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/python/pyembed/Makefile" ;;
"scripts/python/utility/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/python/utility/Makefile" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/climo/Makefile") CONFIG_FILES="$CONFIG_FILES data/climo/Makefile" ;;
"data/climo/seeps/Makefile") CONFIG_FILES="$CONFIG_FILES data/climo/seeps/Makefile" ;;
Expand All @@ -9774,7 +9777,6 @@ do
"data/poly/Makefile") CONFIG_FILES="$CONFIG_FILES data/poly/Makefile" ;;
"data/poly/HMT_masks/Makefile") CONFIG_FILES="$CONFIG_FILES data/poly/HMT_masks/Makefile" ;;
"data/poly/NCEP_masks/Makefile") CONFIG_FILES="$CONFIG_FILES data/poly/NCEP_masks/Makefile" ;;
"data/wrappers/Makefile") CONFIG_FILES="$CONFIG_FILES data/wrappers/Makefile" ;;
"data/ps/Makefile") CONFIG_FILES="$CONFIG_FILES data/ps/Makefile" ;;
"data/table_files/Makefile") CONFIG_FILES="$CONFIG_FILES data/table_files/Makefile" ;;
"data/tc_data/Makefile") CONFIG_FILES="$CONFIG_FILES data/tc_data/Makefile" ;;
Expand Down
6 changes: 4 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,10 @@ AC_CONFIG_FILES([Makefile
scripts/Rscripts/Makefile
scripts/Rscripts/include/Makefile
scripts/python/Makefile
scripts/utility/Makefile
scripts/python/examples/Makefile
scripts/python/met/Makefile
scripts/python/pyembed/Makefile
scripts/python/utility/Makefile
data/Makefile
data/climo/Makefile
data/climo/seeps/Makefile
Expand All @@ -1216,7 +1219,6 @@ AC_CONFIG_FILES([Makefile
data/poly/Makefile
data/poly/HMT_masks/Makefile
data/poly/NCEP_masks/Makefile
data/wrappers/Makefile
data/ps/Makefile
data/table_files/Makefile
data/tc_data/Makefile
Expand Down
3 changes: 1 addition & 2 deletions data/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ SUBDIRS = \
poly \
ps \
table_files \
tc_data \
wrappers
tc_data

topdir = $(pkgdatadir)

Expand Down
3 changes: 1 addition & 2 deletions data/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,7 @@ SUBDIRS = \
poly \
ps \
table_files \
tc_data \
wrappers
tc_data

topdir = $(pkgdatadir)
top_DATA = \
Expand Down
37 changes: 0 additions & 37 deletions data/wrappers/read_tmp_dataplane.py
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions data/wrappers/read_tmp_point_nc.py
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions data/wrappers/write_tmp_dataplane.py
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions data/wrappers/write_tmp_mpr.py
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions data/wrappers/write_tmp_point.py
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions data/wrappers/write_tmp_point_nc.py
View file
Open in desktop

This file was deleted.

Loading