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 1942 seeps #2257

Merged
merged 45 commits into from
Sep 16, 2022
Merged

Feature 1942 seeps #2257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1a28a05
#1942 Added SEEPS library
Aug 19, 2022
9bf7bc5
#1942 Changed the library order for the consistency
Aug 19, 2022
3dd6582
#1942 Added vx_seeps
Aug 19, 2022
37115ea
#1942 Added SEEPS
Aug 19, 2022
5561f2d
#1942 Added APIs for SEEPS
Aug 19, 2022
8354069
#X1942 Initial release
Aug 19, 2022
c8e9ab2
#1942 Initial release for SEEPS
Sep 8, 2022
9339ad5
#1942 Support SEEPS
Sep 8, 2022
8e7bf9b
#1942 Reduce log message
Sep 8, 2022
af11906
#1942 Added seeps_mpr_columns
Sep 8, 2022
4d576d3
#1942 Added get_seeps_score
Sep 8, 2022
cac6c78
#1942 write_seeps_mpr_row & write_seeps_mpr_cols
Sep 9, 2022
cea3ac2
#1942 use SeepsScore sctruct
Sep 9, 2022
abbb733
#1942 renamed seeps_columns to seeps_mpr_columns
Sep 9, 2022
9c1ef25
#1942 cleanup
Sep 9, 2022
704acba
#1942 Added SEEPS linetype
Sep 9, 2022
4317905
#1942 renamed filename (removed vx_
Sep 13, 2022
d5dea50
#1942 renamed filename (removed vx)_
Sep 13, 2022
2daedd8
#1942 Added SEEPS_MPR
Sep 13, 2022
7fc385b
#1942 Added missing comma
Sep 13, 2022
cf1bfd0
#1942 Added compute_aggregated_seeps
Sep 13, 2022
63d4e02
#1942 Added seeps_mpr and removed seeps_sa & seeps_ta
Sep 13, 2022
be8741f
Added seeps_mpr
Sep 13, 2022
89e41f1
Added method_name
Sep 13, 2022
f5f8faa
Added line type SEEPS and SEEPS_MPR
Sep 13, 2022
30556aa
#1942 Support NULL pointer (as deleting) on setting SEEPS score
Sep 13, 2022
8ab1e20
#1942 Switched the order of PF and PV
Sep 13, 2022
79b8432
942 Added SEEPS_MPR and SEEPS line types
Sep 13, 2022
ab84cd7
#1942 use nearest hour for SEEPS climo
Sep 13, 2022
9c761b9
#1942 Enabled SEEPS_MPR and SEEPS line type
Sep 13, 2022
6eda15c
#1942 Added two more output files to point_stat_GRIB1_NAM_TRMM
Sep 13, 2022
308aa03
#1942 Initial release
Sep 13, 2022
317009e
#1942 Changed syntax for Docker
Sep 13, 2022
a388176
Merge branch 'develop' into feature_1942_seeps
JohnHalleyGotway Sep 14, 2022
80320a6
Removing OPT_PYTHON_SOURCES setting from Makefile.am since its unused
Sep 15, 2022
086c51b
Updating the configure script to include the new vx_math_util library
Sep 15, 2022
71136cc
Per #1954, add output_flag seeps_mpr and seeps entries to a handful o…
Sep 15, 2022
87d2f0e
Per #1954, mostly just writespace formatting changes. However, also r…
Sep 15, 2022
3678056
Per #1942, install the seeps climo file into the expected MET_BASE/cl…
Sep 15, 2022
f7e6caa
Per #1942, update write_seeps_cols(). Remove unneeded int i argument …
Sep 15, 2022
13af531
Per #1942, the PointStatConfig_APCP config file is used by several te…
JohnHalleyGotway Sep 15, 2022
b812535
Per #1942, update the PointStatConfig_APCP file to make the seeps set…
JohnHalleyGotway Sep 16, 2022
b4f4982
#1942 FIlter out 24 hour precipitation
Sep 16, 2022
a8fb0b5
#1942 Filter out 24 hour precipitation
Sep 16, 2022
2b92327
Per #1942, update the unit tests to actually compute seeps for 24-hou…
JohnHalleyGotway Sep 16, 2022
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: 2 additions & 0 deletions Make-include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ MET_CPPFLAGS = -I${top_builddir}/src/basic/vx_cal \
-I${top_builddir}/src/libcode/vx_summary \
-I${top_builddir}/src/libcode/vx_time_series \
-I${top_builddir}/src/libcode/vx_series_data \
-I${top_builddir}/src/libcode/vx_seeps \
-I${top_builddir}/src/libcode/vx_tc_util

