Skip to content

Commit

Permalink
Update develop-ref after #2256, and #2257, and #2262. (#2263)
Browse files Browse the repository at this point in the history
Co-authored-by: Howard Soh <[email protected]>
Co-authored-by: jprestop <[email protected]>
Co-authored-by: Julie Prestopnik <[email protected]>
Co-authored-by: j-opatz <[email protected]>
Co-authored-by: Randy Bullock <[email protected]>
Co-authored-by: davidfillmore <[email protected]>
Co-authored-by: rgbullock <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
Co-authored-by: johnhg <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
Co-authored-by: Seth Linden <[email protected]>
Co-authored-by: George McCabe <[email protected]>
Co-authored-by: Seth Linden <[email protected]>
Co-authored-by: Howard Soh <[email protected]>
Co-authored-by: Seth Linden <[email protected]>
Co-authored-by: hsoh-u <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
Co-authored-by: MET Tools Test Account <[email protected]>
Co-authored-by: mo-mglover <[email protected]>
Co-authored-by: davidalbo <[email protected]>
Co-authored-by: lisagoodrich <[email protected]>
Co-authored-by: Dan Adriaansen <[email protected]>
Co-authored-by: Dave Albo <[email protected]>
Co-authored-by: Lisa Goodrich <[email protected]>
Co-authored-by: Molly Smith <[email protected]>
Co-authored-by: Jonathan Vigh <[email protected]>
Co-authored-by: bikegeek <[email protected]>
  • Loading branch information
26 people authored Sep 18, 2022
1 parent 310c471 commit f7c2f4c
Show file tree
Hide file tree
Showing 229 changed files with 30,784 additions and 532 deletions.
3 changes: 3 additions & 0 deletions .github/jobs/build_docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@ time_command docker build -t ${DOCKERHUB_TAG} \
-f $DOCKERFILE_PATH ${GITHUB_WORKSPACE}
if [ $? != 0 ]; then
cat ${GITHUB_WORKSPACE}/docker_build.log
# Append the full make_install.log file
echo "Appending make_install.log to docker_build.log. See the logs artifact for details."
cat ${GITHUB_WORKSPACE}/make_install.log >> ${GITHUB_WORKSPACE}/docker_build.log
exit 1
fi
14 changes: 14 additions & 0 deletions .github/workflows/release-checksum.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Add checksum to release

on:
release:
types:
- published

jobs:
add-checksum:
runs-on: ubuntu-latest
steps:
- uses: dtcenter/metplus-action-release-checksum@v1
with:
token: ${{ secrets.METPLUS_BOT_TOKEN }}
4 changes: 4 additions & 0 deletions Make-include
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ MET_CPPFLAGS = -I${top_builddir}/src/basic/vx_cal \
-I${top_builddir}/src/basic/vx_log \
-I${top_builddir}/src/basic/vx_math \
-I${top_builddir}/src/basic/vx_util \
-I${top_builddir}/src/basic/vx_util_math \
-I${top_builddir}/src/libcode/vx_afm \
-I${top_builddir}/src/libcode/vx_analysis_util \
-I${top_builddir}/src/libcode/vx_color \
Expand Down Expand Up @@ -38,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 All @@ -47,6 +49,7 @@ MET_LDFLAGS = -L${top_builddir}/src/basic/vx_cal \
-L${top_builddir}/src/basic/vx_log \
-L${top_builddir}/src/basic/vx_math \
-L${top_builddir}/src/basic/vx_util \
-L${top_builddir}/src/basic/vx_util_math \
-L${top_builddir}/src/libcode/vx_afm \
-L${top_builddir}/src/libcode/vx_analysis_util \
-L${top_builddir}/src/libcode/vx_color \
Expand Down Expand Up @@ -82,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
6 changes: 5 additions & 1 deletion configure
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/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 All @@ -9757,6 +9759,7 @@ do
"src/basic/vx_log/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_log/Makefile" ;;
"src/basic/vx_math/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_math/Makefile" ;;
"src/basic/vx_util/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_util/Makefile" ;;
"src/basic/vx_util_math/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_util_math/Makefile" ;;
"src/libcode/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/Makefile" ;;
"src/libcode/vx_afm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_afm/Makefile" ;;
"src/libcode/vx_analysis_util/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_analysis_util/Makefile" ;;
Expand Down Expand Up @@ -9795,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
4 changes: 4 additions & 0 deletions configure.ac
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 All @@ -1204,6 +1206,7 @@ AC_CONFIG_FILES([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
Expand Down Expand Up @@ -1242,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
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
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
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

0 comments on commit f7c2f4c

Please sign in to comment.