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

Update develop-ref after dtcenter/MET#2886 #2889

Merged
merged 87 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
d8572b9
2673 Moved dvariable declaration after include
Feb 2, 2024
6ebfdac
#2673 Move down namespace below include
Feb 2, 2024
c788602
Feature #2395 wdir (#2820)
JohnHalleyGotway Feb 14, 2024
67ee04e
Recent changes to branch protection rules for the develop branch have…
JohnHalleyGotway Feb 15, 2024
b558794
Feature #2280 ens_prob (#2823)
JohnHalleyGotway Feb 22, 2024
069cdbd
Merge remote-tracking branch 'origin/develop' into feature_2673_sonar…
Feb 22, 2024
7f513eb
#2673 Change 0 to nullptr
Feb 27, 2024
7483636
#2673 Change 0 to nullptr
Feb 27, 2024
f33de8e
#2673 Change 0 to nullptr
Feb 27, 2024
c1e99ea
#2673 Change 0 to nullptr
Feb 27, 2024
6c30e49
#2673 Change 0 to nullptr
Feb 27, 2024
5cca97e
Merge pull request #2827 from dtcenter/feature_2673_sonarqube_beta3_n…
hsoh-u Feb 27, 2024
83730cf
#2673 Removed the redundant parentheses with return
Feb 28, 2024
4d60e06
#2673 Removed the redundant parentheses with return
Feb 28, 2024
3ff3767
#2673 Removed the redundant parentheses with return
Feb 28, 2024
55f5d3e
#2673 Removed the redundant parentheses with return
Feb 28, 2024
6bb41bc
#2673 Removed the redundant parentheses with return
Feb 28, 2024
d82a979
#2673 Merged develop branch
Feb 28, 2024
481bb15
#2673 restored return statement
Feb 28, 2024
00b162b
Merge pull request #2828 from dtcenter/feature_2673_sonarqube_beta3_r…
hsoh-u Feb 28, 2024
bc7af99
#2673 Added std namespace
Feb 28, 2024
e872917
#2673 Moved down 'using namespace' statement. Removed trailing spaces
Feb 28, 2024
3eb4367
#2673 Moved down 'using namespace' statement.
Mar 1, 2024
3f92f6a
#2673 Moved down 'using namespace' statement.
Mar 1, 2024
a00c7be
#2673 Moved down 'using namespace' statement.
Mar 1, 2024
5706e97
#2673 Moved down 'using namespace' statement.
Mar 1, 2024
4821c37
Merge remote-tracking branch 'origin/develop' into feature_2673_sonar…
Mar 1, 2024
2509f7c
#2673 Added std namespace
Mar 5, 2024
ca64f00
#2673 Added std namespace
Mar 5, 2024
a7f0e06
#2673 Added std namespace
Mar 5, 2024
0b2a7da
Merge pull request #2831 from dtcenter/feature_2673_sonarqube_beta3_n…
hsoh-u Mar 6, 2024
0ab2466
#2673 Changed literal 1 to boolean value, true
Mar 6, 2024
4d7d4a2
Merge pull request #2832 from dtcenter/feature_2673_sonarqube_1_to_true
hsoh-u Mar 7, 2024
a6f7646
Feature #2673 enum_to_string (#2835)
JohnHalleyGotway Mar 14, 2024
108a895
Feature #2583 ecnt (#2825)
JohnHalleyGotway Mar 14, 2024
4c322aa
Revert #2825 since more documentation and testing is needed (#2837)
JohnHalleyGotway Mar 14, 2024
fd1b250
Feature #2583 ecnt fix IGN_OERR_CORR (#2838)
JohnHalleyGotway Mar 14, 2024
f113181
Update the pull request template to include a question about expected…
JohnHalleyGotway Mar 14, 2024
be3ce26
#2830 Changed enum Builtin to enum class
Mar 19, 2024
0153110
#2830 Converted enum to enum class at config_constants.h
Mar 19, 2024
0a771d4
Feature #2830 bootstrap enum (#2843)
JohnHalleyGotway Mar 23, 2024
98af717
Bugfix #2833 develop azimuth (#2840)
JohnHalleyGotway Mar 27, 2024
1c97607
#2830 Changed enum PadSize to enum class
Mar 27, 2024
40b67d4
#2830 Removed redundant parantheses
Mar 27, 2024
79f81af
#2830 Removed commenyted out code
Mar 27, 2024
cef8aad
Merge remote-tracking branch 'origin/develop' into feature_2830_sonar…
Mar 27, 2024
8cc667c
#2830 Use auto
Mar 27, 2024
d6cba7d
#2830 Changed enum to enum class for DistType, InterpMthd, GridTempla…
Mar 28, 2024
15987a1
#2830 Moved enum_class_as_integer from header file to cc files
Mar 28, 2024
8a277fa
#2830 Added enum_as_int.hpp
Apr 1, 2024
fa41fa3
#2830 Added enum_as_int.hpp
Apr 1, 2024
5c95525
Deleted enum_class_as_integer and renamed it to enum_class_as_int
Apr 1, 2024
62acda7
Removed redundant paranthese
Apr 1, 2024
6ac387f
#2830 Changed enum to enumclass
Apr 1, 2024
175f4ed
#2830 Changed enum_class_as_integer to enum_class_as_int
Apr 1, 2024
2c72a1b
Feature #2379 sonarqube gha (#2847)
JohnHalleyGotway Apr 2, 2024
a72e8c5
Hotfix related to #2379. The sonar.newCode.referenceBranch and sonar.…
JohnHalleyGotway Apr 2, 2024
2bef141
#2830 Changed enum STATJobType to enum class
Apr 3, 2024
9e0cd6d
#2830 Changed STATLineType to enum class
Apr 5, 2024
8fad8f2
#2830 Changed Action to enum class
Apr 5, 2024
6d8a3c7
#2830 Changed ModeDataType to enum class
Apr 5, 2024
df25b86
#2830 Changed StepCase to enum class
Apr 5, 2024
1f1d525
#2830 Changed enum to enum class
Apr 5, 2024
aebdd2a
#2830 Changed GenesisPairCategory to enum class
Apr 5, 2024
00380dc
#2830 Removed rediundabt parenrthese
Apr 5, 2024
42c453e
#2830 Reduced same if checking
Apr 5, 2024
2bd5dcf
#2830 Cleanup
Apr 5, 2024
1f32746
#2830 USe empty() instead of lebgth checking
Apr 5, 2024
0811740
#2830 Adjusted indentations
Apr 5, 2024
e71debf
Feature #2379 develop sonarqube updates (#2850)
JohnHalleyGotway Apr 8, 2024
78f1824
Merge remote-tracking branch 'origin/develop' into feature_2830_sonar…
JohnHalleyGotway Apr 8, 2024
3d543fc
Merge pull request #2849 from dtcenter/feature_2830_sonarqube_enum
hsoh-u Apr 8, 2024
2a26d59
Feature 2654 ascii2nc polar buoy support (#2846)
davidalbo Apr 10, 2024
f78720b
Feature #2786 rpss_from_prob (#2861)
JohnHalleyGotway Apr 17, 2024
947b061
Feature #2862 v12.0.0-beta4 (#2864)
JohnHalleyGotway Apr 17, 2024
406d991
Feature #2379 develop single_sq_project (#2865)
JohnHalleyGotway Apr 18, 2024
0a219b5
Hotfix to the documentation in the develop branch. Issue #2858 was cl…
JohnHalleyGotway Apr 18, 2024
d4c4eba
Feature 2842 ugrid config (#2852)
hsoh-u Apr 25, 2024
3caffb4
Feature 2753 comp script config (#2868)
jprestop Apr 29, 2024
d3ecc87
Feature #2795 level_mismatch_warning (#2873)
JohnHalleyGotway Apr 30, 2024
ccd1061
Feature #2870 removing_MISSING_warning (#2872)
JohnHalleyGotway May 1, 2024
7f9bf9c
Feature 2842 ugrid config (#2875)
hsoh-u May 1, 2024
566d4fb
Hotfix to develop branch to remove duplicate test named 'point_stat_u…
JohnHalleyGotway May 1, 2024
542b4ba
Feature 2748 document ugrid (#2869)
DanielAdriaansen May 7, 2024
79ac568
Feature #2781 Convert MET NetCDF point obs to Pandas DataFrame (#2877)
georgemccabe May 8, 2024
a960cc6
Feature #2833 pcp_combine_missing (#2886)
JohnHalleyGotway May 15, 2024
8ebc795
Merge remote-tracking branch 'origin/develop-ref' into update_truth_f…
metplus-bot May 15, 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
11 changes: 7 additions & 4 deletions docs/Users_Guide/reformat_grid.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ The usage statement for the Pcp-Combine tool is shown below:
out_file
[-field string]
[-name list]
[-input_thresh n]
[-vld_thresh n]
[-log file]
[-v level]
Expand Down Expand Up @@ -79,13 +80,15 @@ Optional Arguments for pcp_combine

4. The **-name list** option is a comma-separated list of output variable names which override the default choices. If specified, the number of names must match the number of variables to be written to the output file.

5. The **-vld_thresh n** option overrides the default required ratio of valid data for at each grid point for an output value to be written. The default is 1.0.
5. The **-input_thresh n** option overrides the default required ratio of valid input files. This option does not apply to the -subtract command where exactly two valid inputs are required. The default is 1.0.

6. The **-log file** option directs output and errors to the specified log file. All messages will be written to that file as well as standard out and error. Thus, users can save the messages without having to redirect the output on the command line. The default behavior is no log file.
6. The **-vld_thresh n** option overrides the default required ratio of valid data at each grid point for an output value to be written. The default is 1.0.

7. The **-v level** option indicates the desired level of verbosity. The contents of "level" will override the default setting of 2. Setting the verbosity to 0 will make the tool run with no log messages, while increasing the verbosity above 1 will increase the amount of logging.
7. The **-log file** option directs output and errors to the specified log file. All messages will be written to that file as well as standard out and error. Thus, users can save the messages without having to redirect the output on the command line. The default behavior is no log file.

8. The **-compress level** option indicates the desired level of compression (deflate level) for NetCDF variables. The valid level is between 0 and 9. The value of "level" will override the default setting of 0 from the configuration file or the environment variable MET_NC_COMPRESS. Setting the compression level to 0 will make no compression for the NetCDF output. Lower number is for fast compression and higher number is for better compression.
8. The **-v level** option indicates the desired level of verbosity. The contents of "level" will override the default setting of 2. Setting the verbosity to 0 will make the tool run with no log messages, while increasing the verbosity above 1 will increase the amount of logging.

9. The **-compress level** option indicates the desired level of compression (deflate level) for NetCDF variables. The valid level is between 0 and 9. The value of "level" will override the default setting of 0 from the configuration file or the environment variable MET_NC_COMPRESS. Setting the compression level to 0 will make no compression for the NetCDF output. Lower number is for fast compression and higher number is for better compression.

Required Arguments for the pcp_combine Sum Command
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
36 changes: 31 additions & 5 deletions internal/test_unit/xml/unit_pcp_combine.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
</output>
</test>

<test name="pcp_combine_sum_GRIB1_MISSING">
<exec>&MET_BIN;/pcp_combine</exec>
<param> \
20120409_00 3 20120412_15 12 \
&OUTPUT_DIR;/pcp_combine/nam_2012040900_F087_APCP12.nc \
-pcpdir &DATA_DIR_MODEL;/grib1/nam \
-input_thresh 0.75
</param>
<output>
<grid_nc>&OUTPUT_DIR;/pcp_combine/nam_2012040900_F087_APCP12.nc</grid_nc>
</output>
</test>

<test name="pcp_combine_sum_GRIB1_MULTIPLE_FIELDS">
<exec>&MET_BIN;/pcp_combine</exec>
<param> \
Expand Down Expand Up @@ -292,22 +305,26 @@
<!-- - multiple -field options -->
<!-- -->
<test name="pcp_combine_derive_MULTIPLE_FIELDS">
<exec>echo "&DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040912_F024.grib \
<exec>echo "MISSING \
&DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-fer-gep5/arw-fer-gep5_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-sch-gep2/arw-sch-gep2_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-sch-gep6/arw-sch-gep6_2012040912_F024.grib \
MISSING/optional/path/to/missing/file \
&DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-tom-gep7/arw-tom-gep7_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/nmm-fer-gep4/nmm-fer-gep4_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/nmm-fer-gep8/nmm-fer-gep8_2012040912_F024.grib" \
> &OUTPUT_DIR;/pcp_combine/derive_file_list; \
&DATA_DIR_MODEL;/grib1/nmm-fer-gep8/nmm-fer-gep8_2012040912_F024.grib \
&DATA_DIR_MODEL;/path/to/missing/file" \
> &OUTPUT_DIR;/pcp_combine/derive_file_list_missing; \
&MET_BIN;/pcp_combine</exec>
<param> \
-derive mean,stdev,vld_count \
&OUTPUT_DIR;/pcp_combine/derive_file_list \
&OUTPUT_DIR;/pcp_combine/derive_file_list_missing \
-field 'name="TMP"; level="Z2";' \
-field 'name="UGRD"; level="Z10";' \
-field 'name="VGRD"; level="Z10";' \
-input_thresh 0.7 \
&OUTPUT_DIR;/pcp_combine/derive_2012040912_F024_MULTIPLE_FIELDS.nc
</param>
<output>
Expand All @@ -322,7 +339,16 @@
<!-- - multiple -field options -->
<!-- -->
<test name="pcp_combine_derive_VLD_THRESH">
<exec>&MET_BIN;/pcp_combine</exec>
<exec>echo "&DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-fer-gep5/arw-fer-gep5_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-sch-gep2/arw-sch-gep2_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-sch-gep6/arw-sch-gep6_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/arw-tom-gep7/arw-tom-gep7_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/nmm-fer-gep4/nmm-fer-gep4_2012040912_F024.grib \
&DATA_DIR_MODEL;/grib1/nmm-fer-gep8/nmm-fer-gep8_2012040912_F024.grib" \
> &OUTPUT_DIR;/pcp_combine/derive_file_list; \
&MET_BIN;/pcp_combine</exec>
<param> \
-derive mean,stdev,vld_count \
&OUTPUT_DIR;/pcp_combine/derive_file_list \
Expand Down
9 changes: 8 additions & 1 deletion src/libcode/vx_data2d_factory/parse_file_list.cc
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,18 @@ GrdFileType ftype = FileType_None;

for ( int i=0; i<file_list.n(); i++ ) {

//
// check for python inputs
//

bool is_python = (file_list[i].find(conf_val_python_xarray) == 0) ||
(file_list[i].find(conf_val_python_numpy) == 0);

//
// skip missing files
//

if( !file_exists(file_list[i].c_str()) ) continue;
if( !file_exists(file_list[i].c_str()) && !is_python ) continue;

//
// get the current file type
Expand Down
Loading