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 #2169 #2191

Merged
merged 253 commits into from
Jun 21, 2022
Merged

Update develop-ref after #2169 #2191

merged 253 commits into from
Jun 21, 2022

Conversation

JohnHalleyGotway
Copy link
Collaborator

@JohnHalleyGotway JohnHalleyGotway commented Jun 16, 2022

Expected Differences

  • PR Feature #2147 HSS #2169 for issue Feature #2147 HSS #2169 adds 1 new column to the CTC line type and 4 new columns to the CTS line type. That results in lots of differences in the output, as described below. Updating develop-ref to get past these diffs.

Description of differences flagged by the nightly build on seneca for NB20220621:

  1. Differences exist in 113 files:
egrep -i "ERROR:|file1:" test_regression_20220621.log  | egrep -B 1 ERROR: | grep file1 | wc -l
113

Broken down by suffix, that's 57 .stat, 50 .txt, 4 .out, and 2 .nc files.
2. 2 NetCDF files diffs add long names to Series-Analysis output which is fine an expected:

COMPARING climatology_1.0deg/series_analysis_GFS_CLIMO_1.0DEG.nc
file1: MET-develop-ref/test_output/climatology_1.0deg/series_analysis_GFS_CLIMO_1.0DEG.nc
file2: MET-develop/test_output/climatology_1.0deg/series_analysis_GFS_CLIMO_1.0DEG.nc
ERROR: NetCDF headers differ:
124a125
> 		series_cnt_ANOM_CORR:long_name = "Anomaly Correlation including mean error" ;
144a146
> 		series_cnt_ANOM_CORR_fcstNA_or_obsgtCDP25.and.ltCDP75:long_name = "Anomaly Correlation including mean error" ;
...
COMPARING climatology_1.0deg/series_analysis_PROB_CLIMO_1.0DEG.nc
file1: MET-develop-ref/test_output/climatology_1.0deg/series_analysis_PROB_CLIMO_1.0DEG.nc
file2: MET-develop/test_output/climatology_1.0deg/series_analysis_PROB_CLIMO_1.0DEG.nc
ERROR: NetCDF headers differ:
40a41
> 		series_pstd_BRIERCL:long_name = "Climatological Brier Score" ;
46a48
> 		series_pstd_BSS:long_name = "Brier Skill Score relative to external climatology" ;
52a55
> 		series_pstd_BSS_SMPL:long_name = "Brier Skill Score relative to sample climatology" ;
  1. 4 .out files are all written by Stat-Analysis and diffs are caused by the additional columns in the CTC and CTS line types.
  2. 50 .txt files are 26 _ctc.txt files and 24 _cts.txt files with diffs caused by the additional columns in the CTC and CTS line types.
  3. 57 .stat files with diffs are all caused by the additional columns in the CTC and CTS line types. I cat-ed them all together, stripping out the CTC, CTS, and VERSION lines, replacing multiple whitespace with a single space, and no diffs remained.

JohnHalleyGotway and others added 30 commits November 3, 2021 13:42
…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.
…e moved to the base class MetPointObsData
Howard Soh and others added 25 commits May 11, 2022 15:34
* bug fix for NAN and for using missing data as if its not missing

* added parameters to control converting winds to tangential/radial components

* bug fixes

* Refactored to put wind conversion into it's own class TCRMW_WindConverter

* changed default for converting winds to TRUE, and put parameters for wind conversion into the unit test config files

* Per #2072, updating tc_rmw Makefile.in to compile new files.

* Per #2072, update to the output from the lex/yacc version on seneca.

* Changed Error to Warning in mlog messages, for consistency with MET conventions

* Removing commented out code.

* Per #2072, combine warnings spread across multiple lines into a single call to the logger. Replace references to ugrid/vgrid with u/v wind. Fix a typo and clean up some whitespace.

Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
* Per #2022: Added ANOM_CORR, ANOM_CORR_BCL, ANOM_CORR_BCU to vcnt_columns. SL

* Per #2022: Added ANOM_CORR, ANOM_CORR_BCL, ANOM_CORR_BCU to write_vcnt_cols. SL

* Per #2022: Added ANOM_CORR to VL1L2Info. SL

* Per #2022: updated the VL1L2Info functions to initialize and compute ANOM_CORR. SL

* Per #2022: in calc_ncep_stats modified calculation for ANOM_CORR to check for bad data in the denominator first. SL

