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 #2326 #2327

Merged
merged 430 commits into from
Oct 31, 2022
Merged

Update develop-ref after #2326 #2327

merged 430 commits into from
Oct 31, 2022

Conversation

JohnHalleyGotway
Copy link
Collaborator

Expected Differences

Updating develop-ref after PR #2326 for issue #2325 added 2 new columns (MAE and MAE_OERR) to the ECNT line type from Ensemble-Stat and created by HiRA.

The modifies the output of 22 unit test output files that contain the ECNT line type:

egrep -i "ERROR:|file1:" logs/comp_dir.log | egrep -B 1 ERROR | grep file1 
file1: /data/output/met_test_truth/climatology_1.0deg/ensemble_stat_NCEP_1.0DEG_20120410_120000V_ecnt.txt
file1: /data/output/met_test_truth/climatology_1.0deg/ensemble_stat_ONE_CDF_BIN_20120410_120000V.stat
file1: /data/output/met_test_truth/climatology_1.0deg/ensemble_stat_ONE_CDF_BIN_20120410_120000V_ecnt.txt
file1: /data/output/met_test_truth/climatology_1.5deg/point_stat_WMO_CLIMO_1.5DEG_120000L_20120409_120000V_ecnt.txt
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_CMD_LINE_20120410_120000V_ecnt.txt
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_FILE_LIST_20120410_120000V_ecnt.txt
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ecnt.txt
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_SINGLE_FILE_GRIB_NO_CTRL_20160608_060000V.stat
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_SINGLE_FILE_GRIB_WITH_CTRL_20160608_060000V.stat
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_SINGLE_FILE_NC_NO_CTRL_19820701_000000V.stat
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_SINGLE_FILE_NC_WITH_CTRL_19820701_000000V.stat
file1: /data/output/met_test_truth/ensemble_stat/ensemble_stat_SKIP_CONST_20120410_120000V_ecnt.txt
file1: /data/output/met_test_truth/grid_weight/ensemble_stat_AREA_WEIGHT_20120410_120000V.stat
file1: /data/output/met_test_truth/grid_weight/ensemble_stat_COS_LAT_WEIGHT_20120410_120000V.stat
file1: /data/output/met_test_truth/grid_weight/ensemble_stat_NO_WEIGHT_20120410_120000V.stat
file1: /data/output/met_test_truth/met_test_scripts/ensemble_stat/ensemble_stat_20100101_120000V_ecnt.txt
file1: /data/output/met_test_truth/python/ensemble_stat/ensemble_stat_FILE_LIST_20120410_120000V_ecnt.txt
file1: /data/output/met_test_truth/python/ensemble_stat_PYTHON_20050807_120000V.stat
file1: /data/output/met_test_truth/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ecnt.txt
file1: /data/output/met_test_truth/stat_analysis_es/AGG_ECNT_dump.stat
file1: /data/output/met_test_truth/stat_analysis_es/AGG_ECNT_out.stat
file1: /data/output/met_test_truth/stat_analysis_es/AGG_STAT_ORANK_ECNT_out.stat

Updating develop-ref to get past these expected diffs.

Howard Soh and others added 30 commits March 7, 2022 14:12
Feature 1824 pb2nc log message for mlcape
* for #1275, fix issue with more than 1000 object for mode, ci-run-unit

* Per #1275, just deleting stale, commented-out code.

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: John Halley Gotway <johnhg@kiowa.rap.ucar.edu>
…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>
JohnHalleyGotway and others added 27 commits September 28, 2022 09:59
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
* Per #2227 changes in this commit resolve all errors from removing 'using namespace std' from all header files in the src/basic directory

* Attempt to resolve errors in GitHub actions from removing 'using namepsace std' from all src/basic/ libraries, plus removal from src/libcode/vx_gnomon/gnomon.h and src/libcode/vx_nc_util/nc_utils.h

* Attempt to fix GHA errors with compilation after removal of 'using namespace std'; locally compiles fine

* Per #2227, attempting to fix GHA compilation; Compiltion on seneca works fine

* Per #2227, attempt to resolve GHA compilation issues; seneca compilation works fine

* Per #2227, attempt to resolve GHA compilation issues; seneca compilation works fine

* Per #2227, removing namespace from vx_series_data library

* Per #2227, removing namespace std from vx_shapedata library

* Per #2227, removing namespace std from vx_data2d_grib2 and vx_data2d_grib libraries

* Per #2227, removing namespace std from vx_statistics library

* Per #2227, removing namespace std from src/tools/tc_utils

* Per #2227, removed namespace std from /src/tools/core header files

* Per #2227, clean up and continued work

* Per #2227, changes to remove namespace std and netCDF from header files

* Per #2227, resolve errors in GitHub Actions build

* Per #2227, resolve new errors in GitHub Actions build

* Per #2227, resolve new errors in GitHub Actions build

* Per #2227, resolve new errors in GitHub Actions build

* Per #2227, realign variables

* Per #2227, updating comment

* Per #2227, updating comment

* Per #2227, realign variables

* Per #2227, realign variables

* Per #2227, realign variables

* Per #2227, updating comment

* Update src/basic/vx_config/config.tab.cc

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

Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu>
Co-authored-by: johnhg <johnhg@ucar.edu>
Changes for #2297 included a small typo that I'm fixing directly in the develop branch.
A final hotfix to the develop branch to get the build_docker_trigger_metplus.yml workflow working again. I tested on feature_2297_gha branch to confirm that no double-quotes are actually needed.
Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Clean up Python Embedding scripts
Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu>
Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu>
@JohnHalleyGotway JohnHalleyGotway added this to the MET 11.0.0 milestone Oct 31, 2022
@JohnHalleyGotway JohnHalleyGotway merged commit 1d8978d into develop-ref Oct 31, 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.