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 #2471 #2477

Merged
merged 632 commits into from Feb 28, 2023
Merged

Update develop-ref after #2471 #2477

merged 632 commits into from Feb 28, 2023

Conversation

JohnHalleyGotway
Copy link
Collaborator

Expected Differences

This PR explains the differences flagged by the nightly build in seneca:/d1/projects/MET/MET_regression/develop/NB20230228.

  1. PR Feature #2469 2023_v11.1.0 #2471 for issue Update the copyright year to 2023 and increase the version number to 11.1.0. #2469 changes the version number in develop from 11.0.0 to 11.1.0. This causes diffs in the regression test because the diffing logic doesn't know how to handle MTD and SEEPS diffs:
egrep -i "ERROR:|file1:" test_regression_20230228.log | egrep -B 1 ERROR | grep file1
file1: MET-develop-ref/test_output/grid_stat/grid_stat_SEEPS_000000L_20211202_000000V_seeps.txt
file1: MET-develop-ref/test_output/grid_stat/grid_stat_SEEPS_000000L_20211202_000000V.stat
file1: MET-develop-ref/test_output/mtd/mtd_BASIC_20100517_010000V_2d.txt
file1: MET-develop-ref/test_output/mtd/mtd_BASIC_20100517_010000V_3d_pair_cluster.txt
file1: MET-develop-ref/test_output/mtd/mtd_BASIC_20100517_010000V_3d_pair_simple.txt
file1: MET-develop-ref/test_output/mtd/mtd_BASIC_20100517_010000V_3d_single_cluster.txt
file1: MET-develop-ref/test_output/mtd/mtd_BASIC_20100517_010000V_3d_single_simple.txt
file1: MET-develop-ref/test_output/mtd/mtd_CONV_TIME_20100517_010000V_2d.txt
file1: MET-develop-ref/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_pair_cluster.txt
file1: MET-develop-ref/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_pair_simple.txt
file1: MET-develop-ref/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_single_cluster.txt
file1: MET-develop-ref/test_output/mtd/mtd_CONV_TIME_20100517_010000V_3d_single_simple.txt
file1: MET-develop-ref/test_output/mtd/mtd_SINGLE_20100517_010000V_2d.txt
file1: MET-develop-ref/test_output/mtd/mtd_SINGLE_20100517_010000V_3d_single_simple.txt
file1: MET-develop-ref/test_output/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_seeps_mpr.txt
file1: MET-develop-ref/test_output/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_seeps.txt
file1: MET-develop-ref/test_output/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V.stat
file1: MET-develop-ref/test_output/python/mtd_PYTHON_20050807_120000V_2d.txt
file1: MET-develop-ref/test_output/python/mtd_PYTHON_20050807_120000V_3d_pair_cluster.txt
file1: MET-develop-ref/test_output/python/mtd_PYTHON_20050807_120000V_3d_pair_simple.txt
file1: MET-develop-ref/test_output/python/mtd_PYTHON_20050807_120000V_3d_single_cluster.txt
file1: MET-develop-ref/test_output/python/mtd_PYTHON_20050807_120000V_3d_single_simple.txt
file1: MET-develop-ref/test_output/stat_analysis_ps/CONFIG_POINT_STAT_filter_seeps.stat

Updating develop-ref to get past these expected differences.

sethlinden and others added 30 commits September 13, 2022 09:59
* Per issue #2206, for the ECNT line type, added CRPS_EMP_FAIR. SL

* Per issue #2206, for ECNT line type, added CRPS_EMP_FAIR. SL

* Per issue #2206, for ecnt_columns, added CRPS_EMP_FAIR. SL

* Per issue #2206, in write_ecnt_cols(), added crps_emp_fair. SL

* Per issue #2206, in ECNTInfo, added crps_emp_fair. SL

* Per issue #2206, started stubbing code pieced to calculate crps_emp_fair. SL

* Per issue #2206, added new function mean_abs_diff(). SL

* Per issue #2206, in compute_pair_vals() updated the code to calculate crps_emp and crps_emp_fair. SL

* Per issue #2206, added crps_emp_fair (CRPS_EMP_FAIR) to relevant code pieces. SL

* Per issue #2206, added wording for CRPS_EMP_FAIR, also added it to last column of ECNT line type. SL

* Per issue #2206, added info for CRPS_EMP_FAIR and also added the math equation for this. SL

* Per issue #2206, update the math equation for CRPS_EMP_FAIR. SL

* Per issue #2206, added new function weighted_mean_absolute_diff(). SL

* Per issue #2206, updated the crps_emp_fair calculation to subtract the weighted_mean_abs_diff. SL

* Per issue #2206, in aggr_orank_lines(), updated calculation for crps_emp_fair to use weighted_mean_abs_diff. SL

* Per issue #2206, renamed weighted_mean_abs_diff() to wmean_abs_diff(). SL

* Per issue #2206, for the crps_emp_fair calculation, changed weighted_mean_abs_diff() to wmean_abs_diff(). SL

* Per issue #2206, in aggr_orank_lines(), for the crps_emp_fair calculation, changed weighted_mean_abs_diff() to wmean_abs_diff(). SL

* Per issue #2206, updated the math equation for the CRPS_EMP_FAIR calculation. SL

* Per issue #2206, fixed a bug in the wmean_abs_diff() function. SL

* Per issue #2206, added code for crps_emp_fair. SL

* Per issue #2206, in set() function, added checks for crps_emp and crps_emp_fair, for values of 0.0. SL

Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
…r image that it used in the METplus automated tests
…elopment.docker file (apparently unused or rarely previously) to include changes for Python 3.8 including setting the LDFLAG to include -rpath to prevent needing LD_LIBRARY_PATH set to run the tools. Source the env file in the build MET docker script instead of setting the env vars in the configure command
…ck to 3.6. This is done by rolling back the base image in the MET Dockerfiles to dtcenter/met-base:v1.0. Using 3.8 caused the downstream METplus python embedding examples to fail via GHA in the METplus repo. Will write up an issue to investigate more during the MET-11.0.0-beta4 development cycle.
…BASE_IMAGE and MET_BASE_TAG since those variables are hard-coded in the Dockerfiles themselves and this script includes no logic to handle them.
… to MET_BASE_IMAGE and MET_BASE_TAG since those variables are hard-coded in the Dockerfiles themselves and this script includes no logic to handle them."

This reverts commit 5efc65e.
…should really revisit having this setting spread across so many locations.
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@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>
Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
… 2 to 3. Rearranged logic to be more readible by checking error conditions and exiting if they are not met instead of putting all of the logic to run inside the if statement
… seneca changes the order of vx_grid semilatlon slightly. We probably manually editted that file instead of running bootstrap to regenerate it.
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.
jprestop and others added 27 commits February 21, 2023 06:41
Resetting to old values for now.
Update to Python 38 and turn off pdf option
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Bugfix 2428 python embedding with MET_PYTHON_EXE defined
* testing dropdown menu to see if it works.

* adding sphinx_design to config.py and requirements.txt so that dropdown menus will work.

* testing dropdown menus and fixing to rst formatting

* adding non-child dropdown menus

* First try at child dropdown menus

* Second try at child dropdown menus

* Third try at child dropdown menus

* child dropdown menus
@JohnHalleyGotway JohnHalleyGotway added this to the MET 11.1.0 milestone Feb 28, 2023
@JohnHalleyGotway JohnHalleyGotway merged commit 86040a3 into develop-ref Feb 28, 2023
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
Status: Done
Development

Successfully merging this pull request may close these issues.

Update the copyright year to 2023 and increase the version number to 11.1.0.
8 participants