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

Feature #1693 equal_area #2567

Merged
merged 39 commits into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3e9728f
Fist steps toward implementing the lamber azimuthal equal-area grid p…
rgbullock Apr 14, 2021
4371adb
Added a utility function to the spheroid class.
rgbullock Apr 26, 2021
5f483fa
Merge branch 'develop' into feature_1693_equal_area
JohnHalleyGotway Apr 29, 2021
91495ac
Per #1693, applying consistent formatting to the vx_grid library code…
JohnHalleyGotway Apr 29, 2021
baed5c6
Merge branch 'develop' into feature_1693_equal_area
JohnHalleyGotway May 10, 2021
69570c8
Per #1693, adding back in the definition of the EUMETNET grid.
JohnHalleyGotway May 13, 2021
c1a55f8
Per #1693, updated the vx_grid library to be able to read laea grids,…
JohnHalleyGotway May 13, 2021
5d550e5
Per #1693, write laea projection info to NetCDF output files.
JohnHalleyGotway May 19, 2021
1a8e558
Per #1693, this fixes a bug that also needs to be documented and fixe…
JohnHalleyGotway May 19, 2021
11ef514
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Oct 12, 2022
472ebaf
Per #1693, get the branch compiling again.
JohnHalleyGotway Oct 12, 2022
aaa4e05
Per #1693, updating the Makefile.in files on seneca.
JohnHalleyGotway Oct 12, 2022
4bd4b40
Per #1693, merge develop.
JohnHalleyGotway Oct 18, 2022
8ec51ad
Per #1693, updating makefiles.
JohnHalleyGotway Oct 18, 2022
9d30411
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Nov 1, 2022
5e6d6dc
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Nov 2, 2022
7b64779
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Nov 3, 2022
996f9ca
Per #1693, add a plot_data_plane unit test to visualize this LAEA dat…
JohnHalleyGotway Nov 3, 2022
513e27d
Per #16693, ci-skip-all update path.
JohnHalleyGotway Nov 3, 2022
603d87f
Per #1693, stubbing in support for the LaeaData info from GRIB2 files…
JohnHalleyGotway Nov 8, 2022
43e2974
Per #1693, define laea projection type string.
JohnHalleyGotway Nov 10, 2022
c5ba07a
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Nov 10, 2022
21b2378
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Nov 14, 2022
7945f3c
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Nov 16, 2022
b95961f
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Nov 18, 2022
7024e86
Per #1693, still not working great. There's a problem where I initial…
JohnHalleyGotway Nov 19, 2022
19d2651
Per #1693, add a test for NCCF LAEA.
JohnHalleyGotway Nov 20, 2022
b5750e1
Per #1693, cleanup. Still not working well though.
JohnHalleyGotway Nov 20, 2022
4cf43c7
Per #1693, add logic to parse laea grib2 grids.
JohnHalleyGotway Nov 20, 2022
21ed430
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Apr 10, 2023
ee1c993
Per #1693, get the feature branch compiling again
JohnHalleyGotway Apr 10, 2023
e6e661a
Changes to grid LAEA code
May 25, 2023
ce5da9b
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
May 25, 2023
4339532
Per #1693, ci-run-unit update unit_plot_data_plane.xml with the expec…
JohnHalleyGotway May 25, 2023
0e29d05
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Jun 9, 2023
5d04d03
Per #1693, update the TC-Diag Makefile to link to vx_geodesy upon whi…
JohnHalleyGotway Jun 9, 2023
7741195
Per #1693, comment out the 'plot_data_plane_LAEA_NCCF' test. Note tha…
JohnHalleyGotway Jun 9, 2023
901a786
Per #1693, needed to update Makefile.in for tc_diag as well
JohnHalleyGotway Jun 9, 2023
712f7b5
Merge remote-tracking branch 'origin/develop' into feature_1693_equal…
JohnHalleyGotway Jun 12, 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
32 changes: 32 additions & 0 deletions internal/test_unit/xml/unit_plot_data_plane.xml
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,38 @@
</output>
</test>

<test name="plot_data_plane_LAEA_GRIB2">
<exec>&MET_BIN;/plot_data_plane</exec>
<param> \
&DATA_DIR_MODEL;/grib2/ukv/ukv_agl_temperature_1.5_12.grib2 \
&OUTPUT_DIR;/plot_data_plane/ukv_agl_temperature_laea_grib2.ps \
'name="TMP"; level="Z1.5"; lead_time="24";' \
-title "GRIB2 LAEA 24-hour 1.5m Temperature" \
-v 1
</param>
<output>
<ps>&OUTPUT_DIR;/plot_data_plane/ukv_agl_temperature_laea_grib2.ps</ps>
</output>
</test>

