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

Update main_v11.1-ref after dtcenter/MET#2980 #2982

Merged
merged 43 commits into from
Sep 26, 2024
Merged

Update main_v11.1-ref after dtcenter/MET#2980 #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
40a4050
Add user execute permissions to compile script - main_v11.1 (#2740)
georgemccabe Nov 16, 2023
78274cd
Changing -j to "-j 5" as the recommended value for MAKE_ARGS
jprestop Nov 30, 2023
48f4f5f
Per #2761, update the MET development environment after upgrading sen…
JohnHalleyGotway Dec 12, 2023
c67c7c9
Per #2761, define runtime python version for testing rather than usi…
Dec 12, 2023
0ae6c03
Per #2761, fix setting ci-skip-all
Dec 13, 2023
7d33415
Per #2761, patching test_util.R to use the -C command line option for…
Dec 13, 2023
309e853
#2652 Added find_var_by_standard_name and separated common codes to f…
Dec 13, 2023
51883fd
#2757 The SonarQube token and URL are replaced with the pre-defined s…
Dec 13, 2023
216b2f5
#2757 Get the email list from the environment variable MET_CRON_EMAIL…
Dec 13, 2023
a4b3abc
#2757 The SonarQube token and URL are replaced by using the environme…
Dec 13, 2023
6bd6f5d
Merge pull request #2763 from dtcenter/bugfix_2652_polar_CF_main_v11.1
hsoh-u Dec 14, 2023
ce30b8f
Merge pull request #2766 from dtcenter/feature_2757_SonarQube_token_m…
hsoh-u Dec 14, 2023
8c1e658
Bugfix #2760 main_v11.1 --enable-python (#2767)
JohnHalleyGotway Dec 14, 2023
b9702a8
#2755 Added a header count and checking header count instead of using…
Dec 20, 2023
e2fd280
Bugfix #2782 main_v11.1 MASSDEN (#2784)
JohnHalleyGotway Jan 11, 2024
7af9925
Removing ${MAKE_ARGS} in some locations
jprestop Jan 17, 2024
3756107
Adding -lnetcdf -lm to configure_lib_args for NetCDF-CXX
jprestop Jan 17, 2024
aab399e
Merge pull request #2773 from dtcenter/bugfix_2755_python_emb_for_sin…
hsoh-u Jan 22, 2024
df8fa78
Feature #2796 main_v11.1 gha node20 (#2798)
JohnHalleyGotway Jan 25, 2024
33c9637
Create 11.1.0_casper
jprestop Feb 5, 2024
b1d575a
Recent changes to branch protection rules for the main_vX.Y branches …
JohnHalleyGotway Feb 15, 2024
1496977
Merge branch 'main_v11.1' of https://github.com/dtcenter/MET into mai…
JohnHalleyGotway Feb 15, 2024
2aa027a
Update the pull request template to include a question about expected…
JohnHalleyGotway Mar 14, 2024
c6ac1cd
Bugfix #2833 main_v11.1 azimuth (#2834)
JohnHalleyGotway Mar 27, 2024
8ee59fc
Feature #2379 main_v11.1 sonarqube GHA (#2848)
JohnHalleyGotway Apr 3, 2024
7a8712d
Feature #2379 main_v11.1 sonarqube updates (#2851)
JohnHalleyGotway Apr 8, 2024
57d404a
Feature #2379 main_v11.1 single_sq_project (#2866)
JohnHalleyGotway Apr 18, 2024
eb35a2e
Bugfix 2867 point2grid qc flag main v11.1 (#2874)
hsoh-u May 3, 2024
d86908c
Bugfix 2867 point2grid qc flag main v11.1 (#2878)
hsoh-u May 6, 2024
5c92ef0
#2884 No filtering by QC flags without -qc option (#2885)
hsoh-u May 15, 2024
16aac92
Per #2659, making updates as proposed at the 20240516 MET Eng. Mtg. (…
jprestop May 21, 2024
1c1683e
Bugfix #2897 main_v11.1 python_valid_time (#2898)
JohnHalleyGotway May 22, 2024
b0dfe70
#2687 Saved the PBL input into the vector (#2903)
JohnHalleyGotway May 24, 2024
4ccaa20
#2904 Changed R path to R-4.4.0 (#2909)
hsoh-u Jun 7, 2024
371f17a
Bugfix #2856 main_v11.1 ens_climo (#2917)
JohnHalleyGotway Jun 20, 2024
70cac59
Bugfix #2841 main_v11.1 tang_rad_winds (#2920)
JohnHalleyGotway Jun 24, 2024
d96f982
Feature #2855 v11.1.1 (#2923)
JohnHalleyGotway Jun 24, 2024
9aed919
Update conf.py with actual 11.1.1 release date
JohnHalleyGotway Jun 25, 2024
930d8cd
bugfix #2936 point2grid for tripolar GFS input (#2945)
hsoh-u Aug 15, 2024
c65c102
Bugfix #2958 main_v11.1 BAGSS SEDI CI (#2960)
JohnHalleyGotway Sep 5, 2024
5248377
Bugfix #2958 main_v11.1 ORSS (#2972)
JohnHalleyGotway Sep 17, 2024
c97ff92
Bugfix #2979 main_v11.1 MTD Grid (#2980)
JohnHalleyGotway Sep 26, 2024
8aa3d89
Merge remote-tracking branch 'origin/main_v11.1-ref' into update_trut…
metplus-bot Sep 26, 2024
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
1 change: 0 additions & 1 deletion internal/test_util/tools/other/mode_time_domain/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ test_velocity_LDADD = \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_partition.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_read_data.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_txt_output.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_grid.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_utils_local.o \
-lvx_pxm \
-lvx_plot_util \
Expand Down
2 changes: 0 additions & 2 deletions internal/test_util/tools/other/mode_time_domain/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ test_velocity_DEPENDENCIES = ${top_builddir}/src/tools/other/mode_time_domain/mt
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_partition.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_read_data.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_txt_output.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_grid.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_utils_local.o \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
test_velocity_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
Expand Down Expand Up @@ -362,7 +361,6 @@ test_velocity_LDADD = \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_partition.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_read_data.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_txt_output.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_grid.o \
${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_utils_local.o \
-lvx_pxm \
-lvx_plot_util \
Expand Down
1 change: 0 additions & 1 deletion src/tools/other/mode_time_domain/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ bin_PROGRAMS = mtd
mtd_SOURCES = mtd.cc \
mtdfiletype_to_string.cc mtdfiletype_to_string.h \
nc_utils_local.cc nc_utils_local.h \
nc_grid.cc nc_grid.h \
3d_moments.cc 3d_moments.h \
2d_moments.cc 2d_moments.h \
fo_node.cc fo_node.h \
Expand Down
34 changes: 8 additions & 26 deletions src/tools/other/mode_time_domain/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_mtd_OBJECTS = mtd-mtd.$(OBJEXT) mtd-mtdfiletype_to_string.$(OBJEXT) \
mtd-nc_utils_local.$(OBJEXT) mtd-nc_grid.$(OBJEXT) \
mtd-3d_moments.$(OBJEXT) mtd-2d_moments.$(OBJEXT) \
mtd-fo_node.$(OBJEXT) mtd-fo_node_array.$(OBJEXT) \
mtd-fo_graph.$(OBJEXT) mtd-mtd_config_info.$(OBJEXT) \
mtd-mtd_file_base.$(OBJEXT) mtd-mtd_file_float.$(OBJEXT) \
mtd-mtd_file_int.$(OBJEXT) mtd-mtd_read_data.$(OBJEXT) \
mtd-3d_att.$(OBJEXT) mtd-3d_att_single_array.$(OBJEXT) \
mtd-nc_utils_local.$(OBJEXT) mtd-3d_moments.$(OBJEXT) \
mtd-2d_moments.$(OBJEXT) mtd-fo_node.$(OBJEXT) \
mtd-fo_node_array.$(OBJEXT) mtd-fo_graph.$(OBJEXT) \
mtd-mtd_config_info.$(OBJEXT) mtd-mtd_file_base.$(OBJEXT) \
mtd-mtd_file_float.$(OBJEXT) mtd-mtd_file_int.$(OBJEXT) \
mtd-mtd_read_data.$(OBJEXT) mtd-3d_att.$(OBJEXT) \
mtd-3d_att_single_array.$(OBJEXT) \
mtd-3d_att_pair_array.$(OBJEXT) mtd-2d_att.$(OBJEXT) \
mtd-2d_att_array.$(OBJEXT) mtd-3d_conv.$(OBJEXT) \
mtd-mtd_txt_output.$(OBJEXT) mtd-mtd_nc_output.$(OBJEXT) \
Expand Down Expand Up @@ -151,7 +151,7 @@ am__depfiles_remade = ./$(DEPDIR)/mtd-2d_att.Po \
./$(DEPDIR)/mtd-mtd_read_data.Po \
./$(DEPDIR)/mtd-mtd_txt_output.Po \
./$(DEPDIR)/mtd-mtdfiletype_to_string.Po \
./$(DEPDIR)/mtd-nc_grid.Po ./$(DEPDIR)/mtd-nc_utils_local.Po
./$(DEPDIR)/mtd-nc_utils_local.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
Expand Down Expand Up @@ -357,7 +357,6 @@ MAINTAINERCLEANFILES = Makefile.in
mtd_SOURCES = mtd.cc \
mtdfiletype_to_string.cc mtdfiletype_to_string.h \
nc_utils_local.cc nc_utils_local.h \
nc_grid.cc nc_grid.h \
3d_moments.cc 3d_moments.h \
2d_moments.cc 2d_moments.h \
fo_node.cc fo_node.h \
Expand Down Expand Up @@ -525,7 +524,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtd-mtd_read_data.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtd-mtd_txt_output.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtd-mtdfiletype_to_string.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtd-nc_grid.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtd-nc_utils_local.Po@am__quote@ # am--include-marker

$(am__depfiles_remade):
Expand Down Expand Up @@ -590,20 +588,6 @@ mtd-nc_utils_local.obj: nc_utils_local.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtd-nc_utils_local.obj `if test -f 'nc_utils_local.cc'; then $(CYGPATH_W) 'nc_utils_local.cc'; else $(CYGPATH_W) '$(srcdir)/nc_utils_local.cc'; fi`

mtd-nc_grid.o: nc_grid.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtd-nc_grid.o -MD -MP -MF $(DEPDIR)/mtd-nc_grid.Tpo -c -o mtd-nc_grid.o `test -f 'nc_grid.cc' || echo '$(srcdir)/'`nc_grid.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mtd-nc_grid.Tpo $(DEPDIR)/mtd-nc_grid.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='nc_grid.cc' object='mtd-nc_grid.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtd-nc_grid.o `test -f 'nc_grid.cc' || echo '$(srcdir)/'`nc_grid.cc

mtd-nc_grid.obj: nc_grid.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtd-nc_grid.obj -MD -MP -MF $(DEPDIR)/mtd-nc_grid.Tpo -c -o mtd-nc_grid.obj `if test -f 'nc_grid.cc'; then $(CYGPATH_W) 'nc_grid.cc'; else $(CYGPATH_W) '$(srcdir)/nc_grid.cc'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mtd-nc_grid.Tpo $(DEPDIR)/mtd-nc_grid.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='nc_grid.cc' object='mtd-nc_grid.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtd-nc_grid.obj `if test -f 'nc_grid.cc'; then $(CYGPATH_W) 'nc_grid.cc'; else $(CYGPATH_W) '$(srcdir)/nc_grid.cc'; fi`

mtd-3d_moments.o: 3d_moments.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtd-3d_moments.o -MD -MP -MF $(DEPDIR)/mtd-3d_moments.Tpo -c -o mtd-3d_moments.o `test -f '3d_moments.cc' || echo '$(srcdir)/'`3d_moments.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mtd-3d_moments.Tpo $(DEPDIR)/mtd-3d_moments.Po
Expand Down Expand Up @@ -1048,7 +1032,6 @@ distclean: distclean-am
-rm -f ./$(DEPDIR)/mtd-mtd_read_data.Po
-rm -f ./$(DEPDIR)/mtd-mtd_txt_output.Po
-rm -f ./$(DEPDIR)/mtd-mtdfiletype_to_string.Po
-rm -f ./$(DEPDIR)/mtd-nc_grid.Po
-rm -f ./$(DEPDIR)/mtd-nc_utils_local.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
Expand Down Expand Up @@ -1118,7 +1101,6 @@ maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/mtd-mtd_read_data.Po
-rm -f ./$(DEPDIR)/mtd-mtd_txt_output.Po
-rm -f ./$(DEPDIR)/mtd-mtdfiletype_to_string.Po
-rm -f ./$(DEPDIR)/mtd-nc_grid.Po
-rm -f ./$(DEPDIR)/mtd-nc_utils_local.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
Expand Down
1 change: 1 addition & 0 deletions src/tools/other/mode_time_domain/mtd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
// 004 07-06-22 Howard Soh METplus-Internal #19 Rename main to met_main
// 005 08-01-22 Albo MET #1971 Differing time steps
// 006 10-03-22 Prestopnik MET #2227 Remove using namespace std from header files
// 007 09-25-24 Halley Gotway MET #2979 Fix for all supported projections
//
////////////////////////////////////////////////////////////////////////

Expand Down
14 changes: 8 additions & 6 deletions src/tools/other/mode_time_domain/mtd_file_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ using namespace netCDF;
#include "mtd_file.h"
#include "mtd_partition.h"
#include "mtd_nc_defs.h"
#include "nc_grid.h"
#include "nc_utils_local.h"
#include "mtdfiletype_to_string.h"
#include "get_met_grid.h"
#include "write_netcdf.h"

#include "vx_math.h"

Expand Down Expand Up @@ -433,7 +434,7 @@ Nt = GET_NC_SIZE(dim);

G = new Grid;

read_nc_grid(f, *G);
read_netcdf_grid(&f, *G);

// timestamp info

Expand Down Expand Up @@ -480,15 +481,16 @@ void MtdFileBase::write(NcFile & f) const
char junk[256];
ConcatString s;

// Nx, Ny, Nt
// Add the time dimension

add_dim(&f, nx_dim_name, Nx);
add_dim(&f, ny_dim_name, Ny);
add_dim(&f, nt_dim_name, Nt);

// Grid

write_nc_grid(f, *G);
NcDim ny_dim;
NcDim nx_dim;

write_netcdf_proj(&f, *G, ny_dim, nx_dim);

// timestamp info

Expand Down
12 changes: 4 additions & 8 deletions src/tools/other/mode_time_domain/mtd_nc_output.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,9 @@ const bool have_pairs = (fcst_obj.n_objects() != 0)
&& ( obs_obj.n_objects() != 0);

//
// dimensions
// add time dimension
//

nx_dim = add_dim(&out, nx_dim_name, fcst_raw.nx());
ny_dim = add_dim(&out, ny_dim_name, fcst_raw.ny());
nt_dim = add_dim(&out, nt_dim_name, fcst_raw.nt());

//
Expand All @@ -82,7 +80,7 @@ nt_dim = add_dim(&out, nt_dim_name, fcst_raw.nt());
write_netcdf_global(&out, output_filename, "MTD",
config.model.c_str(), config.obtype.c_str(), config.desc.c_str());

write_nc_grid(out, fcst_raw.grid());
write_netcdf_proj(&out, fcst_raw.grid(), ny_dim, nx_dim);

//
// variables
Expand Down Expand Up @@ -150,11 +148,9 @@ if ( IS_INVALID_NC(out) ) {
}

//
// dimensions
// add time dimension
//

nx_dim = add_dim(&out, nx_dim_name, raw.nx());
ny_dim = add_dim(&out, ny_dim_name, raw.ny());
nt_dim = add_dim(&out, nt_dim_name, raw.nt());

//
Expand All @@ -164,7 +160,7 @@ nt_dim = add_dim(&out, nt_dim_name, raw.nt());
write_netcdf_global(&out, output_filename, "MTD",
config.model.c_str(), config.obtype.c_str(), config.desc.c_str());

write_nc_grid(out, raw.grid());
write_netcdf_proj(&out, raw.grid(), ny_dim, nx_dim);

//
// variables
Expand Down
1 change: 0 additions & 1 deletion src/tools/other/mode_time_domain/mtd_nc_output.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@


#include "mtd_nc_defs.h"
#include "nc_grid.h"
#include "nc_utils_local.h"

#include "mtd_file_float.h"
Expand Down
Loading