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 #2150 and #2154. #2158

Merged
merged 220 commits into from
May 10, 2022
Merged

Conversation

JohnHalleyGotway
Copy link
Collaborator

Expected Differences

  1. PR Bugfix #2148 develop misses #2150 for bugfix Fix TC-Gen to only count misses from requested initialization hours and lead times. #2148 adds the coordinates variable attribute to many NetCDF files written by MET:
file1: MET-develop-ref/test_output/climatology_1.0deg/ensemble_stat_NCEP_1.0DEG_20120410_120000V_ens.nc
file2: MET-develop/test_output/climatology_1.0deg/ensemble_stat_NCEP_1.0DEG_20120410_120000V_ens.nc
ERROR: NetCDF headers differ:
6a7
> 		TMP_Z2_ENS_MEAN:coordinates = "lat lon" ;

There are a total of 2265 instances of this in 223 NetCDF files.

  1. PR Feature #2152 poly_xy #2154 for issue Enhance Gen-Vx-Mask by adding a new poly_xy masking type option. #2152 adds 2 new unit test output files to demonstrate the gen_vx_mask -type poly_xy option.
ERROR: folder MET-develop-ref/test_output missing 2 files
    gen_vx_mask/POLY_LATLON_RECTANGLE_mask.nc 
    gen_vx_mask/POLY_XY_RECTANGLE_mask.nc 

Updating develop-ref to get past these differences.

jprestop and others added 30 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 and others added 26 commits March 10, 2022 18:28
…ific input data if running tests on main_v branch
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: johnhg <johnhg@ucar.edu>
* Updating configuration and modulefiles

* Removed jet files
* Update the top-level README file to list ioda2nc, but also to trigger GHA to run for this new main_v10.1-ref branch.

* Added bool Sorted variable, set to true or false in relevant functions. Updated sort() function. SL

* In parse_sid_mask(), added the line: mask_sid.sort(). SL

* Per issue #1950, put in some cout statements for testing. SL

* Per issue #1950, working in has() function, checking for Sort and put in initial cout's for testing. SL

* Per issue #1950: Cleaned up some cout (print) statements. Left one in there that is commented out for future testing. SL

* Per issue #1950: modified has() function. Added lower_bound search for sorted arrays. Left some print (cout) statements in there for further testing. SL

* Per issue #1950: In has(), I commented out the print (cout) statements for time testing. SL

* added logic to manually trigger a workflow via the GitHub… (#2107)

* Per issue #1950, put back in some print (cout) statements for testing. SL

* Per issue #1950: in has() function, experimenting using the upper_bound() search instead of lower_bound() for sorted vectors. In progress. SL

* Per issue #1950: added a new has function that uses binary_search. Re-working the other has() functions related to this. SL

* Per issue #1950: re-worked original has(), basically reverted back to what it was...but it's now only used for unsorted vectors or for a case insensitive search. Cleaned up. SL

* Per issue #1950: in section that checks Obs Station Id in SID masking list, changed cout to a mlog (debug) statement. SL

* Per issue #1950: created new mask station id list (CONUS METARs) and modified the PointStatConfig_MASK_SID config file to use this list along with the existing lists. SL

* Per issue #1950: reverted back to orginal sid mask site-lists. SL

* Per issue #1950: checking in this site-list that was used for testing point_stat. SL

* Per issue #1950, modified and added better debugging to figure out current issue with ascii2nc. SL

* Per #1950, small tweak in ascii2nc to make it slightly more efficient. After adding the new obs varable name to the end of the list, we can compute var_index direclty without needing to call StringArray::has() a second time.

* Per #1950: removed mlog and cout print statements from has() functions. Cleaned up. SL

* Update met/src/basic/vx_log/string_array.cc

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

* Update met/src/basic/vx_log/string_array.cc

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

* Update met/src/basic/vx_log/string_array.cc

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

* Update met/src/basic/vx_log/string_array.cc

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

* Update met/src/basic/vx_log/string_array.cc

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

* Update met/src/basic/vx_log/string_array.h

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

* Delete SID_CONUS.txt

* Delete SID_CONUS_times11.txt

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: johnhg <johnhg@ucar.edu>
Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu>
Co-authored-by: johnhg <johnhg@ucar.edu>
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>
Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@kiowa.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: Randy Bullock <bullock@seneca.rap.ucar.edu>
Co-authored-by: davidfillmore <fillmore.winslow.david@gmail.com>
Co-authored-by: rgbullock <bullock@ucar.edu>
Co-authored-by: Seth Linden <linden@ucar.edu>
Co-authored-by: hsoh-u <hsoh@ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: John Halley Gotway <johnhg@seneca.rap.ucar.edu>
Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu>
Co-authored-by: mo-mglover <78152252+mo-mglover@users.noreply.github.com>
Co-authored-by: davidalbo <dave@ucar.edu>
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu>
… variable-length strings passed to ascii2nc.
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
10 participants