<!-- MET #1693 removed support for CF-Compliant LAEA grids.
MET #2565 should restore this supoprt prior to the MET-11.1.0 release.

<test name="plot_data_plane_LAEA_NCCF">
<exec>&MET_BIN;/plot_data_plane</exec>
<param> \
&DATA_DIR_MODEL;/nccf/20221118T1200Z-PT0012H00M-temperature_at_screen_level.nc \
&OUTPUT_DIR;/plot_data_plane/air_temperature_laea_nccf.ps \
'name="air_temperature"; level="(*,*)";' \
-title "NCCF LAEA Air Temperature" \
-v 1
</param>
<output>
<ps>&OUTPUT_DIR;/plot_data_plane/air_temperature_laea_nccf.ps</ps>
</output>
</test>
-->

<test name="plot_data_plane_NCCF_POLAR_STEREO">
<exec>&MET_BIN;/plot_data_plane</exec>
<param> \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/basic/vx_util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ test_ascii_header_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/basic/vx_util/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ test_ascii_header_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
4 changes: 3 additions & 1 deletion internal/test_util/libcode/vx_data2d/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ test_table_read_LDADD = -lvx_config \
-lvx_gsl_prob \
-lvx_log \
-lvx_data2d \
-lvx_grid \
-lvx_grid \
-lvx_geodesy \
-lvx_util \
-lvx_cal \
-lvx_math \
Expand All @@ -35,6 +36,7 @@ dump_default_table_LDADD = -lvx_config \
-lvx_log \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_util \
-lvx_cal \
-lvx_math \
Expand Down
4 changes: 3 additions & 1 deletion internal/test_util/libcode/vx_data2d/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ test_table_read_LDADD = -lvx_config \
-lvx_gsl_prob \
-lvx_log \
-lvx_data2d \
-lvx_grid \
-lvx_grid \
-lvx_geodesy \
-lvx_util \
-lvx_cal \
-lvx_math \
Expand All @@ -345,6 +346,7 @@ dump_default_table_LDADD = -lvx_config \
-lvx_log \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_util \
-lvx_cal \
-lvx_math \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_factory/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ test_factory_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_factory/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ test_factory_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_grib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS}
test_read_grib1_LDADD = -lvx_data2d_grib \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_util_math \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_grib/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS}
test_read_grib1_LDADD = -lvx_data2d_grib \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_util_math \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_nc_met/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \
-lvx_nc_util \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_util_math \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_nc_met/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \
-lvx_nc_util \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_util_math \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_nccf/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \
-lvx_nc_util \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_util_math \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_data2d_nccf/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \
-lvx_nc_util \
-lvx_data2d \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_util_math \
Expand Down
2 changes: 2 additions & 0 deletions internal/test_util/libcode/vx_grid/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ test_grid_area_SOURCES = test_grid_area.cc
test_grid_area_CPPFLAGS = ${MET_CPPFLAGS}
test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS}
test_grid_area_LDADD = -lvx_grid \
-lvx_geodesy \
-lvx_geodesy \
-lvx_nav \
-lvx_util_math \
-lvx_util \
Expand Down
2 changes: 2 additions & 0 deletions internal/test_util/libcode/vx_grid/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ test_grid_area_SOURCES = test_grid_area.cc
test_grid_area_CPPFLAGS = ${MET_CPPFLAGS}
test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS}
test_grid_area_LDADD = -lvx_grid \
-lvx_geodesy \
-lvx_geodesy \
-lvx_nav \
-lvx_util_math \
-lvx_util \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_nc_util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ test_pressure_levels_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
1 change: 1 addition & 0 deletions internal/test_util/libcode/vx_nc_util/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ test_pressure_levels_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
3 changes: 2 additions & 1 deletion internal/test_util/libcode/vx_series_data/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ test_series_data_LDADD = -lvx_config \
-lvx_nc_util \
-lvx_log \
-lvx_data2d \
-lvx_grid \
-lvx_grid \
-lvx_geodesy \
-lvx_util \
-lvx_cal \
-lvx_math \
Expand Down
3 changes: 2 additions & 1 deletion internal/test_util/libcode/vx_series_data/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ test_series_data_LDADD = -lvx_config \
-lvx_nc_util \
-lvx_log \
-lvx_data2d \
-lvx_grid \
-lvx_grid \
-lvx_geodesy \
-lvx_util \
-lvx_cal \
-lvx_math \
Expand Down
2 changes: 2 additions & 0 deletions internal/test_util/libcode/vx_tc_util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ test_read_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down Expand Up @@ -75,6 +76,7 @@ test_read_prob_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
2 changes: 2 additions & 0 deletions internal/test_util/libcode/vx_tc_util/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ test_read_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down Expand Up @@ -381,6 +382,7 @@ test_read_prob_LDADD = -lvx_stat_out \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ test_velocity_LDADD = \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ test_velocity_LDADD = \
-lvx_nc_util \
-lvx_regrid \
-lvx_grid \
-lvx_geodesy \
-lvx_config \
-lvx_gsl_prob \
-lvx_cal \
Expand Down
16 changes: 8 additions & 8 deletions src/basic/vx_config/config.tab.cc
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ static void do_user_function_def();


