Feature #2966 local_solar_time #3008
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… messages for consistent and eliminate the warning about -thresh not being specified becuase its fine to not specify a threshold.
…messages align well.
… supported in a single run. Still need to update the user's guide.
…tions in a single run
22 tasks
22 tasks
…est to demonstrate, and update the mask_type attribute to include the magic string for the gridded data used for data masking.
…center/MET into feature_2966_local_solar_time
|
Based on this issue comment, requesting this PR review from @CPKalb. Tina, please LMK if you have any questions or run into any issues. |
|
I'd previously found some differences in the presence of timing attributes being added to the Gen-Vx-Mask output files. I updated the logic with this commit to eliminate those diffs. The remaining diffs flagged by the GHA testing workflow are all expected, including the addition of the |
|
@CPKalb based on you feedback over Slack, this morning I committed these changes to the usage statement and documentation. Please advise if those changes are sufficient or more are needed. |
CPKalb
approved these changes
Nov 23, 2024
JohnHalleyGotway
added a commit
that referenced
this pull request
Nov 23, 2024
* 2673 Moved dvariable declaration after include * #2673 Move down namespace below include * Feature #2395 wdir (#2820) * Per #2395, add new columns to VL1L2, VAL1L2, and VCNT line types for wind direction statistics. Work still in progress. * Per #2395, write the new VCNT columns to the output and document the additions to the VL1L2, VAL1L2, and VCNT columns. * Per #2395, add the definition of new statistics to Appendix G. * Per #2395, update file version history. * Per #2395, tweak warning message about zero wind vectors and update grid-stat and point-stat to log calls to the do_vl1l2() function. * Per #2395, refine the weights for wind direction stats, ignoring the undefined directions. * Update src/tools/core/stat_analysis/aggr_stat_line.cc * Update src/tools/core/stat_analysis/parse_stat_line.cc * Update src/tools/core/stat_analysis/aggr_stat_line.cc * Recent changes to branch protection rules for the develop branch have broken the logic of the update_truth.yml GHA workflow. Instead of submitting a PR to merge develop into develop-ref directly, use an intermediate update_truth_for_develop branch. * Feature #2280 ens_prob (#2823) * Per #2280, update to support probability threshold strings like ==8, where 8 is the number of ensemble members, to create probability bins centered on the n/8 for n = 0 ... 8. * Per #2280, update docs about probability threshold settings. * Per #2280, use a loose tolerance when checking for consistent bin widths. * Per #2280, add a new unit test for grid_stat to demonstrate processing the output from gen_ens_prod. * Per #2280, when verifying NMEP probability forecasts, smooth the obs data first. * Per #2280, only request STAT output for the PCT line type to match unit_grid_stat.xml and minimize the new output files. * Per #2280, update config option docs. * Per #2280, update config option docs. * #2673 Change 0 to nullptr * #2673 Change 0 to nullptr * #2673 Change 0 to nullptr * #2673 Change 0 to nullptr * #2673 Change 0 to nullptr * #2673 Removed the redundant parentheses with return * #2673 Removed the redundant parentheses with return * #2673 Removed the redundant parentheses with return * #2673 Removed the redundant parentheses with return * #2673 Removed the redundant parentheses with return * #2673 restored return statement * #2673 Added std namespace * #2673 Moved down 'using namespace' statement. Removed trailing spaces * #2673 Moved down 'using namespace' statement. * #2673 Moved down 'using namespace' statement. * #2673 Moved down 'using namespace' statement. * #2673 Moved down 'using namespace' statement. * #2673 Added std namespace * #2673 Added std namespace * #2673 Added std namespace * #2673 Changed literal 1 to boolean value, true * Feature #2673 enum_to_string (#2835) * Feature #2583 ecnt (#2825) * Unrelated to #2583, fix typo in code comments. * Per #2583, add hooks write 3 new ECNT columns for observation error data. * Per #2583, make error messages about mis-matched array lengths more informative. * Per #2583, switch to more concise variable naming conventions of ign_oerr_cnv, ign_oerr_cor, and dawid_seb. * Per #2583, fix typo to enable compilation * Per #2583, define the 5 new ECNT column names. * Per #2583, add 5 new columns to the ECNT table in the Ensemble-Stat chapter * Per #2583, update stat_columns.cc to write these 5 new ECNT columns * Per #2583, update ECNTInfo class to compute the 5 new ECNT statistics. * Per #2583, update stat-analysis to parse the 5 new ECNT columns. * Per #2583, update aggregate_stat logic for 5 new ECNT columns. * Per #2583, update PairDataEnsemble logic for 5 new ECNT columns * Per #2583, update vx_statistics library with obs_error handling logic for the 5 new ECNT columns * Per #2583, changes to make it compile * Per #2583, changes to make it compile * Per #2583, switch to a consistent ECNT column naming convention with OERR at the end. Using IGN_CONV_OERR and IGN_CORR_OERR. * Per #2583, define ObsErrorEntry::variance() with a call to the dist_var() utility function. * Per #2583, update PairDataEnsemble::compute_pair_vals() to compute the 5 new stats with the correct inputs. * Per #2583, add DEBUG(10) log messages about computing these new stats. * Per #2583, update Stat-Analysis to compute these 5 new stats from the ORANK line type. * Per #2583, whitespace and comments. * Per #2583, update the User's Guide. * Per #2583, remove the DS_ADD_OERR and DS_MULT_OERR ECNT columns and rename DS_OERR as DSS, since observation error is not actually involved in its computation. * Per #2583, minor update to Appendix C * Per #2583, rename ECNT line type statistic DSS to IDSS. * Per #2583, fix a couple of typos * Per #2583, more error checking. * Per #2583, remove the ECNT IDSS column since its just 2*pi*IGN, the existing ignorance score, and only provides meaningful information when combined with the other Dawid-Sebastiani statistics that have already been removed. * Per #2583, add Eric's documentation of these new stats to Appendix C. Along the way, update the DOI links in the references based on this APA style guide: https://apastyle.apa.org/style-grammar-guidelines/references/dois-urls#:~:text=Include%20a%20DOI%20for%20all,URL%2C%20include%20only%20the%20DOI. * Per #2583, fix new equations with embedded underscores for PDF by defining both html and pdf formatting options. * Per #2583, update the ign_conv_oerr equation to include a 2 *pi multiplier for consistency with the existing ignorance score. Also, fix the documented equations. * Per #2583, remove log file that was inadvertently added on this branch. * Per #2583, simplify ObsErrorEntry::variance() implementation. For the distribution type of NONE, return a variance of 0.0 rather than bad data, as discussed with @michelleharrold and @JeffBeck-NOAA on 3/8/2024. --------- Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> * Revert #2825 since more documentation and testing is needed (#2837) This reverts commit 108a8958b206d6712197823a083666ab039bf818. * Feature #2583 ecnt fix IGN_OERR_CORR (#2838) * Unrelated to #2583, fix typo in code comments. * Per #2583, add hooks write 3 new ECNT columns for observation error data. * Per #2583, make error messages about mis-matched array lengths more informative. * Per #2583, switch to more concise variable naming conventions of ign_oerr_cnv, ign_oerr_cor, and dawid_seb. * Per #2583, fix typo to enable compilation * Per #2583, define the 5 new ECNT column names. * Per #2583, add 5 new columns to the ECNT table in the Ensemble-Stat chapter * Per #2583, update stat_columns.cc to write these 5 new ECNT columns * Per #2583, update ECNTInfo class to compute the 5 new ECNT statistics. * Per #2583, update stat-analysis to parse the 5 new ECNT columns. * Per #2583, update aggregate_stat logic for 5 new ECNT columns. * Per #2583, update PairDataEnsemble logic for 5 new ECNT columns * Per #2583, update vx_statistics library with obs_error handling logic for the 5 new ECNT columns * Per #2583, changes to make it compile * Per #2583, changes to make it compile * Per #2583, switch to a consistent ECNT column naming convention with OERR at the end. Using IGN_CONV_OERR and IGN_CORR_OERR. * Per #2583, define ObsErrorEntry::variance() with a call to the dist_var() utility function. * Per #2583, update PairDataEnsemble::compute_pair_vals() to compute the 5 new stats with the correct inputs. * Per #2583, add DEBUG(10) log messages about computing these new stats. * Per #2583, update Stat-Analysis to compute these 5 new stats from the ORANK line type. * Per #2583, whitespace and comments. * Per #2583, update the User's Guide. * Per #2583, remove the DS_ADD_OERR and DS_MULT_OERR ECNT columns and rename DS_OERR as DSS, since observation error is not actually involved in its computation. * Per #2583, minor update to Appendix C * Per #2583, rename ECNT line type statistic DSS to IDSS. * Per #2583, fix a couple of typos * Per #2583, more error checking. * Per #2583, remove the ECNT IDSS column since its just 2*pi*IGN, the existing ignorance score, and only provides meaningful information when combined with the other Dawid-Sebastiani statistics that have already been removed. * Per #2583, add Eric's documentation of these new stats to Appendix C. Along the way, update the DOI links in the references based on this APA style guide: https://apastyle.apa.org/style-grammar-guidelines/references/dois-urls#:~:text=Include%20a%20DOI%20for%20all,URL%2C%20include%20only%20the%20DOI. * Per #2583, fix new equations with embedded underscores for PDF by defining both html and pdf formatting options. * Per #2583, update the ign_conv_oerr equation to include a 2 *pi multiplier for consistency with the existing ignorance score. Also, fix the documented equations. * Per #2583, remove log file that was inadvertently added on this branch. * Per #2583, simplify ObsErrorEntry::variance() implementation. For the distribution type of NONE, return a variance of 0.0 rather than bad data, as discussed with @michelleharrold and @JeffBeck-NOAA on 3/8/2024. * Per #2583, updates to ensemble-stat.rst recommended by @michelleharrold and @JeffBeck-NOAA. * Per #2583, implement changes to the IGN_CORR_OERR corrected as directed by @ericgilleland. --------- Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> * Update the pull request template to include a question about expected impacts to existing METplus Use Cases. * #2830 Changed enum Builtin to enum class * #2830 Converted enum to enum class at config_constants.h * Feature #2830 bootstrap enum (#2843) * Bugfix #2833 develop azimuth (#2840) * Per #2833, fix n-1 bug when defining the azimuth delta for range/azimuth grids. * Per #2833, when definng TcrmwData:range_max_km, divide by n_range - 1 since the range values start at 0. * Per #2833, remove max_range_km from the TC-RMW config file. Set the default rmw_scale to NA so that its not used by default. And update the documentation. Still actually need to make the logic of the code work as it should. * Per #2833, update tc_rmw to define the range as either a function of rmw or using explicit spacing in km. * Per #2833, update the TCRMW Config files to remove the max_range_km entry, and update the unit test for one call to use RMW ranges and the other to use ranges defined in kilometers. * Per #2833, just correct code comments. * Per #2833, divide by n - 1 when computing the range delta, rather than n. * Per #2833, correct the handling of the maximum range in the tc-rmw tool. For fixed delta km, need to define the max range when setting up the grid at the beginning. --------- Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> * #2830 Changed enum PadSize to enum class * #2830 Removed redundant parantheses * #2830 Removed commenyted out code * #2830 Use auto * #2830 Changed enum to enum class for DistType, InterpMthd, GridTemplates, and NormalizeType * #2830 Moved enum_class_as_integer from header file to cc files * #2830 Added enum_as_int.hpp * #2830 Added enum_as_int.hpp * Deleted enum_class_as_integer and renamed it to enum_class_as_int * Removed redundant paranthese * #2830 Changed enum to enumclass * #2830 Changed enum_class_as_integer to enum_class_as_int * Feature #2379 sonarqube gha (#2847) * Per #2379, testing initial GHA SonarQube setup. * Per #2379, switch to only analyzing the src directory. * Per #2379, move more config logic from sonar-project.properties into the workflow. #ci-skip-all * Per #2379, try removing + symbols * Per #2379, move projectKey into xml workflow and remove sonar-project.properties. * Per #2379, try following the instructions at https://github.com/sonarsource-cfamily-examples/linux-autotools-gh-actions-sq/blob/main/.github/workflows/build.yml ci-skip-all * Per #2379, see details of progress described in this issue comment: https://github.com/dtcenter/MET/issues/2379#issuecomment-2000242425 * Unrelated to #2379, just removing spurious space that gets flagged as a diff when re-running enum_to_string on seneca. * Per #2379, try running SonarQube through GitHub. * Per #2379, remove empty env section and also disable the testing workflow temporarily during sonarqube development. * Per #2379, fix docker image name. * Per #2379, delete unneeded script. * Per #2379, update GHA to scan Python code and push to the correct SonarQube projects. * Per #2379, update GHA SonarQube project names * Per #2379, update the build job name * Per #2379, update the comile step name * Per #2379, switch to consistent SONAR variable names. * Per #2379, fix type in sed expressions. * Per #2379, just rename the log artifact * Per #2379, use time_command wrapper instead of run_command. * Per #2379, fix bad env var name * Per #2379, switch from egrep to grep. * Per #2379, just try cat-ting the logfile * Per #2379, test whether cat-ting the log file actually works. * Per #2379, revert back * Per #2379, mention SonarQube in the PR template. Make workflow name more succinct. * Per #2379, add SONAR_REFERENCE_BRANCH setting to define the sonar.newCode.referenceBranch property. The goal is to define the comparison reference branch for each SonarQube scan. * Per #2379, have the sonarqube.yml job print the reference branch it's using * Per #2379, intentionally introduce a new code smell to see if SonarQube correctly flag it as appearing in new code. * Per #2379, trying adding the SonarQube quality gate check. * Per #2379, add logic for using the report-task.txt output files to check the quality gate status for both the python and cxx scans. * Per #2379 must use unique GHA id's * Per #2379, working on syntax for quality gate checks * Per #2379, try again. * Per #2379, try again * Per #2379, try again * Per #2379, try again * Per #2379, try again * Per #2379, try again * Per #2379, try yet again * Per #2379 * Per #2379, add more debug * Per #2379, remove -it option from docker run commands * Per #2379, again * Per #2379, now that the scan works as expected, remove the intentional SonarQube code smell as well as debug logging. * Hotfix related to #2379. The sonar.newCode.referenceBranch and sonar.branch.name cannot be set to the same string! Only add the newCode definition when they differ. * #2830 Changed enum STATJobType to enum class * #2830 Changed STATLineType to enum class * #2830 Changed Action to enum class * #2830 Changed ModeDataType to enum class * #2830 Changed StepCase to enum class * #2830 Changed enum to enum class * #2830 Changed GenesisPairCategory to enum class * #2830 Removed rediundabt parenrthese * #2830 Reduced same if checking * #2830 Cleanup * #2830 USe empty() instead of lebgth checking * #2830 Adjusted indentations * Feature #2379 develop sonarqube updates (#2850) * Per #2379, move rgb2ctable.py into the python utility scripts directory for better organization and to enable convenient SonarQube scanning. * Per #2379, remove point.py from the vx_python3_utils directory which cleary was inadvertenlty added during development 4 years ago. As far as I can tell it isn't being called by any other code and doesn't belong in the repository. Note that scripts/python/met/point.py has the same name but is entirely different. * Per #2379, update the GHA SonarQube scan to do a single one with Python and C++ combined. The nightly build script is still doing 2 separate scans for now. If this all works well, they could also be combined into a single one. * Per #2379, eliminate MET_CONFIG_OPTIONS from the SonarQube workflow since it doesn't need to be and probably shouldn't be configurable. * Per #2379, trying to copy report-task.txt out of the image * Per #2379, update build_met_sonarqube.sh to check the scan return status * Per #2379, fix bash assignment syntax * Per #2379, remove unused SCRIPT_DIR envvar * Per #2379, switch to a single SonarQube scan for MET's nightly build as well * Feature 2654 ascii2nc polar buoy support (#2846) * Added iabp data type, and modified file_handler to filter based on time range, which was added as a command line option * handle time using input year, hour, min, and doy * cleanup and switch to position day of year for time computations * Added an ascii2nc unit test for iabp data * Added utility scripts to pull iabp data from the web and find files in a time range * Modified iabp_handler to always output a placeholder 'location' observation with value 1 * added description of IABP data python utility scripts * Fixed syntax error * Fixed Another syntax error. * Slight reformat of documentation * Per #2654, update the Makefiles in scripts/python/utility to include all the python scripts that should be installed. * Per #2654, remove unused code from get_iabp_from_web.py that is getting flagged as a bug by SonarQube. * Per #2654, fix typo in docs --------- Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> * Feature #2786 rpss_from_prob (#2861) * Per #2786, small change to a an error message unrelated to this development. * Per #2786, add RPSInfo::set_climo_prob() function to derive the RPS line type from climatology probability bins. And update Ensemble-Stat to call it. * Per #2786, minor change to clarify error log message. * Per #2786, for is_prob = TRUE input, the RPS line type is the only output option. Still need to update docs! * Per #2786, add new call to Ensemble-Stat to test computing RPS from climo probabilities * Per #2786, use name rps_climo_bin_prob to be very explicit. * Per #2786, redefine logic of RPSInfo::set_climo_bin_prob() to match the CPC definition. Note that reliability, resolution, uncertainty, and RPSS based on the sample climatology are all set to bad data. Need to investigate whether they can be computed using these inputs. * Per #2786, remove the requirement that any fcst.prob_cat_thresh thresholds must be defined. If they are defined, pass them through to the FCST_THRESH output column. If not, write NA. Add check to make sure the event occurs in exactly 1 category. * Per #2786, don't enforce fcst.prob_cat_thresh == obs.prob_cat_thresh for probabilistic inputs. And add more is_prob checks so that only the RPS line type can be written when given probabilistic inputs. * updated documentation * Per #2786, call rescale_probability() function to convert from 0-100 probs to 0-1 probs. --------- Co-authored-by: j-opatz <jopatz@ucar.edu> * Feature #2862 v12.0.0-beta4 (#2864) * Feature #2379 develop single_sq_project (#2865) * Hotfix to the documentation in the develop branch. Issue #2858 was closed as a duplicate of #2857. I had included it in the MET-12.0.0-beta4 release notes, but the work is not yet actually complete. * Feature 2842 ugrid config (#2852) * #2842 Removed UGrid related setting * #2842 Corrected vertical level for data_plane_array * #2842 Do not allow the time range * #2842 The UGridConfig file can be passed as ugrid_dataset * #2842 Changed -config option to -ugrid_config * #2842 Deleted UGrid configurations * 2842 Fix a compile error when UGrid is disabled * #2842 Cleanup * #2842 Added an unittest point_stat_ugrid_mpas_config * #2842 Added a PointStatConfig without UGrid dataset. * #2842 Corrected ty[po at the variable name * Switched from time_centered to time_instant. I think time_centered is the center of the forecast lead window and time_instant is the time the forecast is valid (end of forecast window). * #2842 Removed ugrid_max_distance_km and unused metadata names * #2842 Restored time variable time_instant for LFric * #2842 Adjust lon between -180 and 180 * #2842 Adjust lon between -180 and 180 * #2842 Adjust lon between -180 and 180 * #2842 Adjusted lon to between -180 to 180 * #2842 Changed variable names * Per #2842, switch from degrees east to west right when the longitudes are read. * #2842, switch from degrees east to west right when the longitudes are read * #2842 Cleanup debug messages --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Feature 2753 comp script config (#2868) * set dynamic library file extension to .dylib if running on MacOS and .so otherwise * Added disabling of jasper documentation for compiliation on Hera * Updated * remove extra export of compiler env vars * include full path to log file so it is easier to file the log file to examine when a command fails * send cmake output to a log file * remove redundant semi-colon * use full path to log file so it is easier to examine on failure * use run_cmd to catch if rm command fails * Modifications for compilation on hera, gaea, and orion * Updating * fixed variable name * clean up if/else statements * set TIFF_LIBRARY_RELEASE argument to use full path to dynamic library file to prevent failure installing proj library * set LDFLAGS so that LDFLAGS value set in the user's environment will also be used * Updated based on gaea, orion, and hera installs * Updated * change extension of dynamic library files only if architecture is arm64 because older Macs still use .so * added netcdf library to args to prevent error installing NetCDF-CXX when PROJ has been installed in the same run of the script -- PATH is set in the COMPILE_PROJ if block that causes this flag from being added automatically * clean up how rpath and -L are added to LDFLAGS so that each entry is separate -- prevents errors installing on Mac arm64 because multiple rpath values aren't read using :. Also use MET_PROJLIB * Updated * removed -ltiff from MET libs * only add path to rpath and -L arguments if they are not already included in LDFLAGS * changed from using LIB_TIFF (full path to tiff lib file) to use TIFF_LIB_DIR (dir containing tiff lib file). Added TIFF_INCLUDE_DIR to proj compilation and -DJAS_ENABLE_DOC to jasper compliation taken from @jprestop branch * update comments * ensure all MET_* and MET_*LIB variables are added to the rpath for consistency * remove unnecessary if block and only export LDFLAGS at the end of setting locally * Updated * Added section for adding <VALUE>/lib64 and rearranged placement of ADDTL_DIR * Commenting out the running of the Jasper lib tests * Updating and/or removing files * Updating and/or removing files * Latest udpates which include the addition of the tiff library for proj * Remove commented out line. Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Make indentation consistent. Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Make indentation consistent. Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Make indentation consistent. Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Per 2753, added -lm to configure_lib_args for NetCDF-CXX * Per #2753 updating acorn files * Per #2753, update wcoss2 files * Per #2753, updating acorn file to include MET_PYTHON_EXE * Per #2753, updated files for 12.0.0 for derecho * Per #2753, updated derecho file adding MET_PYTHON_EXE and made corrections * Updating config files * Updating orion files * Updates for gaea's files * Updating gaea modulefile * Removing modulefile for cheyenne * Added MET_PYTHON_EXE * Added MET_PYTHON_EXE to hera too * Adding file for hercules * Removing equals sign from setenv * Adding file for hercules * Updated script to add libjpeg installation for grib2c * Per #2753, Adding file for casper --------- Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Feature #2795 level_mismatch_warning (#2873) * Per #2795, move the warning message about level mismatch from the config validation step to when the forecast files are being processed. Only check this when the number of forecast fields is greater than 1, but no longer limit the check to pressure levels only. * Per #2795, add comments * Whitespace * Per #2795, port level mismatch fix over to Ensemble-Stat. Check it for each verification task, but only print it once for each task, rather than once for each task * ensemble member. * Feature #2870 removing_MISSING_warning (#2872) * Per #2870, define utility functions for parsing the file type from a file list and for logging missing files, checking for the MISSING keyword. Also, update Ensemble-Stat and Gen-Ens-Prod to call these functions. * Per #2870, update the gen_ens_prod tests to demonstrate the use of the MISSING keyword for missing files. METplus uses this keyword for Ensemble-Stat and Gen-Ens-Prod. * Feature 2842 ugrid config (#2875) * #2842 Removed UGrid related setting * #2842 Corrected vertical level for data_plane_array * #2842 Do not allow the time range * #2842 The UGridConfig file can be passed as ugrid_dataset * #2842 Changed -config option to -ugrid_config * #2842 Deleted UGrid configurations * 2842 Fix a compile error when UGrid is disabled * #2842 Cleanup * #2842 Added an unittest point_stat_ugrid_mpas_config * #2842 Added a PointStatConfig without UGrid dataset. * #2842 Corrected ty[po at the variable name * Switched from time_centered to time_instant. I think time_centered is the center of the forecast lead window and time_instant is the time the forecast is valid (end of forecast window). * #2842 Removed ugrid_max_distance_km and unused metadata names * #2842 Restored time variable time_instant for LFric * #2842 Adjust lon between -180 and 180 * #2842 Adjust lon between -180 and 180 * #2842 Adjust lon between -180 and 180 * #2842 Adjusted lon to between -180 to 180 * #2842 Changed variable names * Per #2842, switch from degrees east to west right when the longitudes are read. * #2842, switch from degrees east to west right when the longitudes are read * #2842 Cleanup debug messages * #2842 Disabled output types except STAT for sl1l2 * #2842 Disabled output types except STAT for sl1l2 and MPR * #2842 Reduced output files for UGrid --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Hotfix to develop branch to remove duplicate test named 'point_stat_ugrid_mpas_config'. That was causing unit_ugrid.xml to fail because it was still looking for .txt output files that are no longer being generated. * Feature 2748 document ugrid (#2869) * Initial documentation of the UGRID capability. * Fixes error in references, adds appendix to index, and adds sub-section for configuration entries and a table for metadata map items. * Corrects LFRic, rewords section on UGRID conventions, updates description of using GridStat, and removes mention of nodes. * Forgot one more mention of UGRID conventions. * Incorporates more suggestions from @willmayfield. * Switches to numerical table reference. * Feature #2781 Convert MET NetCDF point obs to Pandas DataFrame (#2877) * Per #2781, added function to convert MET NetCDF point observation data to pandas so it can be read and modified in a python embedding script. Added example python embedding script * ignore python cache files * fixed function call * reduce cognitive complexity to satisfy SonarQube and add boolean return value to catch if function fails to read data * clean up script and add comments * replace call to object function that doesn't exist, handle exception when file passed to script cannot be read by the NetCDF library * rename example script * add new example script to makefiles * fix logic to build pandas DataFrame to properly get header information from observation header IDs * Per #2781, add unit test to demonstrate python embedding script that reads MET NetCDF point observation file and converts it to a pandas DataFrame * Per #2781, added init function for nc_point_obs to take an input filename. Also raise TypeError exception from nc_point_obs.read_data() if input file cannot be read * call parent class init function to properly initialize nc_point_obs * Feature #2833 pcp_combine_missing (#2886) * Per #2883, add -input_thresh command line option to configure allowable missing input files. * Per #2883, update pcp_combine usage statement. * Per #2883, update existing pcp_combine -derive unit test example by adding 3 new missing file inputs at the beginning, middle, and end of the file list. The first two are ignored since they include the MISSING keyword, but the third without that keyword triggers a warning message as desired. The -input_thresh option is added to only require 70% of the input files be present. This should produce the exact same output data. * Per #2883, update the pcp_combine logic for the sum command to allow missing data files based on the -input_thresh threshold. Add a test in unit_pcp_combine.xml to demonstrate. * Update docs/Users_Guide/reformat_grid.rst Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> * Per #2883, update pcp_combine usage statement in the code to be more simliar to the User's Guide. * Per #2883, switch to using derive_file_list_missing as the one containing missing files and recreate derive_file_list as it had existed for the test named pcp_combine_derive_VLD_THRESH. * Per #2883, move initialization inside the same loop to resolve SonarQube issues. * Per #2883, update sum_data_files() to switch from allocating memory to using STL vectors to satisfy SonarQube. * Per #2883, changes to declarations of variables to satisfy SonarQube. * Per #2883, address more SonarQube issues * Per #2883, backing out an unintended change I made to tcrmw_grid.cc. This change belongs on a different branch. * Per #2883, update logic of parse_file_list_type() function to handle python input strings. Also update pcp_combine to parse the type of input files being read and log non-missing python input files expected. --------- Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> * Per #2888, update STATAnalysisJob::dump_stat_line() to support dumping stat line types VCNT, RPS, DMAP, and SSIDX. (#2891) * Per #2659, making updates as proposed at the 20240516 MET Eng. Mtg. (#2895) * Feature #2395 TOTAL_DIR (#2892) * Per #2395, remove the n_dir_undef and n_dira_undef variables that are superceded by the new dcount and dacount VL1L2Info members to keep track of the number of valid wind direction vectors. * Per #2395, add TOTAL_DIR columns to the VL1L2, VAL1L2, and VCNT line types and update the header column tables. * Per #2395, update the User's Guide to list the new TOTAL_DIR columns in the VL1L2, VAL1L2, and VCNT line types. * Per #2395, update stat_analysis to parse the new TOTAL_DIR columns and use the values to aggregate results when needed. * Per #2395, for SonarQube change 'const char *' to 'const char * const' to satisfy the finding that 'Global variables should be const.' Should probably switch from 'char char *' to strings eventually. But for now, I'm just making up for some SonarQube technical debt. * Per #2395, fix typo in placement of the DIR_ME column name in the met_header_columns_V12.0.txt file * Per #2395, add 2 new Stat-Analysis jobs to demonstrate the processing of VL1L2 lines. * Per #2395, update logic of is_vector_dir_stat(). Instead of just checking 'DIR_', check 'DIR_ME', 'DIR_MAE', and 'DIR_MSE' to avoid an false positive match for the 'DIR_ERR' column which is computed from the vector partial sums rather than the individual direction differences. * Bugfix #2897 develop python_valid_time (#2899) * Per #2897, fix typos in 2 log messages. Also fix the bug in storing the valid time strings. The time string in vld_array should exactly correspond to the numeric unixtime values in vld_num_array. Therefore they need to be updated inside the same if block. The bug is that we were storing only the unique unixtime values but storing ALL of the valid time string, not just the unique ones. * Per #2897, minor change to formatting of log message * MET #2897, don’t waste time searching, just set the index to n - 1 * Per #2897, remove unused add_prec_point_obs(...) function * Per #2897, update add_point_obs(...) logic for DEBUG(9) to print very detailed log messages about what obs are being rejected and which are being used for each verification task. * Per #2897, refine the 'using' log message to make the wording consistent with the summary rejection reason counts log message * Per #2897, update the User's Guide about -v 9 for Point-Stat --------- Co-authored-by: j-opatz <jopatz@ucar.edu> Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> * Bugfix 2867 point2grid qc flag (#2890) * #2867 Added compute_adp_qc_flag and adjusted ADP QC flags * #2867 Added point2grid_GOES_16_ADP_Enterprise_high. Changed AOD QC flags to 0,1,2 (was 1,2,3) * #2867 Added get_nc_att_values_ * #2867 Added get_nc_att_values. Added the argument allow_conversion to get_nc_data(netCDF::NcVar *, uchar *data) * #2867 Read the ADP QC flag values and meanings attributes from DQF variable and set the QC high, meduium, low values to support Enterprise algorithm. Adjusted the ADP QC values by using AOD qc values * #2867 Cleanup * #2867 Corrected indent * #2867 Changed log message * #2867 Removed unused argument * #2867 Removed unused argument * Cleanup * #2867 Fix SonarQube findings * #2867 Deleted protected section with no members * #2867 Cleanup * #2867 FIxed SonarQube findings; unused local variables, decalare as const, etc * #2867 MOved include directives to top * #2867 Changed some argumenmt with references to avoid copying objects * #2867 Do not filter by QC flag if -qc is not given * #2867 Use enumj class for GOES QC: HIGH, MEDIUM, and LOW * #2867 Added log message back which were deleted accidently * #2867 Chaned statci const to constexpr * #2867 Initial release. Separated from nc_utils.h * @2867 Added nc_utils_core.h * #2867 Moved some blocks to nc_utils_core.h * #2867 Include nc_utils_core.h * #2867 Added const references * Per #2867, fixing typo in comments. --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: j-opatz <jopatz@ucar.edu> * Hotfix to develop to fix the update_truth.yml workflow logic. This testing workflow run failed (https://github.com/dtcenter/MET/actions/runs/9209471209). Here we switch to a unique update truth branch name to avoid conflicts. * Avoid pushing directly to the develop or main_vX.Y branches since that is not necessary for the automation logic in MET. * #2904 Changed R path to R-4.4.0 (#2905) Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> * Feature #2912 pb2nc error (#2914) * Feature 2717 convert unit.pl to unit.py (#2871) * created unit.py module in new internal/test_unit/python directory * added xml parsing to unit.py * added repl_env function * added reading of the remaining xml tags in build_tests function * progress on main function (putting together test commands) * a few more lines in the main function * minor updates * fixed how the test command was being run * added if name/main and command line parsing * fixed handling of no 'env' in cmd_only mode * handle params from xml that have \ after filename without space in between * added logging * added some more pieces to unit * more updates to unit.py, including running checks on output files * bug fixes, improved handling of output file names, improved handling of env vars, improved logging output * fixed how shell commands are run, and other minor fixes * added last bits from the perl script, fixed some bugs * created unit.py module in new internal/test_unit/python directory * added xml parsing to unit.py * added repl_env function * added reading of the remaining xml tags in build_tests function * progress on main function (putting together test commands) * a few more lines in the main function * minor updates * update scripts to call python unit test script instead of the old perl script * fix she-bang line to allow script to be run without python3 before it * add missing test_dir and exit_on_fail tags that are found in the rest of the unit test xml files * fix call to logger.warning * change tags named 'exists' to 'exist' to match the rest of the xml files * added logger to function * removed tab at end of line that was causing output file path to be excluded from the command * fix broken checks for output files * incorporated george's recommended changes * changed default to overwrite logs; allow for more than one xml file to be passed in command --------- Co-authored-by: Natalie babij <natalie.babij@natbabij-mac1.home> Co-authored-by: Natalie babij <natalie.babij@vpn68-237.vpnclient.ucar.edu> Co-authored-by: Natalie babij <natalie.babij@gsd-sslvpn-209.fsl.noaa.gov> Co-authored-by: Natalie Babij <nbabij@seneca.rap.ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: j-opatz <jopatz@ucar.edu> * Bugfix 2867 point2grid qc unittest (#2913) * #2867 Added compute_adp_qc_flag and adjusted ADP QC flags * #2867 Added point2grid_GOES_16_ADP_Enterprise_high. Changed AOD QC flags to 0,1,2 (was 1,2,3) * #2867 Added get_nc_att_values_ * #2867 Added get_nc_att_values. Added the argument allow_conversion to get_nc_data(netCDF::NcVar *, uchar *data) * #2867 Read the ADP QC flag values and meanings attributes from DQF variable and set the QC high, meduium, low values to support Enterprise algorithm. Adjusted the ADP QC values by using AOD qc values * #2867 Cleanup * #2867 Corrected indent * #2867 Changed log message * #2867 Removed unused argument * #2867 Removed unused argument * Cleanup * #2867 Fix SonarQube findings * #2867 Deleted protected section with no members * #2867 Cleanup * #2867 FIxed SonarQube findings; unused local variables, decalare as const, etc * #2867 MOved include directives to top * #2867 Changed some argumenmt with references to avoid copying objects * #2867 Do not filter by QC flag if -qc is not given * #2867 Use enumj class for GOES QC: HIGH, MEDIUM, and LOW * #2867 Added log message back which were deleted accidently * #2867 Chaned statci const to constexpr * #2867 Initial release. Separated from nc_utils.h * @2867 Added nc_utils_core.h * #2867 Moved some blocks to nc_utils_core.h * #2867 Include nc_utils_core.h * #2867 Added const references * #2867 Some 'static const' were chnaged to constexpr * #2867 Changed -qc options (1,2,3 to 0,1 - high & medium) for AOD * #2867 Merged develop branch * #2867 Corrected the unit test name --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> * Feature #2911 tc_stat_set_hdr (#2916) * Per #2911, no real changes for Stat-Analysis. Just changing order of variables for consistency. * Per #2911, add StatHdrColumns::apply_set_hdr_opts(...) function to be used by TC-Stat. * Per #2911, move ByColumn to the TCStatJob base class and add HdrName and HdrValue to support the -set_hdr job command. * Per #2911, update GSI tools to call the newly added StatHdrColumns::apply_set_hdr_opts(...) function. * Per #2911, update logic of Stat-Analysis for consistency to make use of common apply_set_hdr_opts() function. * Per #2911, add DataLine::set_item() function to support -set_hdr options. * Per #2911, just update contents of error message * Per #2911, add TCStatLine member functions for has() and get_offset(). * Per #2911, update tc_stat to support applying -set_hdr to TC-Stat filter jobs. * Per #2911, revise TC-Stat config files to exercise the -set_hdr job command option * Per #2911, update TC-Stat documentation to mention the -set_hdr job command option * Per #2911, add note * Per #2911, as recommended by SonarQube, make some of these member functions const. * Bugfix #2856 develop ens_climo (#2918) * Per #2856, port over fixes from main_v11.1 to develop. * Per #2856, correct conditionals in set_job_controls.sh and tweak existing Ensemble-Stat configuration file to exercise the logic that's being impacted here. * Bugfix #2841 develop tang_rad_winds (#2921) * Per #2841, port over fixes from bugfix_2841_main_v11.1_tang_rad_winds for the develop branch * Per #2841, clarify in the docs that azimuths are defined in degrees counter-clockwise from due east. * Per #2841, just updating with output from enum_to_string. * Per #2841, tweak the documentation. * Per #2841, correct the location of using namespace lines. * Per #2841, update compute_tc_diag.py to no longer skip writing the radial and tangential wind diagnostics. * Per #2841, update compute_tc_diag.py to no longer skip writing radial and tangential wind diagnostics. * Revert "Per #2841, update compute_tc_diag.py to no longer skip writing radial and tangential wind diagnostics." This reverts commit f097345bedcfcca663e8fb4322eed5b5e00e19fd. * Revert "Per #2841, update compute_tc_diag.py to no longer skip writing the radial and tangential wind diagnostics." This reverts commit c0402151b038c59efab99c060cc5c390edf002f6. * Per #2841, update comp_dir.sh logic to include .dat in the files that are diffed * Replace tab with spaces * Per #2841, correct the units for the azimuth netcdf output variable * Per #2841, reverse the x dimension of the rotated latlon grid to effectively switch from counterclockwise rotation to clockwise. --------- Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> * Feature #2601 seeps climo config (#2927) * #2601 Added seeps_grid_climo_name and seeps_point_climo_name * #2601 Added seeps_grid_climo_name * #2601 Removed SEEPS settings * #2601 Initial release * #2601 Changed to set the SEEPS climo by using the configuration * #2601 Removed SEESP settings at PointStatConfig_APCP and use PointStatConfig_SEEPS for SEEPSm testing * #2601 Updated descryption for seeps_grid_climo_name * #2601 Added a argument for the SEEPS clomo file * #2601 Added conf_key_seeps_grid_climo_name and conf_key_seeps_point_climo_name * #2601 Support the climo filename from the configuration * #2601 Corrected key for climo name * Removing duplicate word --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: Julie Prestopnik <jpresto@ucar.edu> * Feature 2673 sonarqube beta5 redundant parentheses (#2930) * #2673 Removed redundant_parentheses * #2673 Removed redundant_parentheses * #2673 Removed redundant parentheses * #2673 Removed redundant parentheses --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> * Fix release checksum action (#2929) * Feature 2857 tripolar coordinates (#2928) * #2857 Added MetNcCFDataFile::build_grid_from_lat_lon_vars * #2857 Added NcCfFile::build_grid_from_lat_lon_vars * #2857 Check the coordinates attribute to find latitude, longitude, and time variables * #2857 Get the lat/lon variables from coordinates attribute if exists * #2857 Added two constants * #2857 Deleted debug messages * #2857 Added lat_vname and lon_vname for var_name_map * #2857 Added two unit tests: point2grid_sea_ice_tripolar and point2grid_sea_ice_tripolar_config * #2857 Initial release * #2857 Correct dictinary to get file_type * #2857 DO not check the time variable for point2grid * #2857 Added point2grid_tripolar_rtofs --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> * Feature 2932 v12.0.0-beta5 (#2933) * Per #2932, updating version and release notes * Per #2932, updating date on release notes * Per #2932, fixed formatting and links * Update release-notes.rst * Update release-notes.rst Removing inline backticks since they do not format the way I expected, especially when put inside bolded release notes. --------- Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Feature fix release notes (#2934) * Fixing up release notes * Update release-notes.rst --------- Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Per dtcenter/METplus#2643 discussion, add more detail about the budget interpolation method. * Feature #2924 fcst climo, PR 1 of 2 (#2939) * Per #2924, Update the MPR and ORANK output line types to just write duplicate existing climo values, update the header tables and MPR/ORANK documentation tables. * Per #2924, update get_n_orank_columns() logic * Per #2924, update the Stat-Analysis parsing logic to parse the new MPR and ORANK climatology columns. * Per #2924, making some changes to the vx_statistics library to store climo data... but more work to come. Committing this first set of changes that are incomplete but do compile. * Per #2924, this big set of changes does compile but make test produces a segfault for ensemble-stat * Per #2924, fix return value for is_keeper_obs() * Per #2924, move fcst_info/obs_info into the VxPairBase pointer. * Per #2924, update Ensemble-Stat to set the VxPairBase::fcst_info pointer * Per #2924 udpate handling of fcst_info and obs_info pointers in Ensemble-Stat * Per #2924, update the GSI tools to handle the new fcst climo columns. * Per #2924, add backward compatibility logic so that when old climo column names are requested, the new ones are used. * Per #2924, print a DEBUG(2) log message if old column names are used. * Per #2924, switch the unit tests to reference the updated MPR column names rather than the old ones. * Per #2924, working progress. Not fully compiling yet * Per #2924, another round of changes. Removing MPR:FCST_CLIMO_CDF output column. This compiles but not sure if it actually runs yet * Per #2924, work in progress * Per #2924, work in progress. Almost compiling again. * Per #2924, get it compiling * Per #2924, add back in support for SCP and CDP which are interpreted as SOCP and OCDP, resp * Per #2924, update docs about SCP and CDP threshold types * Per #2924, minor whitespace changes * Per #2924, fix an uninitialized pointer bug by defining/calling SeepsClimoGrid::init_from_scratch() member function. The constructor had been calling clear() to delete pointers that weren't properly initialized to nullptr. Also, simplify some map processing logic. * Per #2924, rename SeepsAggScore from seeps to seeps_agg for clarity and to avoid conflicts in member function implementations. * Per #2924, fix seeps compilation error in Point-Stat * Per #2924, fix bug in the boolean logic for handling the do_climo_cdp NetCDF output option. * Per #2924, add missing exit statement. * Per #2924, tweak threshold.h * Per #2924, define one perc_thresh_info entry for each enumerated PercThreshType value * Per #2924, simplify the logic for handling percentile threshold types and print a log message once when the old versions are still used. * Per #2924, update the string comparison return value logic * Per #2924, fix the perc thresh string parsing logic by calling ConcatString::startswith() * Per #2924, switch all instances of CDP to OCDP. Gen-Ens-Prod was writing NetCDF files with OCDP in the output variable names, but Grid-Stat was requesting that the wrong variable name be read. So the unit tests failed. * Per #2924, add more doc details * Per #2924, update default config file to indicate when climo_mean and climo_stdev can be set seperately in the fcst and obs dictionaries. * Per #2924, update the MET tools to parse climo_mean and climo_stdev separately from the fcst and obs dictionaries. * Per #2924, backing out new/modified columns to minimize reg test diffs * Per #2924, one more section to be commented out later. * Per #2924, replace several calls to strncmp() with ConcatString::startswith() to simplify the code * Per #2924, strip out some more references to OBS_CLIMO_... in the unit tests. * Per #2924, delete accidental file * Per #2924 fix broken XML comments * Per #2924, fix comments * Per #2924, address SonarQube findings * Per #2924, tweak a Point-Stat and Grid-Stat unit test config file to make the output more comparable to develop. * Per #2924, fix bug in the logic of PairDataPoint and PairDataEnsemble, when looping over the 3-dim array do not return when checking the climo and fcst values. Instead we need to continue to the next loop iteration. * Per #2924, address more SonarQube code smells to reduce the overall number in MET for this PR. * Per #2924, correct the logic for parsing climo data from MPR lines. * Per #2924, cleanup grid_stat.cc source code by making calls to DataPlane::is_empty() and Grid::nxy(). * Per #2924, remove unneeded ==0 * Hotfix to the develop branch for a copy/paste bug introduced by PR #2939 * Feature #2924 sal1l2_mae, PR 3 of 3 (#2943) * Per #2924, track SL1L2 and SAL1L2 MAE scores with separate variables since they are no longer the same value. I renamed the existing 'mae' as 'smae' and added a new 'samae' variable. Renaming the existing lets me use the compiler help find all references to it throughout the code. * Per #2924, update the User's Guide climatology details and equations. * Per #2924, some changes to aggr_stat_line.cc and series_analysis.cc to satisfy some SonarQube code smells. * Update develop to clarify masking poly options based on METplus Discussion dtcenter/METplus#2650 * Remove two semi-colons that are not actually necessary to avoid confusion. * Per dtcenter/METplus#2653 discussion, update the MTD usage statement to clarify that data specified in the fcst dictionary is read from the -single input files. * Feature #2924 fcst climo, PR 2 of 3 (#2942) * Per #2924, Update the MPR and ORANK output line types to just write duplicate existing climo values, update the header tables and MPR/ORANK documentation tables. * Per #2924, update get_n_orank_columns() logic * Per #2924, update the Stat-Analysis parsing logic to parse the new MPR and ORANK climatology columns. * Per #2924, making some changes to the vx_statistics library to store climo data... but more work to come. Committing this first set of changes that are incomplete but do compile. * Per #2924, this big set of changes does compile but make test produces a segfault for ensemble-stat * Per #2924, fix return value for is_keeper_obs() * Per #2924, move fcst_info/obs_info into the VxPairBase pointer. * Per #2924, update Ensemble-Stat to set the VxPairBase::fcst_info pointer * Per #2924 udpate handling of fcst_info and obs_info pointers in Ensemble-Stat * Per #2924, update the GSI tools to handle the new fcst climo columns. * Per #2924, add backward compatibility logic so that when old climo column names are requested, the new ones are used. * Per #2924, print a DEBUG(2) log message if old column names are used. * Per #2924, switch the unit tests to reference the updated MPR column names rather than the old ones. * Per #2924, working progress. Not fully compiling yet * Per #2924, another round of changes. Removing MPR:FCST_CLIMO_CDF output column. This compiles but not sure if it actually runs yet * Per #2924, work in progress * Per #2924, work in progress. Almost compiling again. * Per #2924, get it compiling * Per #2924, add back in support for SCP and CDP which are interpreted as SOCP and OCDP, resp * Per #2924, update docs about SCP and CDP threshold types * Per #2924, minor whitespace changes * Per #2924, fix an uninitialized pointer bug by defining/calling SeepsClimoGrid::init_from_scratch() member function. The constructor had been calling clear() to delete pointers that weren't properly initialized to nullptr. Also, simplify some map processing logic. * Per #2924, rename SeepsAggScore from seeps to seeps_agg for clarity and to avoid conflicts in member function implementations. * Per #2924, fix seeps compilation error in Point-Stat * Per #2924, fix bug in the boolean logic for handling the do_climo_cdp NetCDF output option. * Per #2924, add missing exit statement. * Per #2924, tweak threshold.h * Per #2924, define one perc_thresh_info entry for each enumerated PercThreshType value * Per #2924, simplify the logic for handling percentile threshold types and print a log message once when the old versions are still used. * Per #2924, update the string comparison return value logic * Per #2924, fix the perc thresh string parsing logic by calling ConcatString::startswith() * Per #2924, switch all instances of CDP to OCDP. Gen-Ens-Prod was writing NetCDF files with OCDP in the output variable names, but Grid-Stat was requesting that the wrong variable name be read. So the unit tests failed. * Per #2924, add more doc details * Per #2924, update default config file to indicate when climo_mean and climo_stdev can be set seperately in the fcst and obs dictionaries. * Per #2924, update the MET tools to parse climo_mean and climo_stdev separately from the fcst and obs dictionaries. * Per #2924, backing out new/modified columns to minimize reg test diffs * Per #2924, one more section to be commented out later. * Per #2924, replace several calls to strncmp() with ConcatString::startswith() to simplify the code * Per #2924, strip out some more references to OBS_CLIMO_... in the unit tests. * Per #2924, delete accidental file * Per #2924 fix broken XML comments * Per #2924, fix comments * Per #2924, address SonarQube findings * Per #2924, tweak a Point-Stat and Grid-Stat unit test config file to make the output more comparable to develop. * Per #2924, fix bug in the logic of PairDataPoint and PairDataEnsemble, when looping over the 3-dim array do not return when checking the climo and fcst values. Instead we need to continue to the next loop iteration. * Per #2924, address more SonarQube code smells to reduce the overall number in MET for this PR. * Per #2924, correct the logic for parsing climo data from MPR lines. * Per #2924, update MPR and ORANK line types to update/add FCST/OBS_CLIMO_MEAN/STDEV/CDF columns. * Per #2924, cleanup grid_stat.cc source code by making calls to DataPlane::is_empty() and Grid::nxy(). * Per #2924, remove unneeded ==0 * Per #2924, working on PR2. * Per #2924, update User's Guide with notional example of specifying climo_mean and climo_stdev separately in the fcst and obs dicts. * Per #2924, adding a new unit test. It does NOT yet run as expected. Will debug on seneca * Per #2924, pass the description string to the read_climo_data_plane*() function to provide better log messages * Per #2924, more work on consistent log messages * Per #2924, tweak the configuration to define both field, climo_mean, and climo_stdev in both the fcst and obs dictionaries * Per #2924, tweak the unit_climatology_mixed.xml test * Per #2924, only whitespace changes. * Per #2924, missed swapping MET #2924 changes in 3 test files * Per #2924, delete accidentally committed file * Per #2924, delete accidentally committed files * Per #2924, add support for GRIB1 time range indicator value of 123 used for the corresponding METplus Use Case. Note that there are 22 other TRI values not currently supported. * Adds caveat regarding longitudes appearing in DEBUG statements with a… (#2947) * Adds caveat regarding longitudes appearing in DEBUG statements with a different sign to the FAQ. * Update appendixA.rst Missing paren * Create install_met_env.cactus * Adding special script for installing beta5 on wcoss2 * Modifying script, including updates to eckit and atlas * Corrected version of bufr being used * Feature #2938 pb2nc_center_time (#2954) * Per #2938, define CRC_Array::add_uniq(...) member function which is now used in PB2NC * Per #2938, replace n_elements() with n() to make the code more concise. Refine log/warning message when multiple message center times are encountered. * Feature #1371 series_analysis (#2951) * Per #1371, add -input command line argument and add support for ALL for the CTC, MCTC, SL1L2, and PCT line types. * Per #1371, rename the -input command line option as -aggregate instead * Per #1371, work in progress * Per #1371, just comments * Per #1371, working on aggregating CTC counts * Per #1371, work in progress * Per #1371, update timing info using time stamps in the aggr file * Per #1371, close the aggregate data file * Per #1371, define set_event() and set_nonevent() member functions * Per #1371, add logic to aggregate MCTC and PCT counts * Merging changes from develop * Per #1371, work in progress aggregating all the line statistics types. Still have several issues to address * Per #1371, switch to using get_stat() functions * Per #1371, work in progress. More consolidation * Per #1371, correct expected output file name * Per #1371, consistent regridding log messages and fix the Series-Analysis PairDataPoint object handling logic. * Per #1371, check the return status when opening the aggregate file. * Per #1371, fix prc/pjc typo * Per #1371, fix the series_analysis PCT aggregation logic and add a test to unit_series_analysis.xml to demonstrate. * Per #1371, resolve a few SonarQube findings * Per #1371, make use of range-based for loop, as recommeded by SonarQube * Per #1371, update series-analysis to apply the valid data threshold properly using the old aggregate data and the new pair data. * Per #1371, update series_analysis to buffer data and write it all at once instead of storing data value by value for each point. * Per #1371, add useful error message when required aggregation variables are not present in the input -aggr file. * Per #1371, print a Debug(2) message listing the aggregation fields being read. * Per #1371, correct operator+= logic in met_stats.cc for SL1L2Info, VL1L2Info, and NBRCNTInfo. The metadata settings, like fthresh and othresh, were not being passed to the output. * Per #1371, the DataPlane for the computed statistics should be initialized to a field of bad data values rather than the default value of 0. Otherwise, 0's are reported for stats a grid points with no data when they should really be reported as bad data! * Per #1371, update logic of the compute_cntinfo() function so that CNT statistics can be derived from a single SL1L2Info object containing both scalar and scalar anomaly partial sums. These changes enable CNT:ANOM_CORR to be aggregated in the Series-Analysis tool. * Per #1371, fix logic of climo log message. * Per #1371, this is actually related to MET #2924. In compute_pctinfo() used obs climo data first, if provided. And if not, use fcst climo data. * Per #1371, fix indexing bug (+i instead of +1) when check the valid data count. Also update the logic of read_aggr_total() to return a count of 0 for bad data. * Per #1371, add logic to aggregate the PSTD BRIERCL and BSS statistics in the do_climo_brier() function. Tested manually to confirm that it works. * Per #1371, switch to using string literals to satisfy SonarQube * Per #1371, update series_analysis tests in unit_climatology_1.0deg.xml to demonstrate aggregating climo-based stats. * Per #1371, remove extra comment * Per #1371, skip writing the PCT THRESH_i columns to the Series-Analysis output since they are not used * Per #1371, fix the R string literals to remove \t and \n escape sequences. * Per #1371, update the read_aggr_data_plane() suggestion strings. * Per #1371, ignore unneeded PCT 'THRESH_' variables both when reading and writing ALL PCT columns. * Per #1371, update the test named series_analysis_AGGR_CMD_LINE to include data for the F42 lead time that had previously been included for the same run in the develop branch. Note however that the timestamps in the output file for the develop branch (2012040900_to_2012041100) were wrong and have been corrected here (2012040900_to_2012041018) to match the actual data. * Per #1371, update the -aggr note to warn users about slow runtimes * Feature 2948 cxx17 (#2953) * Per #2948, updating versions of ecbuild, eckit, and atlas * Per #2948, Adding MET_CXX_STANDARD * Per #2948, updated wording for MET_CXX_STANDARD description * Per #2948, updating script to work with two versions of ecbuild, eckit, and atlas * Per #2948, without this change, there are compilation problems if the user wants to compile wihtout python * Per #2948, fixing logic for MET_CXX_STANDARD * Per #2928, adding missing end bracket * Per #2948, fixed the logic for compiling versions of ecbuild, eckit, and atlas * Per 948, fixed syntax for setting CXXFLAGS * Per #2948, adding new Makefile.in files and configure and changing METbaseimage 3.2 to 3.3. * Per #2948, updating version of met base tag from 3.2 to 3.3 * Per #2948, adding --enable-all MET_CXX_STANDARD=11 job * Update compilation_options.yml * Per #2948, added a job10 for MET_CXX_STANDARD=14 * Per #2948, added brief documentation for the MET_CXX_STANDARD option --------- Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> * Feature 1729 set attr grid (#2955) * #1729 Allow to change to differnt grid size if the raw size is 0 * Added build_grid_by_grid_string and build_grid_by_grid_string * #1729 Calls build_grid_by_grid_string * #1729 Added set_attr_grid at the -field option * #1729 Set obs_type to TYPE_NCCF if the file_type is given at the config file * #1729 Support set_sttr_grid and changed Error messages to Warning * #1729 FIxed SonmarQube findings * #1729 Initial release for unit test * #1729 Added update_missing_values * #1729 Deleted a shadowed local variable * #2673 Added more is_eq * #2673 Added get_exe_duration * 2673 Reducded nested statements * 2673 Fixed SonarGube findings * 2673 Fixed SonarQube findings * 2673 Fixed SonarQube findings * #1729 Added aan unittest plot_data_plane_set_attr_grid * #1729 Added aan unittest point2grid_cice_set_attr_grid * #1729 Added changed back the verbose level * #1729 Corrected typo --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> * Bugfix #2958 develop BAGSS SEDI CI (#2959) * Bugfix 2936 point2grid gfs (#2964) * #2936 Support 1D lat/lon values * #2936 Initial release * #2936 Cast the data type to avoid a compile warning * #2936 Added an unittest point2grid_gfs_1D_lat_lon --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> * Bugfix 2968 point2grid set attr grid (#2969) * #2968 Corrected set_attr_grid for point2grid_cice_set_attr_grid * #2968 Compare the DataPlane size and the variable data size * #2968 nx and ny are not ignored with set_attr_grid * #2968 Compare the DataPlane size and the variable data size --------- Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> * Feature 2937 update unit (#2944) * added single quotes around env var/val pairs in export statements in cmd only mode * updated logic in unit() to check exec return value against expected return value; created TEST xml file to test this feature * deleted TEST_ xml, added test with retval 1 to unit_ascii2nc --------- Co-authored-by: Natalie Babij <nbabij@seneca.rap.ucar.edu> * Feature #2887 categorical weights PR 1 of 2 (#2967) * Per #2887, update NumArray::vals() to return a reference to the vector rather a pointer to doubles. * Per #2887, switch over the whole ContingencyTable class heirarchy from storing integer counts to storing double-precision weights. * Add ContingencyTable::is_integer() member function to check whether the table contains all integers * Per #2887, update parse_stat_line.cc to get it to compile after changing PCT to store thresholds in a std::vector. * Per #2887, update PCTInfo::clear() logic. * Per #2887, update ctc_by_row() logic to create reproducible results with the develop branch. * Per #2887, update logic of define_prob_bins() to add a final …
11 tasks
metplus-bot
added a commit
to dtcenter/METplus
that referenced
this pull request
Dec 3, 2024
JohnHalleyGotway
added a commit
to dtcenter/METplus
that referenced
this pull request
Dec 3, 2024
* Feature 898 headers (#2389)
* changing _ to - for header consistency
* changing _ to - for header consistency
* updating all headers for consistency
* updating all headers for consistency and adding spacing
The spacing doesn't seem to be required but it is the convention that we follow for headers.
* updating all headers for consistency
* updating headers for consistency and adding capital letters to headers
* Using the overline ### to keep index consistent with other indexes
* updating all headers for consistency
* update requirements for building docs to get around build failure where python packages required to build RTD have disappeared from the automatically generated commands from RTD
* updating all headers and some spacing for consistency
* updating headers for consistency
* changing to ### for consistency
* Per #898, fixed the headers for the Release Guide part, chapters, and sections.
* Duplicating changes in develop branch for requirements.txt file
* updating headers
* Per #2669, updated header formatting to resolve errors
* Per #2669, udpating header
* Per #2669, udpating headers
* Per #2669, udpating header
* Per #2669, updated header formatting
* Per #2669, update header formatting
* updating headers
* Per #898, removed space in front of title
* Capitalizing Please
* changing to just italics to match standard formatting
* indenting for consistent formatting
* fixing italics again
* changing from note to warning for consistency
* updating headers, adding some capitalizing to the headers
* fixing typo
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* This file was committed but never updated or used
Per Minna, ok to delete.
* Restructuring table of contents to make it more clear which guides are for users and which are for contributors
* fixing formatting for clairity
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
---------
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Feature #2349 upgrade instructions for deprecated MET config files (#2386)
* Feature 2123 di doc update (#2392)
Co-authored-by: Tracy <tracy.hertneky@noaa.gov>
* change log to list name of config variable , e.g. GRID_STAT_CONFIG_FILE, to easily see which variable should be removed
* Major refactor including elimination of unnecessary imports, only computing the index for the season requested instead of all seasons all the time, which also fixes a bug selecting which season the user requested. Results are identical for all seasons for the test data for the use case.
* Feature 1667 doc conventions (#2397)
* New additions based on the old branch feature_1667_updating_overview
* Moving the release-notes reference label
* Added label for METplus_glossary for use in Documentation conentions section.
* Adding images for the Documentation Conventions section
* Modifying wording and testing formatting in Internal Links section
* Second take on formatting
* Third attempt at formatting
* Fourth attempt at formatting
* Modified wording, sections, and formatting
* Minor modifications
* Added period
* Changed Pretty Table to PrettyTable
* Modify informationg about converting an existing table and adding images
* Resolving errors
* Reformatting
* Moving placement of reference label
* Attempting to fix table title
* Fixed incorrect alignment
* Made changes based on Lisa's suggestions
* Made changes based on Lisa's suggestions
* Made corrections
* Made corrections
* Per #1667, fixing typos
* Per #1667, corrected text
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Feature #2377 Log to terminal only (#2398)
* Update conda envs to use conda-forge only (#2402)
* rearrange MET config env var tables for GridStat so they are in the order that they appear in the wrapped MET config file
* use mamba instead of conda and update version of netcdf python package used to 1.6.2
* skip s2s_mid_lat WeatherRegime use case that produces different results often
* updated version of xesmf because <0.7.1 does not work with mamba
* per #2412, fix bug in GenVxMask to put quotes around argument so a grid specification string with spaces will be an accepted value
* downgrade version of esmf package to fix bug described in https://github.com/pangeo-data/xESMF/issues/246
* Feature #2219 SeriesAnalysis multiple input files (#2408)
* Adding 3 new requestors to the list of common_labels.txt for NOAA/NHC, CSU/CIRA, and Australian BOM ci-skip-all
* Feature 2405 match tables2wrapper (#2416)
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* per #2423, follow symbolic links when traversing directories to find files within a time window, ci-run-all-diff
* Feature #2252 WaveletStat wrapper (#2427)
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
* add WaveletStat use case to group and temporarily disable TCDiag use case because changes to the wrapper are needed to fix it after changes to the MET tool were merged
* update version number for beta2 release (#2431)
* update version for dev towards beta3
* Feature #2371 Embed use case upgrade demo video into upgrade instructions (#2444)
* fix failing use case tests -- install python packages dateutil and requests via apk instead of pip because the pip commands began failing -- see PEP668 https://peps.python.org/pep-0668/ -- also changed scripts to create conda environments for use case tests to install all packages in a single call to mamba instead of individual calls
* remove commands to install geovista from source because it is now installed from conda
* Feature #1989: Add OMI use case (#2457)
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Feature #2432 TCDiag new config changes (#2453)
* move medium range 10 use case into group with 3-5 to speed up runs
* Feature #2334 land_mask (and topo_mask) in PointStat (#2456)
* added use cases with pygrib
* Feature #2430 TCPairs consensus.diag_required and consensus.diag_min_req (#2439)
* Quickfix cloud use case desc imgs (#2464)
* added pics, updated desc
* add last two imgs
* Fixing spelling and capitalization
* Feature 2454 doc overview conv (#2471)
* adding documentation in different sections
* adding grid table section
* fixing links
* grammar updates
* Per #2454, updated sections and wording.
* Per #2454, added a period to the end of a sentence.
* Per #2454, fixing formatting
* Per #2454, updating wording
* adding a section for line breaks in a table
* adding :code: information
* trying to fix warning
* take 2
* take 3 or 4
* maybe fixed
* updating link
* fixing web link again
* web link saga continues
* Changed "ReadTheDocs" to "Read the Docs"
* Updated "main_v" references to be "main_v12.0"
* Removed references to main_v*, replacing with raw RST
It is not maintainable to have links to branches which will become old. Since we can avoid it by adding the raw RST in the documentation, I have removed all references to main_v* in favor of placing the raw RST in the documentation.
* Modified the "Code in a Paragraph" section
* Reworded for consistency within the document
* Added back the link for Sphinx code blocks
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* add argument to workflow dispatch event so that MET DockerHub repo used for tests can be easily overridden to test changes in a MET PR before merging
* Feature dtcenter/MET#2796 GHA Node20 deprecation warnings (#2473)
* per dtcenter/MET#2796, update versions of actions to prevent deprecated node warnings in GHA runs
* change arguments to workflow dispatch so they are no longer required -- these are not needed to be set when triggering by hand through the web interface
* Feature dtcenter/MET#2796 develop - Fix error log artifact creation (#2475)
* updated version of pillow to fix security vulnerability alerted by dependabot in PR #2477
* remove docker image after runtime image is created from metplus image and conda env image
* turn on use case to test image removal
* prune images if image tag doesn't exist -- it appears that if the image is built on the fly (when PR is coming from fork) then the tag exists, but if not, the image tag is set to <none>
* support commands that must run in the shell to see if || will work in docker image pruning step
* try to fix image removal
* Feature 2383 use case sat alt (#2480)
* new docs, files for use case
* new files
* updating to run use case
* updated python libraries, changed test env
* trying new point logic
* added to script for nan removal
* redid Python script to take adv of new MET ability for nans
* Update run status
* removed unused settings
* run image prune commands separately
* changed shell back to false
* split up use case groups so the same envs are used by a group to see if that resolves the disk space issues
* turn off use cases
* feature 2253 fix empty pytest logs (#2485)
* added more commands to free up disk space as suggested in https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh, ci-run-all-cases
* Feature 2406 redo usecase rrfs (#2488)
* issue #2406 RRFS use case files
* issue #2406 added usecase to tests
* Issue #2406 added metplotpy and metcalcpy as dependencies
* Feature #2460 allow missing input (#2493)
* changed template to use datetime format that works on MacOS
* update logic to only write a file list file if there are more than 1 files, updated unit tests to match new behavior, added exception handling to series analysis to prevent crash if file does not exist
* use getraw instead of getstr to prevent crash if providing a filename template tag to override a config variable on the command line
* Add optional argument to subset file function to always write a file list text file even if there is only 1 file found. Use this argument in UserScript wrapper so that the environment variables that contain paths to file list files are consistent in format for use in user scripts
* enhanced function to support different output variable types
* removed the need for overriding clear function in specific wrappers and added optional argument to skip clearing input file list
* clean up formatting
* per #2460, start to implement logic to prevent errors when some input files are not found
* isolate logic to find input files into find_input_files functions. clean up those functions to return boolean instead of sometimes returning None or a list of files to be consistent
* remove python embedding checks because MET is now smart enough to determine if a python script is used with always setting file_type
* turn on use cases to test error handling
* merge artifacts
* run only failed cases
* always run merge step
* run on a case that will succeed to test error log merge step
* only run error log merge step if there were 'Save error logs' jobs that succeeded
* run cases that will fail
* fix condition to merge error logs
* run group that will succeed but have diffs - check error logs doesn't fail
* testing - add use case group that will succeed but will cause diffs becaus there is no truth data - to confirm that the error log merge step behaves properly in this case
* run 3 jobs, 2 should error, to confirm that error_logs is created properly
* repeat diff no error test but with
* per dtcenter/MET#2796, fix error log artifact creation by merging error logs if any of the 'Save error logs' steps ran successfully
* run test to confirm diff does not cause merge error logs to fail
* Revert "run test to confirm diff does not cause merge error logs to fail"
This reverts commit ff2d1cac57c431a047ee250e9dae9b0a813a78ba.
* run test to confirm error logs are merged properly when 2 use case groups have errors
* try checking output variable as string instead of boolean
* Revert "run test to confirm error logs are merged properly when 2 use case groups have errors"
This reverts commit 8106666a73685e654e0146d4fed56f2382f1bfc7.
* run test again
* test again
* move check for error logs for shell script and use github env vars
* Revert "run test again"
This reverts commit 7a0a99c6e7031c5dafb1177d4b4ca3f32a999dac.
* break 2 use cases to test that error logs are still created properly
* checkout repo to get script used to merge error logs
* Revert "break 2 use cases to test that error logs are still created properly"
This reverts commit cb6d0b46db353b4b4709183be2fe7e5ce64ff5ff.
* test merge error log again on no error diff run
* fix script
* move merge error logic back to workflow
* break 2 use cases to test that error logs are still created properly
* Revert "break 2 use cases to test that error logs are still created properly"
This reverts commit 82aa0e11096aace3ccc2c79cd631533fc6426900.
* remove testing use case group
* Revert "remove python embedding checks because MET is now smart enough to determine if a python script is used with always setting file_type"
This reverts commit de3b4b03a45bb871c71e770ff9e602739d6b63d5.
* clean up lines
* update logic to check that python embedding is set up properly to only try to set file_type automatically if it is not already set and if the wrapper is a tool that supports multiple input files via python embedding (which require file_type to be set). also changed error if not set properly to warning and use PYTHON_NUMPY as a default
* remove run_count increment before run_at_time_once - set closer to find_input_files so run count and missing input count are consistent
* return boolean from find_input_files function to be consistent with other functions
* per #2460, warn instead of error if missing inputs are allowed, track counters for number of runs and missing inputs
* per #2460, added check to report error if allowed missing input threshold is met
* run clear before running plot_data_plane
* removed test group
* report warning instead of error if ALLOW_MISSING_INPUTS is True
* cleanup
* change function to pytest fixture so it can be used by other test scripts
* update ascii2nc test to process more than 1 time to ensure commands are built properly for each run
* add unit tests to ensure missing input file logic works properly for ascii2nc and grid_stat
* set variable to skip RuntimeFreq logic to find input files to prevent duplicate increment of run_count -- these will be removed when the wrapper has been updated to find files using RuntimeFreq logic
* remove unneccesary error checking
* cleanup
* call function to handle input templates that need to be handled separately for each item in the comma-separated list (for UserScript and GridDiag only)
* add time_info to ALL_FILES dictionaries to be consistent with other wrappers
* clean up logging for reporting error when missing inputs exceeds threshold
* added function to get files for a single run time to be consistent with other functions
* skip increment of run_count when FIND_FILES=True and RuntimeFreq input file logic is skipped to prevent duplicate increments
* added empty test files
* remove redundant variables
* view warnings on a failed test run
* add more empty test files
* added unit tests for missing input logic
* remove MANDATORY setting for EnsembleStat and GenEnsProd and instead pass mandatory argument to call to find model files so warnings/errors are properly displayed for other inputs
* cleanup
* remove allow missing input logic from ExtractTiles wrapper
* added functions to parse template/dir variables from config, removed explicit calls to read those variables from GridStat
* remove error if more labels than inputs are provided (for UserScript and GridDiag only) -- extra labels will just be ignored
* added required boolean for input templates
* per #2460, change warning messages to debug when checking a list of DA offsets since it is common that a given offset will not always be found in the files
* added tests for missing input logic for many wrappers
* cleanup
* fix increment of number of runs
* skip missing input logic
* change how required is handled for input templates
* warn instead of error if missing input is allowed
* remove increment of missing input counters because it is handled in RuntimeFreq
* check status of input files and increment counters in overridden run_once_per_lead. remove increment of missing input counters because it is handled in run_once_per_lead
* added unit tests for missing input logic
* skip missing input logic
* cleanup
* cleanup, use fixture for tests, add unit tests for missing input, bypass missing input logic on wrappers that don't need it
* removed file that is not needed
* added unit tests for pb2nc to test -valid_beg/end arguments and changes to properly support any runtime frequencies
* warn instead of error if allowing missing inputs
* cleanup
* implement changes to properly support all runtime frequencies for pb2nc. previously all files that match a wildcard will be used instead of selecting only files that fall within the specified time range. some functions moved into pb2nc wrapper will eventually be moved up so that they are used by all wrappers to be consistent
* added unit tests that will fail until wrapper is updated
* replace functions in RuntimeFreq wrapper used to find input files so they can be used by all wrappers, updated ioda2nc wrapper to find input files properly to fix tests
* cleanup
* removed mtd version of get_input_templates and added logic to RuntimeFreq's version to get the same behavior
* added unit tests for MTD missing input checks
* per #2491, add release notes for beta3
* Feature #2491 v6.0.0 beta3 (#2495)
* update version for beta3 release
* fixed typos in release notes
* update version to note development towards beta4 release
* Per suggestion from @JohnHalleyGotway, create intermediate branch for updating truth data to avoid branch protection rules. I added a step to delete the intermediate branch locally if it exists to prevent conflicts with the update
* added quotes to prevent error in echo caused by parenthesis
* fix incorrect command
* Revert "fix incorrect command"
This reverts commit e7dffb6b0b351ab1b4bca5b563c1f5beef7737a9.
* Revert "added quotes to prevent error in echo caused by parenthesis"
This reverts commit c1cb3c4f0d7851bea720a50fac6011cd381017dc.
* Revert "Per suggestion from @JohnHalleyGotway, create intermediate branch for updating truth data to avoid branch protection rules. I added a step to delete the intermediate branch locally if it exists to prevent conflicts with the update"
This reverts commit 525809dc3bd73ace969b046062967796035f4d86.
* Hotfix: Allow symbolic link to run_metplus.py to run (#2500)
* Adding use case tests
* Changing test environment
* Testing environment changes
* Documentation update
* Updating Documentation
* Updating documentation for disk space failure
* Added new use case category
* Fixing use case test
* Fixing bug in use case file
* Testing s2s after data removal
* add back use cases that were accidentally removed
* fix incorrect use case added
* Setting tests to false for merge
* Removes extraneous imports.
* Switches to function call for the coupling index.
* Correct number of args in comment.
* Testing for old use cases
* Setting tests to false for merge
* update tests to update develop data -- modified commands to create new use case category directory if it does not already exist, move step to remove old data to be completed just after new data is copied to vX.Y
* Summation has to have a dimension supplied for the gridded data, but for pandas the only dimension is time (but it is un-named). Therefore the numerator for the covariance term had to be split out between the fcst and obs case.
* Feature 2463 modify table (#2508)
* creating test dropdown menus
* fixing warnings
* fixing warnings
* fixing warnings 3
* fixing warnings 4
* Attempt to fix documentation errors
* adding 2 more test dropdowns
please note. There is still a message about
WARNING: Duplicate explicit target name: "gridstat: cloud fractions with neighborhood and probabilities (pygrib)".
John O will fix this. I should not touch it.
* fixing spacing
* trying to fix link
* take 2
* Removing double underscores added earlier
* moving dropdown menus
* Adding version to dropdown menu title
* fixing spacing
* dropdowns date util, eofs, h5py
* fixing formatting
* fixing formatting
* Per #2463, adding template for future entries
* adding imageio, lxml & matplotlib
* dropdown up to nc-time-axis
* fixing spacing problems
* Fixing broken s2s links and other incorrect links
* Fixing spelling and capitalization
* Removing the dash in front of 1.4 for nc-time-axis
* Modifying formatting
* adding dropdowns thru pylab
* fixing problems
* dropdowns thru scikit-learn
* fixing spacing
* final dropdowns thru yaml
* fixing spacing
* fixing loose ends
* Per #2463, moving information to an Appendix and adding text and links in an overview
* Per #2463, adding to index.rst
* Per #2463, reworded language and updated Python 3.8 reference
* Per #2463, fixing errors
* Per #2463, made updates based on feedback at the METplus Engineering meeting.
* removing tables, changing most METplus wrappers, version numbers.
* trying to fix met_version
* Per #2463, adding necessary code for substitutions
* Per #2463, fixing syntax error
* adding period
* removing section 1.5
* Per #2463, replace old label reference with new label reference and updated text to reflect the move to drop down menus
* read python version from file to replace in docs
* fixed typo in variable name
* adding python_version to the overview.
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* per #2509, automate MET version used in documentation to be X+6.Y.0 of METplus version
* Bugfix #2520 ASCII2NC file window issue and redundant wrapper initialization (#2522)
* per PyCharm documentation, only ignore workspace.xml idea file and commit the rest of the .idea files to version control
* per #2520, create function to get METplus wrapper class without initializing it and use that function to read list of deprecated env vars to prevent redundant initialization of wrappers that can cause unintended side effects
* handle file_window variables consistently by using CommandBuilder function
* comment out optional config variables that previously caused a failure when unset
* Update update_truth.md
Fix typo in the update_truth issue template in the develop branch.
* Update update_truth.md
Update wording in the update_truth issue template.
* Feature #2530 dev timeline (#2532)
* Per #2530, add a development timeline to the METplus Release Information section of the User's Guide. Also update the Release Guide instructions.
* Per #2530, tweak the wording.
* Update docs/Release_Guide/release_steps/update_release_notes_development.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Adds static station lookup file for use with Python embedding for FLUXNET observations.
* Major overhaul to forecast Python embedding script for the TCI use case.
* Major overhaul to observation Python embedding script for the TCI use case, to compute TCI from raw observations rather than read pre-computed TCI.
* Updates documentation file for TCI use case.
* Adds METcalcpy version number.
* Refactors wording and fixes typo.
* Fixes RST formatting.
* Finally fixed RST error.
* Adds support to remove leap days if requested.
* Updates command line args for Python embedding scripts.
* Feature #2537 develop sonarqube_gha (#2541)
* Per #2537, add SonarQube workflow for METplus
* Per #2537, update nightly build email list.
* Per #2537, fix cut/paste error configure_sonarqube.sh
* Per #2537, exclude test code from code coverage statistics.
* Updated conf file for use case.
* Removes new TCI function because it is in METcalcpy now.
* Removes old code, somsome reorganization and clarification and setting of params, and also switches the fluxnet metadata file to a command line argument instead of an environment variable.
* Update the 6.0.0 Coordinated Release development timeline in release-notes.rst
* Support for environment variables or default options for filtering and filename patterns, DEBUG mode added and set to False by default, adjustment of print statements for logging, and refactoring filtering of stations to ensure we don't process a file that we shouldn't by better coupling of filenames and stations.
* Makes DEBUG an env var for config via metplus wrappers.
* Reorganization of config file, adds environment variables, and updates comments for use case changes.
* Updates to documentation.
* Fixes tables.
* Adds table of contents to the top for users to click on.
* Updates use case documentation file.
* Updated config file with obs and fcst subirectories in the path.
* Added optional key/value to use_case_groups.json to prevent a use case group from running to easily disable it temporarily. Disable short_range:14 use case until it can be fixed with #2551
* update pillow version based on recommendation from dependabot: https://github.com/dtcenter/METplus/security/dependabot/5
* Switches to using metplotpy_env to get metcalcpy dependency.
* Adds filtering based on missing data values.
* Finishing touches to debug statements for testing.
* Fixing a few minor code smells from last week.
* update link to METplus Components Python Requirements table in PR template
* Update docs/use_cases/model_applications/land_surface/PointStat_fcstCESM_obsFLUXNET2015_TCI.py
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Feature #2555 v6.0.0 beta4 (#2556)
* update version for beta4 release
* added release notes for beta4 release
* update version for development towards beta5 release
* update location of METviewer docker-compose.yml file that moved from PR dtcenter/METviewer#525
* Feature #2537 develop single_sq_project (#2558)
* Update the beta4 release date wording
* Feature #2433 Ugrid config variables in GridStat/PointStat (#2517)
* update version for release
* added new use case that was missing
* Bugfix #2279 main_v5.1 - buoy station file from 2022 (#2281)
* Fix typo in pull_request_template.md
* added notes to make it clear that upgrade instructions are not needed if upgrading from 5.0 to 5.1
* New issue template: Update Truth (#2332)
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
(cherry picked from commit 44335f33ab152a0b254041961a41895dde614ae0)
* add GitHub Actions workflow that is used to create Docker images that hold the conda environment used for the automated tests -- adding this to the default main_v5.1 branch so that it will become available to run for other branches as a workflow_dispatch workflow
* Per #2433, added support for setting the ugrid MET config variables for GridStat and PointStat wrappers. Also moved the seeps variable up so that it matches the order of the default config files in the MET repo
* add argument to workflow dispatch event so that MET DockerHub repo used for tests can be easily overridden to test changes in a MET PR before merging
* Feature dtcenter/MET#2796 main_v5.1 GHA Node20 deprecation warnings (#2474)
* per dtcenter/MET#2796, update versions of actions to prevent deprecated node warnings in GHA runs - main_v5.1
* fix ReadTheDocs requirements to include pillow which is a dependency of sphinx-gallery: see https://blog.readthedocs.com/defaulting-latest-build-tools/ for more info on why this was necessary
* install python packages via apk instead of pip to prevent GHA failures that were fixed in develop but not in main_v5.1
* per dtcenter/MET#2796, fix error log merging for main_v5.1 same as develop
* Bump pillow from 10.0.1 to 10.2.0 in /docs (#2477)
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/10.0.1...10.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Create 5.1.0_casper
* per #2433, add support for setting the optional -config argument for a ugrid config file for PointStat and GridStat. Also moved the optional arguments to be added to the command after all of the required arguments so the command is easier to read
* per #2433 and discussion on meeting 3/21/2024, change command line argument from -config to -ugrid_config
* update unit tests to check for new command line argument name -ugrid_config
* Updates information about GDAS surface winds having a QC value that is above the default settings in the PB2NC config file.
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
* SonarQube add python code coverage report (#2565)
* run code coverage before SonarQube scan
* generate xml report and configure SQ to read coverage.xml
* exclude more files from code coverage report
* exclude more files that should not be included in the code coverage report
* more changes to code coverage exclude list
* removed bad characters accidentally added
* exclude cyclone plotter wrapper because it is excluded from code coverage report
* ignore SonarQube lint files generated by PyCharm
* Updating MTD conv radius/thresh description (#2566)
* Updating MTD conv radius/thresh description
* Update glossary.rst
* Update docs/Users_Guide/glossary.rst
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Update docs/Users_Guide/glossary.rst
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
---------
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Feature update modulefiles (#2564)
* Adding 6.0.0 file for derecho and removing 5.1.0 file for cheyenne
* Updating modulefiles
* Updating orion file
* Adding file for hercules
* Adding file for casper
* Update internal/scripts/installation/modulefiles/6.0.0_casper
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
---------
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Feature #1989: Add OMI to Verification Datasets Guide (#2585)
Refs: #1989
* Feature #2479 time_offset_warning (#2587)
* Per #2479, add support for setting time_offset_warning in all wrapped MET config files
* Per #2479, add documentation and examples to basic use case param files for time_offset_warning
* Feature 2346 develop update templates (#2589)
* Per #2346, modifying issue templates
* Per #2346, modifying pull request template
* Per #2346, modifying entries based on suggestions by @georgemccabe
* Bugfix #2567 PointStat multiple point observation files (#2582)
* per #2567, properly pass multiple point observation files to point_stat using the -point_obs argument
* per #2567, fix bug that caused file window logic to fail
* Revert "per #2567, fix bug that caused file window logic to fail"
This reverts commit 27fe8226c58e9a028a7979664bbf224296fdd6ea.
* per #2567, fix bug that caused file window logic to fail
* Feature #1514 MADIS2NC wrapper (#2591)
* Per #1514, implement MADIS2NC wrapper and added example use case. Also updated the function to handle the time_summary dictionary in MET config files to support names that exactly match the name found in the dictionary, e.g. ASCII2NC_TIME_SUMMARY_OBS_VAR sets time_summary.obs_var (previously only ASCII2NC_TIME_SUMMARY_VAR_NAMES was supported and is still supported)
* remove execute permissions from image files
* Per #1514, add image for basic use case
* removed large image files that are no longer being used in documentation
* add support for time_offset_warning for MADIS2NC wrapper after the PR to add that support for other wrappers has been merged into develop
* report error if output template is not defined
* update contributor's guide with more up-to-date info on how to create a new wrapper and basic components of wrappers
* fix warnings in documentation
* fix formatting issues
* Per #1514, add new basic use case to automated test suite
* add step to comment out version number in wrapped MET config file
* turn off use case to prepare for PR
* added a pytest fixture to handle comparison of use case commands and environment variable values to remove a lot of redundant logic in each wrapper test. Added fake madis data
* removed commented code
* properly substitute template tags in all command line arguments
* properly handle unset rec_beg and rec_end to prevent missing value from being added to command lien arg
* added new madis2nc use case to existing met_tool_wrapper and temporarily disabled land_surface:0 until we can resolve the differences
* Feature 2346 develop update templates (#2594)
* Per #2346, modifying issue templates
* Per #2346, modifying pull request template
* Per #2346, modifying entries based on suggestions by @georgemccabe
* Per 2346, making updates based on feedback at last MET Eng. Meeting
* Enhance update truth data workflow to create a uniquely named branch to update *-ref branches and commit/append to a log file that tracks the reasons for updating the truth data. This is done to ensure that the *-ref branch testing workflow run that actually updates the truth data is always run even if there are no other changes to the METplus branch since the last update, e.g. when a change to another component like MET warrants the truth data update
* git add change log file in case it doesn't already exist
* changed logic to no longer push changes to develop/main_vX.Y, but instead merge changes from -ref into the update branch
* retain update truth history file from *-ref
* dtcenter/MET#2899 fixes a bug reading point observations using Python Embedding in PointStat and EnsembleStat, which should fix the PBL use case -- dtcenter/METplus#2246 -- so turned on diff test for PBL use case to ensure that results are consistent going forward
* Feature #2429 MvMODE multivar intensity (#2603)
* Feature #2547 ASCII2NC -valid_beg and -valid_end arguments (#2606)
* prevent divide by zero if run_count is 0
* Per #2547, add support for setting -valid_beg and -valid_end command line arguments. Added changes to make ASCII2NC wrapper able to run for all runtime frequencies
* Refactored system_util preprocess_file function to reduce cognitive complexity and add quotation marks around 'filenames' that contain spaces (typically python embedding commands) so explicit handling of these cases don't need to be done downstream. Added unit tests to test more python embedding cases
* remove logic to add quotes around input file since it is handled already in preprocess_file
* changed find_input_files function to return None or a time_info dictionary to be consistent across wrappers
* added ReformatPointWrapper to use as parent class for ASCII2NC, MADIS2NC, PB2NC, and Point2Grid wrappers to consistently handle tools that reformat point observation data. Moved verbosity to the end of commands
* clean up pb2nc wrapper to be more consistent with other ReformatPoint wrappers
* per #2547, added glossary entries for new config variables to set -valid_beg/end and added commented example to basic use case config file
* added glossary entries for *_RUNTIME_FREQ variables
* Per #2513, remove TC_RMW_MAX_RANGE_KM
* Feature 2494 update fv3 data (#2610)
* Updated for new data
* Updated to match new data
* Updates due to new data/updates to data
* Updates due to new data/data variables
* Changes due to changes to data variables, date
* Updates due to changes to data
* Update the date to reflect the new data (with updates to variables)
* fixed error with formatting
* Remove redundant instructions.
* For testing
* Update use_case_groups.json
* Revert to original location of input data to use the same data for all three FV3 Physics Tendency use cases.
* Revert to original location of data from tarball
* Remove typo in file directory name
* Update use_case_groups.json
Returned 10-12 to follow 11
* Update use_case_groups.json
revert to false for testing the short range use cases for FV3 physics tendency
* Update use_case_groups.json
fix alignment of opening curly brace
* Update use_case_groups.json
revert to original formatting
* removed config variable that should be set by the user because it is specific to the user's environment
---------
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Feature #2578 PCPCombine -input_thresh for missing inputs (#2609)
* refactoring to reduce duplicate/redundant code, reduce cognitive complexity to satisfy SonarQube, etc
* change wording of error log to satisfy test
* set -input_thresh argument if set for add, derive, and sum methods. refactor setting of method arguments, e.g. -add, -sum, etc., cleanup
* refactor how level is handled in find_data function so that if the level has already been set, it will use that value, otherwise try to get it from {data_type}_level, e.g. fcst_level, otherwise set it to 0 to prevent errors
* refactor duplicate code into function to satisfy SonarQube
* removed unused variable
* use find_data function to find input files to be consistent with other wrappers, only allow multiple input files to be found for a given call to find_data if using the -derive method
* fix typo in key
* suppress warnings when files aren't found because it is expected
* formatting to be consistent in doc string
* per #2578, add MISSING before file path that is not found if input_thresh is set and less than 1.0, added unit test to ensure correct behavior occurs
* add documentation blocks for new functions, ci-run-all-diff
* use pytest fixture instead of local function
* add support for setting -vld_thresh argument
* per #2578, added documentation and tests for setting -input_thresh and -vld_thresh
* moved verbosity argument to end of command to more easily change it when debugging
* refactor to reduce cognitive complexity to satisfy SonarQube
* update usage statement to include METplus version number
* Add copy button for code blocks to easily copy/paste commands (#2611)
* add copy button for code blocks to easily copy/paste commands
* turn off copy button always visible but leave code block so it can be turned on easily if desired
* Update release-notes.rst
Update METplus-6.0.0 development schedule.
* Fix numbering.
* fix broken link
* Feature 2557 stratosphere qbo (#2621)
* Initial commit for QBO driver
* Adding initial documentation for Stratosphere
* Updating documentation typo
* Updates to Polar plot
* Updates to Stratosphere use cases and documentation
* Updates to polar use case
* Updating documentation
* Updates to Polar and QBO
* Updated documentation for use cases that cannot be run in actions
* Removed some unnecessary imports
* Fixed staging dir settings
* documentation update
* More documentation edits
* More updates
* Fixed link in documentation
* Updating documentation
* Updated bullet list
* More updates
* Added some additional comments to the .conf file
* Fixed typo in output file name in documentation
* Updated output section of documentation
* Updated documentation
* Fixed list that was not working
* Updated broken link
* Fixed broken link again
* Fixed another typo
* Trying to fix documentation error
* Trying to fix indent error
* fixed capital typo
* Added clarification
* use v2 of metplus-action-release-checksum to prevent failure in cUrl command to upload asset
* update version of certifi to fix dependabot alert -- see #2632 (#2633)
* Feature #2626 v6.0.0-beta5 release (#2630)
* update version and added release notes
* Per #2626, updating dates
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Updated release dates
* Updating for changes on wcoss2
* Feature #2656 update_truth (#2657)
* Per #2656, update the read_iodav2_mpr.py scripts to write 3 additional values of NA in each MPR line corresponding to the OBS_CLIMO_CDF, FCST_CLIMO_MEAN, and FCST_CLIMO_STDEV columns.
* Per #2656, update the ugrid_lfric_mpr.py to write 3 additional values of NA in each MPR line corresponding to the OBS_CLIMO_CDF, FCST_CLIMO_MEAN, and FCST_CLIMO_STDEV columns.
* Feature 2679 user support (#2681)
* Per 2679, updating user support documentation
* Per #2679, fixing formatting error
* Update user_support.rst
* Update user_support.rst
---------
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
* Feature 2452 update release guide (#2692)
* Per #2452, updating MET official release instructions
* Update to indicate the "DTC" web server machine
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
* Updated language for tar file
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
---------
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
* Updating release schedule
* Feature #2612 forecast lead groups (#2698)
* Refactor to prevent calling sys.exit from functions that could cause the calling script to exit unintentionally. Instead return None or False and only sys.exit a non-zero value from a script that is called explicitly. Refactored validate config logic to reduce cognitive complexity to satisfy SonarQube
* per #2596, ensure the same RUN_ID is set for a given METplus run even if instances are used in the PROCESS_LIST
* fixed linter complaints
* remove unused imports
* cleanup for SonarQube and linter
* remove unused imports
* import parent wrappers directly so that PyCharm can follow class hierarchy
* per #2612, add support for processing groups of forecast leads
* remove call to prune_empty function and ci-run-all-diff
* fixed check on DataFrame to properly check for an empty one
* remove prune_empty function that is no longer used
* update conda environment requirements for metdataio
* set label to Group<n> for LEAD_SEQ_<n> if LEAD_SEQ_<n>_LABEL is not set (instead of erroring), use forecast lead label for lead if set, log lead group label and formatted list of leads for each run
* increase timeout for request from 60 to 90
* handle exception and output an error message with a suggestion to rerun the failed GHA jobs when a hiccup with DockerHub prevents the list of available Docker data volumes from being obtained. FYI @jprestop
* cleanup to address SonarQube complaints, move call to exit out of main function so a script calling the function does not exit when the function errors
* cleanup to appease SonarQube
* per #2612, add support for creating groups of forecast leads by specifying a list of forecast leads and a time interval to create groups of leads
* per #2612, add unit tests for function that gets groups of forecast leads and added tests for new groups capabilities
* various refactoring to satisfy SonarQube complaints
* renamed config LEAD_SEQ_DIVISIONS to LEAD_SEQ_GROUP_SIZE and LEAD_SEQ_DIVISIONS_LABEL to LEAD_SEQ_GROUP_LABEL
* per #2612, add documentation for new config variables including examples
* fix empty check for DataFrame
* fix rst typo
* minor cleanup to satisfy linter
* Per #2612, if runtime freq is RUN_ONCE_PER_LEAD and groups of forecast leads are specified, then the wrapper will be run once per lead GROUP instead of once for each unique lead in the lead groups. Update unit test to reflect new behavior
* update versions packages to match METplotpy requirements and update call to cartopy feature download script -- see https://github.com/SciTools/cartopy/pull/2263
* Feature #2622 forecast climatology (#2696)
* remove support for old environment variables CLIMO_MEAN_FILE and CLIMO_STDEV_FILE that were used in METplus versions earlier than v4.0.0
* fixed SonarQube bugs
* add better error checking for DockerHub queries that occasionally fail in GHA
* update pycharm files
* per #2622, support setting climo_mean and climo_stdev dictionary values inside fcst and obs dictionaries for grid_stat, ensemble_stat, point_stat, and series_analysis. Quietly add support for setting climo dictionaries inside the ens dictionary for gen_ens_prod -- this support is not needed because there is only 1 dictionary that may contain the climo dicts, but adding support for completeness so it can be assumed that {APP_NAME}_{DICT}_{SUBDICT}_{VAR} is supported, e.g. GEN_ENS_PROD_ENS_CLIMO_MEAN_REGRID_METHOD
* turn on use cases that started failing from MET changes
* turn off all use cases from push events
* reorder assert so that expected vs. actual in PyCharm diff are accurate
* remove commented code
* added unit tests for climo VAR<n> variables that were missing
* add VAR<n> variables used to specify climo_mean/stdev field values
* bugfix to allow empty list for diag_info_map.diag_name
* another hotfix to allow empty list for diag_info_map.match_to_track
* Feature #2651 SeriesAnalysis -aggr argument and new use case (#2701)
* exclude build directory from PyCharm project
* refactor to satisfy SonarQube complaints
* Per #2651, add support for setting -aggr argument with file path. Refactor functions to resolve SonarQube complaints. Enhance unit tests to test multiple init times and -aggr argument
* add new config variables to basic use case
* change settings to match MET unit test
* added new config variables to set -aggr argument in SeriesAnalysis wrapper to documentation
* Per #2651, add new use case to demonstrate using the -aggr argument to SeriesAnalysis
* turn on new use case to test it in GHA
* remove blank line
* turn off use case to prepare for PR
* Bugfix #2705 develop - SeriesAnalysis fix time substitution into field info (#2709)
* fix SonarQube complaints
* Per #2705, set correct time information in field info by using the time info used to find the input files (self.c_dict['ALL_FILES']) instead of relying on parsing the time info from the other input files (fcst vs. obs)
* clean up unused code after bugfix for #2705
* Feature 2647 use case mv mode for rrfs (#2706)
* establish documentation, need to fill out with provided info
* updated documentation, needs to have img path and output path fixed
* updated output strings, still need to update pic link
* removing pound sign to render correctly
* Revert "removing pound sign to render correctly"
This reverts commit ffe607a96fd33dc5ba15a479f76778dcba7e9656.
* targeted removal of pound sign with bullet points section.
* Per #2647, attempt to fix syntax error
* Per #2647, adding back contents with formatting changes to test if it works
* Per #2647, adding back contents in a different location to try to resolve syntax error
* Per #2647, testing pipe for horizontal scroll bar
* Per #2647, removed the pipe symbol and are attempting to fix syntax error again
* Per #2647, reverting to original failed attempt of a table of contents
* Per #2647, trying new formatting
* Per #2647, fixing new formatting
* Per #2647, attempt formatting changes
* Per #2647, reverting back to original state
* added to automated testing, updated docs, config file
* added docs back in
* added image, new quick search term, disabled auto tests
* testing use_case_groups.json to see if/how this fails
* Updated to disable use_case_groups.json run
* added use case to list of exceeding disk space
---------
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: Lisa Goodrich <lisag@ucar.edu>
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Bugfix 2675 move to pyproject.toml (#2699)
* 2675: move to pyproject.toml
* 2675: update toml, remove setup.py ref
* bugfix 2675: reinstate VERSION file
* bugfix 2675: hardcode version in pyproject.toml
* use relative versions
* slightly modify import to make it easier to move produtil into metplus
* read version from version file
* disable install of run_metplus script since it is broken
* only install metplus and sub-packages, add version files to package data (parm cannot be added because it is non-package data)
* add newline back
* install produtil package so metplus can be imported in python
* remove unused import
* move produtil under metplus to differentiate it from the full NCEP produtil package and isolate it to metplus when installing metplus as a package -- previously produtil would be installed as its own package when metplus is installed
* fixed more imports
* Create links for parm directory and scripts/run_metplus.py under metplus so the parm files and run script will be installed as part of the metplus python package. Modified config_metplus to find the parm directory from under metplus to be consistent between running via python package and via scripts
* Exclude parm from sonar sources because it will be found under metplus. Add metplus/parm/** to list of coverage exclusions
* fixed more imports
* add parm back to list of sonar sources
---------
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Removing stated location of the version selector menu
* Feature 2489 update docs (#2717)
* adding new Literal Include section
* under bold section adding "Environment" to Variables
* Adding Substitution References section
* removing blank space
* fixing code typos
* another typo
* Update docs/Contributors_Guide/documentation.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Update docs/Contributors_Guide/documentation.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Update docs/Contributors_Guide/documentation.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Update docs/Contributors_Guide/documentation.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Update docs/Contributors_Guide/documentation.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Feature #2540 Point2Grid config file (#2580)
* per #2540, add support for setting values in a config file for Point2Grid wrapper -- removed -qc flag argument in favor of setting obs_quality_inc in the config file
* Added support for setting time_offset_warning now that the changes for other wrappers was merged into develop. Also added support for MET_CONFIG_OVERRIDES for Point2Grid
* per #2540, set -goes_qc command line argument from POINT2GRID_GOES_QC_FLAGS and continue to support legacy POINT2GRID_QC_FLAGS. Other fixes to resolve incorrectly resolved conflicts from previous commit merging develop into branch
* per #2540, remove quality_mark_thresh from config file because it has been removed from MET point2grid
* Per discussion in PR #2580, remove time_offset_warning support from tools that don't actually use the value -- to add support for a new wrapper, update metplus/util/constants.py TIME_OFFSET_WARNING_WRAPPERS to include the wrapper's name
* removed env vars for time_offset_warning for wrappers that no longer set it
* install ImageMagick convert because it appears to no longer be available in the image that runs the unit tests (ubuntu 24.04?)
* Bugfix metdbload config (#2728)
* Update METdbLoadConfig.xml
A schema is now used to validate all XML specification files and elements must adhere to a particular order. The <group> element follows the headers and load elements and preceeds the folder tmpl element.
* Update use_case_groups.json
temporarily run tests for the short range use cases
* Update use_case_groups.json
Return all the short_range use case test "run" values back to false
* install convert because some tests fail if it is not available
* Feature #1882 docs: new use case that uses METplus Analysis (#2726)
* Fixing mistake
* Fixing reference
* Fixing link
* Updating sections
* clean up new content
---------
Co-authored-by: Christina Kalb <kalb@ucar.edu>
* Feature 918 add use case template (#2690)
* updated template, 1st part
* added more to template, updated internal references. Needs final two cats
* finished updating template
* updated syntax, length of lines
* moved example to separate file, testing indents for discussion
* added new collapse menu for MET configs, documentation on adding keywords, testing 2 separate options to stop paragraph jumping during bullet lists
* updated spacing used for 2nd line indentation
* Update docs/Contributors_Guide/add_use_case.rst
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
* Minor changes, updates hyperlink to template to be directly to the file and not to the directoy in GitHub.
* Update add_use_case.rst
* Update docs/Contributors_Guide/add_use_case.rst
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Update add_use_case.rst
* Missing space in hyperlink.
* Changes to use a keyword to assist users in checking off each section they should review and also PR reviewers in ensuring each section has been visited and reviewed by the contributor.
* updated Python section to User Scripting
---------
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Feature #2727 point_weight_flag and obtype_as_group_val_flag (#2730)
* Per #2727, add support for setting point_weight_flag
* Per #2727, add support for obtype_as_group_val_flag
* per #2714, deprecate master_metplus.py
* Update VERSION
* Feature #2710 - clean up use cases (#2711)
* per #2710, remove line that has no effect because next line overwrites value
* per #2710, fix bug in if/else block where both were doing the same thing. Removed commented code and create variable for constant to satisfy SonarQube
* updated config file commands
* updated level of winds to capture change in script
---------
Co-authored-by: j-opatz <jopatz@ucar.edu>
* Feature #2682 Component version lookup (#2733)
* per #2714, deprecate master_metplus.py
* exclude metplus/scripts from SonarQube scan to prevent incorrect duplicate code error since script lives in ush
* added Dockerfile to build image with MET/METplus and METplus Analysis Python packages
* start of script to get versions of METplus components
* per #2682, created METplus component version lookup table and functions to get formatted version of requested components
* add descriptions for tests
* add update information and made script callable
* made script executable
* add workflow to trigger on release and create dtcenter/metplus and dtcenter/metplus-analysis Docker images
* add scripts used by new workflow
* removed build hook scripts since we will be building images via GHA
* change logic to get MET version using component version script instead of build hook file that just adds 6 to major version
* add missing shebang
* make script callable directly and make output component a required input
* pass LATEST_TAG to push script
* ensure only 1st line of version file is read to avoid newline
* turn on use case to test
* turn off use case
* Feature #2735 v6.0.0 beta6 (#2736)
* change version for beta6 release
* added script to help generate release notes for development releases
* add default title for issues and added documentation issue template
* sort issues by number, improve formatting for release notes title, add logging to alert users what is happening when timely github queries are running
* added release notes for beta6 release
* Add option to component version script to return 'develop' if the input version is a beta or rc version to preserve previous behavior of GHA scripts. Update GHA scripts to use new option
* applied suggestions from feedback in PR #2736
* bold some release notes
* update version for development towards rc1 release
* fix logic to determine offical X.Y.Z release
* Feature #2739 labels (#2740)
* Per #2739, add NRL reporting label and add METplus-Internal to the list of repositories to be updated.
* Per #2739, add info about labels to the Contributor's Guide.
* Per #2739, update the list of METplus repos in process_labels.sh but remove them from the other shell scripts to avoid keeping the same list updated in multiple spots.
* Per #2739, move label details from the README to the Contributor's Guide
* Updated release notes adding this issue: Develop an RST template for use cases
* Feature 2716 existing builds (#2748)
* adding the first 4 paragraphs
* fixing web addresses
* Highest level of dropdown menus added
* NCAR machines dropdown menus
* CASPER dropdown menu
* web addresses can't be bolded. Fixing dropdown problems
* blank line problem
* italics date adding Derechio parts
* DERECHO dropdown
* fixing problems
* fixing mor problems
* fixing bolding
* trying to fix web address
* adding NCAR RAL MACHINES and trying to fix website issue
* NCAR/RAL Internal Development dropdown
* adding remaining dropdown structure
* WCOSS2 dropdown
* HERA dropdown
* fixing last updated to be consistent
* HERCULES dropdown
* fixing pip
* orion dropdown
* JET dropdown
* GAEA dropdown
* fixing typo
* Community machines, Docker Hub & AWS
* fixing typo
* Changing to "Users should create a file like"
* to set a personalized input...
* adding last updated and Docker Hub web links
* Updating Jet information after recent install and changing some formatting for consistency
* Removing bolding for consistency
* creating a separate file for existing builds to add to 2 areas
make it section 2.1 where METplus Components Release Note Links
and
Release Notes
* adding existing_builds as an include
* Rename existing_builds_rst to existing_builds.rst
I had an underline instead of a period
* changing to a section, not a chapter
* trying a different section
* changing existing builds to an include file
* Update docs/Users_Guide/existing_builds.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Update docs/Users_Guide/existing_builds.rst
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* removing existing builds completely from the Release Guide
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Update release-notes.rst
* add custom string to time info dictionary for substituting values into the field info string
* Feature #2742 develop fix StatAnalysis to set fcst_lev/obs_lev (#2760)
* Feature 2763 existing builds (#2765)
* Per #2763, updated build for Casper
* Per #2763, updating Orion
* Bugfix #2762 PCPCombine derive field info (#2764)
* per #2762, change derive mode to add field info for each file instead of adding the first field info only
* Per #2762, improve how the accumulation amounts are handling using relativedelta to ensure that the correct number of seconds are used for each search window when using inconsistent time intervals like months or years
* Bugfix #2762 part 2 -- fix PCPCombine leap year issue (#2766)
* remove check if script is master_metplus.py because it has been deprecated
* per #2762, fix bug that caused failure depending on valid time relating to leap years
* Feature #2754 rc1_main_vX.Y (#2755)
* Per #2754, update instructions to create the main_vX.Y and main_vX.Y-ref branches (when applicable) for the first release candidate rather than waiting until the official release. Note that I deleted the push_release_branch.rst instructions since it's not needed. The preceeding instructions execute the push and these are redundant - even for METplus which has custom instructions.
* Per #2754, add a note to make the detail stand out better
* Per #2754, make the GitHub release instructions more explicit to match the names of the actual fields on GitHub.
* Per #2754, not changing comment, just using more consisent formatting options.
* Per #2754, change example from 'betaN' to 'rc1' since this step is only run for the rc1 release.
* Per #2754, use consistent single quotes instead of italics for formatting.
* Updates to METplus instructions to properly handle version numbers for rc1 release. Update METplus Official release instructions to use main branch and update version number for official release since main branch will contain -rcN version numbers
* update instructions to checkout correct branch
* clarify next deveopment version can be X+1.0 OR X.Y+1
* update version table for other components -- this could likely be refactored to make the version file path a variable and include the same update_version_on_develop.rst file for METplus, METcalcpy, METdataio, METplotpy, and METviewer
---------
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Resolving use case template formatting problems and adding dropdowns
* Resolving use case template formatting problem
* Fixing formatting
* Updating to add language if no Python embedding or User Scripting is used.
* Feature #2562 version lookup documentation and automated tests (#2773)
* set default input version to the latest official release, which is the 2nd highest coordinated release version number in the version lookup table. This assumes that the highest version is what is being developed towards
* per #2562, update Release Guide to include instructions for updating the component versions lookup table in the METplus repository
* Per #2562 and #2597, replace automated test logic that used manage_externals to use component version lookup to get versions of METplotpy/METcalcpy/METdataio
* clean up SonarQube complaints
* turn on some use cases to test changes
* fix clone
* do not get python dependencies for METplotpy/METcalcpy/METdataio installs
* use full path to package to import
* clone METplus Analysis repos on the same level as METplus to match previous location using manage_externals, remove manage_externals config files that are no longer used by the automated tests
* clean up linter complaints
* turn off use cases after confirming that they run successfully
* clean up usage statement formatting
* remove info about updating manage_externals config files used in automated tests that have been removed
* added description of component versions script to Contributor's Guide and added stubs for other utility descriptions
* change format of example results and add text to describe what is being demonstrated from each example
* fix formatting
* fixed bad variable replacement
* Update docs/Contributors_Guide/utilities.rst
---------
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
* Feature 2737 release instruct (#2775)
* Per #2737 updating version instructions
* Per #2737, update version instructions for METcalcpy
* Per #2737, renaming development file
* Per #2737, update version instructions for METplotpy
* Per #2737, updating version instructions for METdataio
* Per #2737, updating version instructions for METviewer
* Per #2737, adding pyproject.toml to the list of files to update
…
This was referenced Dec 11, 2024
Enhance GenVxMask wrapper to compute time-varying masks using Local Solar Time
dtcenter/METplus#2586
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since the
main_v12.0branch was created for the MET-12.0.0-rc1 release, thedevelopbranch is now available to accept enhancements slated for the v12.1 release. This PR can proceed.Add support for new
-type solar_timemasking type.Also adds support for multiple
-type,-mask_field, and-threshsettings for a single run, when all use the same mask_file setting.Expected Differences
Do these changes introduce new tools, command line arguments, or configuration file options? [Yes]
If yes, please describe:
Do these changes modify the structure of existing or add new output data types (e.g. statistic line types or NetCDF variables)? [Yes]
If yes, please describe:
Adds new
unitsattribute to the NetCDF output from Gen-Vx-Mask.Updates the
mask_typeattribute with additional details about the data processed.Adds logic to concatenate masking type names when constructing the output variable name.
Pull Request Testing
Describe testing already performed for these changes:
Tested manually.
Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:
unitsNetCDF variable attribute is added to existing Gen-Vx-Mask output files.seneca:/d1/projects/MET/MET_pull_requests/met-12.1.0/beta1/MET-feature_2966_local_solar_time/bin/gen_vx_maskand try to "break it" ensuring it behaves as expected.Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? [Yes]
Updated the chapter about spatial masking.
Do these changes include sufficient testing updates? [Yes]
Added two new Gen-Vx-Mask unit test to demonstrate:
combining the
-type solar_altand-type solar_timeoptions in a single runcombining data/data/lat/lon masking types in a single run
Will this PR result in changes to the MET test suite? [Yes]
If yes, describe the new output and/or changes to the existing output:
Two new files described above and changes to the
unitsandmask_typeattributes of existing output files.Will this PR result in changes to existing METplus Use Cases? [Yes or No]
If yes, create a new Update Truth METplus issue to describe them.
The
unitsvariable attribute will be added andmask_typemodified for existing Gen-Vx-Mask output files.Do these changes introduce new SonarQube findings? [No]
If yes, please describe:
While existing SonarQube findings will be flagged as being "new", the overall number of code smells is reduced from 18,315 to about 18,251.
Please complete this pull request review by [Fri 11/22/24].
Discussed timing during the METplus NRL meeting on 11/20/24. Recommend reviewing by Friday 11/22/24 or early the following week.
Pull Request Checklist
See the METplus Workflow for details.
Select: Reviewer(s) and Development issue
Select: Milestone as the version that will include these changes
Select: Coordinated METplus-X.Y Support project for bugfix releases or MET-X.Y.Z Development project for official releases