#-fPIC \
Expand Down Expand Up @@ -84,6 +85,7 @@ MET_LDFLAGS = -L${top_builddir}/src/basic/vx_cal \
-L${top_builddir}/src/libcode/vx_summary \
-L${top_builddir}/src/libcode/vx_time_series \
-L${top_builddir}/src/libcode/vx_series_data \
-L${top_builddir}/src/libcode/vx_seeps \
-L${top_builddir}/src/libcode/vx_tc_util

ENUM_TO_STRING = ${abs_top_builddir}/src/basic/enum_to_string/enum_to_string
5 changes: 4 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8848,7 +8848,7 @@ done

# Create configured files

ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile data/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/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 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"


if test -n "$MET_DEVELOPMENT"; then
Expand Down Expand Up @@ -9737,6 +9737,8 @@ do
"scripts/Rscripts/include/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Rscripts/include/Makefile" ;;
"scripts/python/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/python/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" ;;
"data/colortables/Makefile") CONFIG_FILES="$CONFIG_FILES data/colortables/Makefile" ;;
"data/colortables/NCL_colortables/Makefile") CONFIG_FILES="$CONFIG_FILES data/colortables/NCL_colortables/Makefile" ;;
"data/config/Makefile") CONFIG_FILES="$CONFIG_FILES data/config/Makefile" ;;
Expand Down Expand Up @@ -9796,6 +9798,7 @@ do
"src/libcode/vx_data2d_python/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_data2d_python/Makefile" ;;
"src/libcode/vx_bool_calc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_bool_calc/Makefile" ;;
"src/libcode/vx_pointdata_python/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_pointdata_python/Makefile" ;;
"src/libcode/vx_seeps/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_seeps/Makefile" ;;
"src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
"src/tools/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/Makefile" ;;
"src/tools/core/ensemble_stat/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/ensemble_stat/Makefile" ;;
Expand Down
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,6 +1184,8 @@ AC_CONFIG_FILES([Makefile
scripts/Rscripts/include/Makefile
scripts/python/Makefile
data/Makefile
data/climo/Makefile
data/climo/seeps/Makefile
data/colortables/Makefile
data/colortables/NCL_colortables/Makefile
data/config/Makefile
Expand Down Expand Up @@ -1243,6 +1245,7 @@ AC_CONFIG_FILES([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
Expand Down
3 changes: 2 additions & 1 deletion data/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@
## MA 02110-1301, USA.

SUBDIRS = \
climo \
colortables \
config \
map \
poly \
ps \
table_files \
tc_data \
wrappers
wrappers

topdir = $(pkgdatadir)

Expand Down
3 changes: 2 additions & 1 deletion data/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,14 +354,15 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
climo \
colortables \
config \
map \
poly \
ps \
table_files \
tc_data \
wrappers
wrappers

topdir = $(pkgdatadir)
top_DATA = \
Expand Down
23 changes: 23 additions & 0 deletions data/climo/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
## Copyright (C) 2000, 2006 Gary V. Vaughan
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2, or (at your option)
## any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
## MA 02110-1301, USA.

SUBDIRS = seeps

climodir = $(pkgdatadir)/climo

MAINTAINERCLEANFILES = Makefile.in
Loading