#line 265 "config.tab.cc" /* yacc.c:337 */
# ifndef YY_nullptrPTR
# ifndef YY_NULLPTR
# if defined __cplusplus
# if 201103L <= __cplusplus
# define YY_nullptrPTR nullptr
# define YY_NULLPTR nullptr
# else
# define YY_nullptrPTR 0
# define YY_NULLPTR 0
# endif
# else
# define YY_nullptrPTR ((void*)0)
# define YY_NULLPTR ((void*)0)
# endif
# endif

Expand Down Expand Up @@ -694,7 +694,7 @@ static const char *const yytname[] =
"dictionary_list", "string_list", "threshold_list", "threshold",
"thresh_node", "simple_thresh", "number", "boolean_list", "opt_semi",
"opt_comma", "expression", "$@2", "$@3", "expression_list",
"piecewise_linear", "point_list", "point", YY_nullptrPTR
"piecewise_linear", "point_list", "point", YY_NULLPTR
};
#endif

Expand Down Expand Up @@ -1173,11 +1173,11 @@ static int
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yytype_int16 *yyssp, int yytoken)
{
YYSIZE_T yysize0 = yytnamerr (YY_nullptrPTR, yytname[yytoken]);
YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */
const char *yyformat = YY_nullptrPTR;
const char *yyformat = YY_NULLPTR;
/* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per
Expand Down Expand Up @@ -1234,7 +1234,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
}
yyarg[yycount++] = yytname[yyx];
{
YYSIZE_T yysize1 = yysize + yytnamerr (YY_nullptrPTR, yytname[yyx]);
YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
yysize = yysize1;
else
Expand Down
1 change: 1 addition & 0 deletions src/basic/vx_util/util_constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ static const char mercator_proj_type [] = "Mercator";
static const char lambert_proj_type [] = "Lambert Conformal";
static const char stereographic_proj_type [] = "Polar Stereographic";
static const char gaussian_proj_type [] = "Gaussian";
static const char laea_proj_type [] = "Lambert Azimuthal Equal Area";
static const char semilatlon_proj_type [] = "SemiLatLon";

// String containing all valid PrepBufr message types
Expand Down
16 changes: 8 additions & 8 deletions src/libcode/vx_color/color_parser_yacc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,15 @@ static Color dcolor_to_color(const Dcolor &);


#line 199 "color_parser_yacc.cc" /* yacc.c:337 */
# ifndef YY_nullptrPTR
# ifndef YY_NULLPTR
# if defined __cplusplus
# if 201103L <= __cplusplus
# define YY_nullptrPTR nullptr
# define YY_NULLPTR nullptr
# else
# define YY_nullptrPTR 0
# define YY_NULLPTR 0
# endif
# else
# define YY_nullptrPTR ((void*)0)
# define YY_NULLPTR ((void*)0)
# endif
# endif

Expand Down Expand Up @@ -591,7 +591,7 @@ static const char *const yytname[] =
"$end", "error", "$undefined", "ID", "COLOR_NAME", "INTEGER",
"QUOTED_STRING", "FLOAT", "BLEND", "HSV", "GRAYVALUE", "CMYK", "'='",
"'{'", "','", "'}'", "'('", "')'", "$accept", "statement_list",
"statement", "ctable_entry", "color_assignment", "color", "number", YY_nullptrPTR
"statement", "ctable_entry", "color_assignment", "color", "number", YY_NULLPTR
};
#endif

Expand Down Expand Up @@ -987,11 +987,11 @@ static int
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yytype_int16 *yyssp, int yytoken)
{
YYSIZE_T yysize0 = yytnamerr (YY_nullptrPTR, yytname[yytoken]);
YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */
const char *yyformat = YY_nullptrPTR;
const char *yyformat = YY_NULLPTR;
/* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per
Expand Down Expand Up @@ -1048,7 +1048,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
}
yyarg[yycount++] = yytname[yyx];
{
YYSIZE_T yysize1 = yysize + yytnamerr (YY_nullptrPTR, yytname[yyx]);
YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
yysize = yysize1;
else
Expand Down
Loading