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 #2265 #2267

Merged
merged 399 commits into from
Sep 21, 2022
Merged

Update develop-ref after #2265 #2267

merged 399 commits into from
Sep 21, 2022

Conversation

JohnHalleyGotway
Copy link
Collaborator

Expected Differences

Updating develop-ref after PR #2265 for issue #1908 changed the output of Ensemble-Stat considerably.

For a list of the expected differences, please see this comment from the PR.

Updating develop-ref to get past these diffs.

georgemccabe and others added 30 commits February 18, 2022 09:46
#1824 ci-run-test Reset itype to 1 for regular CAPE
* found and made three changes replacing [email protected] with the MetPlus gitub discussions page

* Update met/docs/Users_Guide/appendixA.rst

Thanks, a typo plus I am completely neutral as to the exact wording.

Co-authored-by: jprestop <[email protected]>

* Update met/src/libcode/vx_data2d_grib2/data2d_grib2.cc

Co-authored-by: jprestop <[email protected]>

* Update met/README

Co-authored-by: jprestop <[email protected]>

Co-authored-by: jprestop <[email protected]>
* Updated set_job_controls.sh to add a check for the skip all keyword

* Added a space to check keyword ci-skip-all

Co-authored-by: Julie Prestopnik <[email protected]>
* Per #1918, store the ensemble_member_id string in the EnsVarInfo class so that we can use it later, if needed, when reading climatological data which may also make use of that string.

* Per #1918, update gen_ens_prod to set the MET_ENS_MEMBER_ID environment variable when reading climatology data if the ens_member_ids config option has been set and the normalizing relative to climatology has been requested.

* Per #1918, add log messages to read_climo.cc and gen_ens_prod.cc to clarify what data is being read from which climo data files.

* Added documentation on MET_ENS_MEMBER_ID usage in climo file name

* updated usage langauge

* Per #1918, adding gen_ens_prod unit test to demonstrate using ENS_MEMBER_ID to read climo data separately for each member.

* Per #1918, adding gen_ens_prod unit test to demonstrate using ENS_MEMBER_ID to read climo data separately for each member.

Co-authored-by: j-opatz <[email protected]>
JohnHalleyGotway and others added 28 commits August 26, 2022 11:18
…id_stat, gribtab_dat_to_flat, and gsidens2orank). Also removed commented out code from main.cc.
* Per #2198, adding Seth Linden and Dave Albo to the Author List

* Per #2198, updated Dave Albo to David Albo

* Per #2198, added three new authors based on submitted AMS abstract

* Per #2198, adding .zenodo.json file

* Per #2198, adding orcids for all based on Tatiana's suggestion

* Update .zenodo.json

Co-authored-by: johnhg <[email protected]>

* Update .zenodo.json

Co-authored-by: johnhg <[email protected]>

* Update .zenodo.json

Co-authored-by: johnhg <[email protected]>

Co-authored-by: johnhg <[email protected]>
* Per #2196, update for upgrade to Python 3.8.6

* Updated based on new structure of METbaseimage

* Changed MET_BASE_IMAGE references to MET_BASE_TAG; Added information to the README.md file

* Changed MET_BASE_IMAGE references to MET_BASE_TAG; Updated the version from v1.0 to v1.1

* Update internal/scripts/docker/README.md

Based on suggestion from John HG.

Co-authored-by: johnhg <[email protected]>

* Update internal/scripts/docker/README.md

Based on suggestion from John HG.

Co-authored-by: johnhg <[email protected]>

* Update internal/scripts/docker/README.md

Based on suggestion from John HG.

Co-authored-by: johnhg <[email protected]>

* Update internal/scripts/docker/README.md

Based on suggestion from John HG.

Co-authored-by: johnhg <[email protected]>

* Per #2196, updating README.md based on suggestions from John HG

Co-authored-by: johnhg <[email protected]>
* creating chapter files

* putting a space in to work through the git add and commit process.

* Changed formatting of one header

Co-authored-by: Lisa Goodrich <[email protected]>
Co-authored-by: jprestop <[email protected]>
* 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 <[email protected]>
…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 <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
Co-authored-by: Howard Soh <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
Co-authored-by: MET Tools Test Account <[email protected]>
Co-authored-by: Dave Albo <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
@JohnHalleyGotway JohnHalleyGotway added this to the MET 11.0.0 milestone Sep 21, 2022
@JohnHalleyGotway JohnHalleyGotway merged commit f9dc013 into develop-ref Sep 21, 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.