* Per #2022: for the VL1L2Info, changed all derived VCNT variables to be CIInfo objects (instead of doubles). SL

* Per #2022: making changes to VL1L2Info related to making all VCTN variables CIInfo objects. In progress. SL

* Per #2022: Added ANOM_CORR_UNCNTR. SL

* Per issue 2022: Modified functions in the VL1L2Info class to set the NCEP stat variables correctly since they are now CIInfo class memembers. SL

* Per issue 2022: Added ANOM_CORR_UNCNTR (_BCL, _BCU). SL

* Per issue 2022: modified write_vcnt_cols(), added ANOM_CORR_UNCNTR (_BCL, _BCU). SL

* Per issue #2022: updated write_vcnt_cols. VCNT variables are now CIInfo objects to have to .v for the value. SL

* Per issue #2022: In calc_ncep_stats, put in place-holder for ANOM_CORR.v value SL

* Per issue #2022: in calc_ncep_stats(), changed placeholder for ANOM_CORR. SL

* Per issue #2022: moved alpha initialization to the init_from_scratch() function. SL

* Per issue #2022: in calc_ncep_stats(), set ANOM_CORR to bad_data_double as a placeholder for now. SL

* Per issue #2022: in vcnt_cols(), added ANOM_CORR_NCL/NCU. SL

* Per issue #2022: in write_vcnt_cols(), added ANOM_CORR_NCL/NCU variables. SL

* Per #2022, adding new VCNT columns to the header table files, User's Guide documentation, and lining some code up more consistently.

* Per #2022, added FA_SPEED_BAR and OA_SPEEED_BAR to the VAL1L2 line type. Added code to compute the ANOM_CORR confidence interval. However, I still need to update the writing of the VCNT line type to set the alpha value and actually write the computed CI's.

* Per #2022, update the writing of the VCNT output line to write the alpha value and anomaly correlation CI's.

* Per #2022, update point_stat and grid_stat to allocate alpha values for VL1L2Info objects to store CI's.

* Per #2022, call VL1L2Info::zero_out() instead of clear() so that we don't throw away allocated alpha values.

* Per #2022, update the Point-Stat and Grid-Stat logic to include the number of alpha values when deciding how many VCNT lines to write.

* Per #2022, update the VL1L2Info::operator+= logic to copy over the allocated alpha values.

* Per #2022, enhance stat_analysis to support an aggregate_stat job type for VAL1L2->VCNT. This writes ANOM_CORR and ANOM_CORR_UNCNTR output columns. However, there are still things to address. The other stats should be written as NA instead of 0. Recommend changing the VL1L2Info::zero_out() function to intialize stat values to NA instead of 0. Need to update the docs to reflect this support. Also need to actually compute the parametric CI's for ANOM_CORR. Big picture, we should store the VCNT stats in a new VCNTInfo class... just like the SL1L2Info/CNTInfo setup. Storing the sums AND stats in the same VL1L2Info class is unnecessarily confusing.

* Per #2022, update Stat-Analysis docs to list VAL1L2 -> VCNT as a supported conversion type.

* Per #2022, when computing VL1L2Info CI's, n should be set to vacount rather than the number of input pairs.

* Per #2022, add a new call to Stat-Analysis to exercise the VAL1L2 to VCNT conversion.

* Per #2022, ci-run-unit fix an aggregation bug in VL1L2Info::operator+=().

* Per issue #2022, added _vcnt.txt output files to check to relevant tests based on if vcnt output file is being generated via the config file. SL

Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Proceeding with the merge without an external review based on the details listed above.
…d new CTC and CTS columns. Prevoiusly the CTC columns = NBRCTC columns and CTS = NBRCTS. But that is no longer the case. This updates write_nbrctc_cols() and write_nbrcts_cols() to actually write them rather than just calling the functions to write CTC and CTS cols, respectively.
@JohnHalleyGotway JohnHalleyGotway added this to the MET 11.0.0 milestone Jun 16, 2022
@JohnHalleyGotway JohnHalleyGotway changed the title Develop Updated develop-ref after #2169 Jun 16, 2022
@JohnHalleyGotway JohnHalleyGotway marked this pull request as ready for review June 21, 2022 14:12
@JohnHalleyGotway JohnHalleyGotway merged commit 6428828 into develop-ref Jun 21, 2022
@JohnHalleyGotway JohnHalleyGotway changed the title Updated develop-ref after #2169 Update develop-ref after #2169 Jul 25, 2022
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.

10 participants