Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update develop-ref after #1979 #1981

Merged
merged 17 commits into from Nov 23, 2021
Merged

Update develop-ref after #1979 #1981

merged 17 commits into from Nov 23, 2021

Conversation

JohnHalleyGotway
Copy link
Collaborator

This updates develop-ref to get past changes flagged in NB20211123.

Expected Differences

  • Do these changes introduce new tools, command line arguments, or configuration file options? [No]

    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)? [No]

    If yes, please describe:

Pull Request Testing

Here are the NB diffs:

egrep "file[1,2]:|ERROR:" test_regression_20211123.log | egrep -B 2 ERROR:
file1: MET-develop-ref/test_output/mtd/mtd_BASIC_20100517_010000V_3d_single_cluster.txt
file2: MET-develop/test_output/mtd/mtd_BASIC_20100517_010000V_3d_single_cluster.txt
ERROR: compareStat() failed
file1: MET-develop-ref/test_output/mtd/mtd_BASIC_20100517_010000V_3d_single_simple.txt
file2: MET-develop/test_output/mtd/mtd_BASIC_20100517_010000V_3d_single_simple.txt
ERROR: compareStat() failed
--
file1: MET-develop-ref/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_single_cluster.txt
file2: MET-develop/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_single_cluster.txt
ERROR: compareStat() failed
file1: MET-develop-ref/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_single_simple.txt
file2: MET-develop/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_single_simple.txt
ERROR: compareStat() failed
--
file1: MET-develop-ref/test_output/mtd/mtd_SINGLE_20100517_010000V_3d_single_simple.txt
file2: MET-develop/test_output/mtd/mtd_SINGLE_20100517_010000V_3d_single_simple.txt
ERROR: compareStat() failed

These changes are all expected.

  • Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:

    None

  • Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? [Yes]

  • Do these changes include sufficient testing updates? [Yes]

  • Will this PR result in changes to the test suite? [Yes]

    If yes, describe the new output and/or changes to the existing output:

    Update reference version, as expected.

  • Please complete this pull request review by [Fill in date].

Pull Request Checklist

See the METplus Workflow for details.

  • Complete the PR definition above.
  • Ensure the PR title matches the feature or bugfix branch name.
  • Define the PR metadata, as permissions allow.
    Select: Reviewer(s)
    Select: Organization level software support Project or Repository level development cycle Project
    Select: Milestone as the version that will include these changes
  • After submitting the PR, select Linked issues with the original issue number.
  • After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
  • Close the linked issue and delete your feature or bugfix branch from GitHub.

jprestop and others added 17 commits October 26, 2021 13:08
…tead of only the filename so that the function can tell whether or not the file exists. (#1952)

Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu>
* Per issue #1761 in set_perc() adding code to get FBIAS numeric value, like 1.0 or 0.9, etc. SL

* Per issue #1761: in set_perc(), modified actual percentile calculation at end to use the extracted FBIAS numeric value (float). SL

* Per issue #1761: modified the check on the perc_thresh_freq_bias, just has to be > 0 now. SL

* Per issue #1761: cleaned up code in set_perc(). SL

* Per #1761, updates to Simple_Node::set_perc() to handle variable frequency bias amounts.
Changes include:
- Reverting the formatting of this back to how it originally was in the develop branch. In general, just match the formatting of the existing file, so as the minimize the number of difference lines.
- Add logic to adjust the percentile to be found based on the requested FBIAS value. Multiplying or dividing the percentile by the FBIAS value depends on the inequality type and whether we're bias adjusting the forecast or observation data.
- Adjust the log messages slightly.

Please be aware that I'm not totally confident in these changes. They warrant much more testing. This logic is very, very confusing.

* Per #1761, call compute_percentile() when double-checking the percentile values.

* Per #1761, remove unused variable.

* Per #1761, add warning for percentiles > 100.

* Per #1761. In set_perc(), after testing cleaned up code. SL

* Per issue #1761: adding new config file for testing dynamic FBIAS values. SL

* Per issue #1761: added new unit test for dynamic FBIAS values when running grid_stat. SL

* Per issue #1761, modified FBIAS section to indicated that the user can use dynamic values that are not 1.0. SL

* Update met/docs/Users_Guide/config_options.rst

Co-authored-by: johnhg <johnhg@ucar.edu>

* Update met/docs/Users_Guide/config_options.rst

Co-authored-by: johnhg <johnhg@ucar.edu>

* Update met/docs/Users_Guide/config_options.rst

Co-authored-by: johnhg <johnhg@ucar.edu>

* Update test/config/GridStatConfig_fbias_perc_thresh

Co-authored-by: johnhg <johnhg@ucar.edu>

* Update test/config/GridStatConfig_fbias_perc_thresh

Co-authored-by: johnhg <johnhg@ucar.edu>

* Update test/config/GridStatConfig_fbias_perc_thresh

Co-authored-by: johnhg <johnhg@ucar.edu>

* Update test/config/GridStatConfig_fbias_perc_thresh

Co-authored-by: johnhg <johnhg@ucar.edu>

* Per issue #1761, set nc_pairs_flag = FALSE. SL

Co-authored-by: Seth Linden <linden@kiowa.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
…ing the logic for computing the ensemble range back to what it was previously. The new version produced very slight differences in the 6-th or 7-th decimal place when compared to previous results. There's not good reason for these changes which were caused by the order of operations in casting from doubles to floats. Reverting back to the old logic prevents diffs for anyone else downstream and is the prudent choice.
* #1949 Added CF compliant NetCDF into data IO

* #1949 Added commas

* #1948 Some corrections for typo and added the links for CF attributes

* #1948 Added Performance with NetCDF input data

* #1949 Corrected tyoe and applied Juloie's suggestions

Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu>
…OSS. The intel compiler does not allow adjacent >> characters when defining maps.
@JohnHalleyGotway JohnHalleyGotway added this to In progress in MET-10.1.0-beta5 (1/14/22) via automation Nov 23, 2021
@JohnHalleyGotway JohnHalleyGotway added this to the MET 10.1.0 milestone Nov 23, 2021
@JohnHalleyGotway JohnHalleyGotway linked an issue Nov 23, 2021 that may be closed by this pull request
22 tasks
@JohnHalleyGotway JohnHalleyGotway merged commit b4c2714 into develop-ref Nov 23, 2021
MET-10.1.0-beta5 (1/14/22) automation moved this from In progress to Done Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Fix MTD to compute the CDIST_TRAVELLED value correctly.
4 participants