From ca66893b0b416407246fd4e25df8d3eb009763e6 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Mon, 31 Jul 2023 17:56:07 -0600 Subject: [PATCH] Update main_v11.1-ref after dtcenter/MET#2634 (#2635) Co-authored-by: John Halley Gotway Co-authored-by: Seth Linden Co-authored-by: jprestop Co-authored-by: Daniel Adriaansen Co-authored-by: John and Cindy Co-authored-by: Howard Soh Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: hsoh-u Co-authored-by: MET Tools Test Account Co-authored-by: Seth Linden Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com> Co-authored-by: davidalbo Co-authored-by: Lisa Goodrich Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Jonathan Vigh Co-authored-by: David Albo Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com> Co-authored-by: Dan Adriaansen Fix Python environment issue (#2407) fix definitions of G172 and G220 based on comments in NOAA-EMC/NCEPLIBS-w3emc#157. (#2406) fix #2380 develop override (#2382) fix #2408 develop empty config (#2410) fix #2390 develop compile zlib (#2404) fix #2412 develop climo (#2422) fix #2437 develop convert (#2439) fix for develop, for #2437, forgot one reference to the search_parent for a dictionary lookup. fix #2452 develop airnow (#2454) fix #2449 develop pdf (#2464) fix #2402 develop sonarqube (#2468) fix #2426 develop buoy (#2475) fix 2518 dtypes appf docs (#2519) fix 2531 compilation errors (#2533) fix #2531 compilation_errors_configure (#2535) fix 2596 main v11.1 rpath compilation (#2614) fix #2514 main_v11.1 clang (#2628) --- .github/pull_request_template.md | 2 +- data/config/GridStatConfig_default | 12 +- data/config/PointStatConfig_default | 11 +- docs/Users_Guide/config_options.rst | 8 +- docs/Users_Guide/release-notes.rst | 149 +++++++++++------------- docs/Users_Guide/tc-diag.rst | 14 +-- docs/conf.py | 4 +- internal/test_unit/xml/unit_plot_tc.xml | 12 +- src/basic/vx_log/concat_string.h | 4 +- 9 files changed, 108 insertions(+), 108 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 7eca635eb6..685638ecb3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -30,6 +30,6 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors Select: **Reviewer(s)** Select: **Organization** level software support **Project** or **Repository** level development cycle **Project** Select: **Milestone** as the version that will include these changes -- [ ] After submitting the PR, select **Development** issue with the original issue number. +- [ ] After submitting the PR, select the :gear: icon in the **Development** section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected. - [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge. - [ ] Close the linked issue and delete your feature or bugfix branch from GitHub. diff --git a/data/config/GridStatConfig_default b/data/config/GridStatConfig_default index ab414177c2..fb9d4db60b 100644 --- a/data/config/GridStatConfig_default +++ b/data/config/GridStatConfig_default @@ -207,6 +207,13 @@ distance_map = { //////////////////////////////////////////////////////////////////////////////// +// +// Threshold for SEEPS p1 (Probability of being dry) +// +seeps_p1_thresh = >=0.1&&<=0.85; + +//////////////////////////////////////////////////////////////////////////////// + // // Statistical output types // May be set separately in each "obs.field" entry @@ -255,11 +262,6 @@ nc_pairs_flag = { apply_mask = TRUE; } -//////////////////////////////////////////////////////////////////////////////// -// Threshold for SEEPS p1 (Probability of being dry) - -seeps_p1_thresh = NA; - //////////////////////////////////////////////////////////////////////////////// grid_weight_flag = NONE; diff --git a/data/config/PointStatConfig_default b/data/config/PointStatConfig_default index a10c04df91..4f7caad921 100644 --- a/data/config/PointStatConfig_default +++ b/data/config/PointStatConfig_default @@ -261,6 +261,13 @@ hira = { //////////////////////////////////////////////////////////////////////////////// +// +// Threshold for SEEPS p1 (Probability of being dry) +// +seeps_p1_thresh = >=0.1&&<=0.85; + +//////////////////////////////////////////////////////////////////////////////// + // // Statistical output types // May be set separately in each "obs.field" entry @@ -290,10 +297,6 @@ output_flag = { seeps_mpr = NONE; } -//////////////////////////////////////////////////////////////////////////////// -// Threshold for SEEPS p1 (Probability of being dry) - -seeps_p1_thresh = NA; //////////////////////////////////////////////////////////////////////////////// tmp_dir = "/tmp"; diff --git a/docs/Users_Guide/config_options.rst b/docs/Users_Guide/config_options.rst index 19d60e293d..48be5c556a 100644 --- a/docs/Users_Guide/config_options.rst +++ b/docs/Users_Guide/config_options.rst @@ -1471,7 +1471,7 @@ all pairs into a single climatological bin. direct_prob = FALSE; or TRUE } -climato_data +climate_data ^^^^^^^^^^^^ When specifying climatology data for probability forecasts, either supply a @@ -1499,13 +1499,15 @@ In this way, the number of bins impacts the resolution of the climatological probabilities. These derived probability values are used to compute the climatological Brier Score and Brier Skill Score. +seeps_p1_thresh +^^^^^^^^^^^^^^^ The "seeps_p1_thresh" option controls the threshold of p1 (probability of being dry) values. +The default setting is >=0.1&&<=0.85. .. code-block:: none - - seeps_p1_thresh = >=0.1&&<=0.85; + seeps_p1_thresh = >=0.1&&<=0.85; mask_missing_flag ^^^^^^^^^^^^^^^^^ diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst index a14dabee73..30a115abc1 100644 --- a/docs/Users_Guide/release-notes.rst +++ b/docs/Users_Guide/release-notes.rst @@ -9,98 +9,30 @@ When applicable, release notes are followed by the GitHub issue number which des enhancement, or new feature (`MET GitHub issues `_). Important issues are listed **in bold** for emphasis. -MET Version 11.1.0-rc1 release notes (20230616) ------------------------------------------------ +MET Version 11.1.0 release notes (20230731) +------------------------------------------- .. dropdown:: Repository, build, and test + * Add modulefiles for supported systems to the repository (`#2415 `_). + * Add LICENSE.md to the repository (`#2461 `_). + * Update the copyright year to 2023 and increase the version number to 11.1.0 (`#2469 `_). * Enhance compile_MET_all.sh to allow the user to specify the compiler and Python versions to load (`#2485 `_). * Enhance compile_MET_all.sh to include the library/app name in the log filename (`#2540 `_). + * Add free_disk_space.sh script to the MET repository (`#2597 `_). - .. dropdown:: Documentation - - * Update the documentation for the HSS and HSS_EC statistics (`#2492 `_). - * Update the documentation for the ens, NEP, and NMEP configuration options (`#2513 `_). - - .. dropdown:: Enhancements - - .. dropdown:: Common Libraries - - * Add support for the Lambert Azimuthal Equal Area grids (`#1693 `_). - * Update the default ASCII2NC message_type_map configuration option for Little R input data (`#2487 `_). - * Merge older and newer MRMS GRIB2 table files (`#2508 `_). - * SonarQube: Further reduce findings for MET-11.1.0-rc1 (`#2521 `_). - - .. dropdown:: Application Code - - * **Enhance Gen-Vx-Mask shapefile masking to support multiple shapes and specify shape metadata** (`#1060 `_). - * **Enhance Multivariate MODE to generate object statistics for each input field requested by the user** (`#1283 `_). - * Enhance MODE to bound check interest_function corner points in the range 0 to 1 (`#2545 `_). - - .. dropdown:: Tropical Cyclone Tools - - * **Create an initial development version of a new TC-Diag tool to support the computation of tropical cyclone diagnostics** (`#2168 `_). - * **Enhance TC-Stat to write the RIRW job CTC/CTS output to a .stat output file** (`#2425 `_). - * **Enhance TC-Pairs to derive the full circle wind radius from the wind radius quadrants** (`#2532 `_). - * Enhance TC-RMW to reorder the dimensions of the NetCDF output to store the gridded dimensions last (`#2523 `_). - * Enhance TC-Gen to parse GTWO shapefile lead times from the data rather than assuming them to be 2, 5, and 7 days (`#2552 `_). - - .. dropdown:: Bugfixes - - * Bugfix: Fix the Clang compilation of MET version 11 (`#2514 `_). - * Bugfix: Fix the fill value setting used in the write_tmp_dataplane internal Python embedding script (`#2525 `_). - * Bugfix: Fix the TC-Stat RIRW runtime error when computing CTS statistics from an empty contingency table (`#2542 `_). - * Bugfix: Fix logic for Python embedding with data censoring and/or conversion (`#2575 `_). - -MET Version 11.1.0-beta2 release notes (20230505) -------------------------------------------------- - -**Note** that the 11.1.0-beta2 release was originally created on 20230423 but was recreated on 20230428 and 20230505 to include critical bugfixes. - - .. dropdown:: Documentation + .. dropdown:: Documentation + * Enhance the Release Notes by adding dropdown menus (`#2146 `_). * Improve documentation on Python Embedding for point observations (`#2303 `_). * Create dropdown menus for Appendix A (`#2460 `_). * Clarify MET Compile Time Python requirements (`#2490 `_). - - .. dropdown:: Enhancements - - * Enhance the MET point processing tools to read the Python 'point_data' variable instead of just 'met_point_data' (`#2285 `_). - * SonarQube: Further reduce bugs for MET-11.1.0-beta2 (`#2474 `_). - * SonarQube: Replace all instances of NULL with nullptr (`#2504 `_). - * SonarQube: Remove code that will never be executed (`#2506 `_). + * Update the documentation for the HSS and HSS_EC statistics (`#2492 `_). + * Update the documentation for the ens, NEP, and NMEP configuration options (`#2513 `_). + * Revise TC-Diag documentation for version 11.1.0 (`#2558 `_). .. dropdown:: Bugfixes - * Bugfix: Correct the branch name for the SonarQube scanning nightly (`#2401 `_). - * Bugfix: Fix support for the YYYYMMDD format in NetCDF level timestrings (`#2482 `_). - * Bugfix: AERONET the lat/lon is not changed with different station ID (`#2493 `_). - * Bugfix: dtype in Python embedding example script and appendixF correction (`#2518 `_). - * Bugfix: write_tmp_dataplane uses fill_value unrecognized by MET (`#2525 `_). - * **Bugfix: Resolve compilation problems due to need for \-std=c++11** (`#2531 `_). - -MET Version 11.1.0-beta1 release notes (20230228) -------------------------------------------------- - - .. dropdown:: Repository, build, and test - - * Add modulefiles for supported systems to the repository (`#2415 `_). - * Add LICENSE.md to the repository (`#2461 `_). - * Update the copyright year to 2023 and increase the version number to 11.1.0 (`#2469 `_). - - .. dropdown:: Documentation - - * Enhance the Release Notes by adding dropdown menus (`#2146 `_). - - .. dropdown:: Enhancements - - * Convert the python list to the numpy array for the python embedding at the base class (`#2386 `_). - * Refine Python runtime environment (`#2388 `_). - * Upgrade to using Python 3.10.4 (`#2421 `_). - * **Enhance TC-Pairs to disable the output of consensus track members** (`#2429 `_). - - .. dropdown:: Bugfixes - * Bugfix: Fix the MET CF-Compliant NetCDF library code to Polar Stereographic data from NSIDC Sea Ice Edge NetCDF files (`#2218 `_). * Bugfix: Remove override keyword to avoid C++11 dependency (`#2380 `_). * Bugfix: Fix ASCII2NC to not compute AOD 550 if other inputs are negative values (`#2383 `_). @@ -108,6 +40,7 @@ MET Version 11.1.0-beta1 release notes (20230228) * Bugfix: Update the MET flowchart for version 11.0.0 (`#2389 `_). * Bugfix: Fix issues with the met_compile_all.sh script and associated tar files (`#2390 `_). * Bugfix: Correct definitions of NCEP grid numbers 172 and 220 (`#2399 `_). + * Bugfix: Correct the branch name for the SonarQube scanning nightly (`#2401 `_). * Bugfix: Address MET-11.0.0 SonarQube Blocker Bugs (`#2402 `_). * Bugfix: Refine fix for handling empty configuration files (`#2408 `_). * Bugfix: Fix time interpolation of monthly climatology data between December 15 and January 15 (`#2412 `_). @@ -116,6 +49,56 @@ MET Version 11.1.0-beta1 release notes (20230228) * Bugfix: Refine the regrid dictionary's data conversion and censoring operations and fix climo time matching logic for a single monthly climo file (`#2437 `_). * Bugfix: Fix the creation of the MET User's Guide PDF (`#2449 `_). * Bugfix: Fix inconsistent ASCII2NC AIRNOW location lookup logic (`#2452 `_). + * Bugfix: Fix support for the YYYYMMDD format in NetCDF level timestrings (`#2482 `_). + * Bugfix: AERONET the lat/lon is not changed with different station ID (`#2493 `_). + * Bugfix: Fix the Clang compilation of MET version 11 (`#2514 `_). + * Bugfix: dtype in Python embedding example script and appendixF correction (`#2518 `_). + * Bugfix: Fix the fill value setting used in the write_tmp_dataplane internal Python embedding script (`#2525 `_). + * **Bugfix: Resolve compilation problems due to need for \-std=c++11** (`#2531 `_). + * Bugfix: Fix the TC-Stat RIRW runtime error when computing CTS statistics from an empty contingency table (`#2542 `_).\ + * Bugfix: Refine support for LAEA grids via NetCDF and GRIB2 files (`#2565 `_). + * Bugfix: Fix logic for Python embedding with data censoring and/or conversion (`#2575 `_). + * Bugfix: Fix reading of upside-down CF-compliant NetCDF Rotated Lat/Lon data (`#2578 `_). + * Bugfix: Unknown ld Flag on Macos causes MET compilation to fail (`#2596 `_). + * Bugfix: Problem compiling MET on MacOS using GCC 12.3.0 (`#2615 `_). + + .. dropdown:: Enhancements + + .. dropdown:: SonarQube + + * SonarQube: Further reduce bugs for MET-11.1.0-beta2 (`#2474 `_). + * SonarQube: Replace all instances of NULL with nullptr (`#2504 `_). + * SonarQube: Remove code that will never be executed (`#2506 `_). + * SonarQube: Further reduce findings for MET-11.1.0-rc1 (`#2521 `_). + + .. dropdown:: Python Embedding + + * Convert the python list to the numpy array for the python embedding at the base class (`#2386 `_). + * Refine Python runtime environment (`#2388 `_). + * **Upgrade to using Python 3.10.4** (`#2421 `_). + * **Enhance the MET point processing tools to read the Python 'point_data' variable instead of just 'met_point_data'** (`#2285 `_). + + .. dropdown:: Common Libraries + + * **Add support for the Lambert Azimuthal Equal Area grids** (`#1693 `_). + * Update the default ASCII2NC message_type_map configuration option for Little R input data (`#2487 `_). + * Merge older and newer MRMS GRIB2 table files (`#2508 `_). + + .. dropdown:: Application Code + + * **Enhance Gen-Vx-Mask shapefile masking to support multiple shapes and specify shape metadata** (`#1060 `_). + * **Enhance Multivariate MODE to generate object statistics for each input field requested by the user** (`#1283 `_). + * Update NDBC locations prior to the MET-11.1.0 release (`#2511 `_). + * Enhance MODE to bound check interest_function corner points in the range 0 to 1 (`#2545 `_). + + .. dropdown:: Tropical Cyclone Tools + + * **Create an initial development version of a new TC-Diag tool to support the computation of tropical cyclone diagnostics** (`#2168 `_). + * **Enhance TC-Stat to write the RIRW job CTC/CTS output to a .stat output file** (`#2425 `_). + * **Enhance TC-Pairs to disable the output of consensus track members** (`#2429 `_). + * Enhance TC-RMW to reorder the dimensions of the NetCDF output to store the gridded dimensions last (`#2523 `_). + * **Enhance TC-Pairs to derive the full circle wind radius from the wind radius quadrants** (`#2532 `_). + * Enhance TC-Gen to parse GTWO shapefile lead times from the data rather than assuming them to be 2, 5, and 7 days (`#2552 `_). MET Version 11.0.0 release notes (20221209) ------------------------------------------- @@ -256,6 +239,14 @@ MET Version 11.1.0 upgrade instructions * If running TC-Pairs to generate consensus tracks, update your TC-Pairs configuration file to include the new **write_members** option (`#2429 `_). +* If using Python embedding for point observations, and the following lines of code are in your Python script please remove them and refactor your Python script following the instructions in the `User's Guide for Python embedding for point observations `_: + + .. code-block:: Python + + from met_point_obs import convert_point_data + ... + met_point_data = convert_point_data(point_data) + MET Version 11.0.0 upgrade instructions --------------------------------------- diff --git a/docs/Users_Guide/tc-diag.rst b/docs/Users_Guide/tc-diag.rst index 6061fdcf1c..53c1ee1b0d 100644 --- a/docs/Users_Guide/tc-diag.rst +++ b/docs/Users_Guide/tc-diag.rst @@ -7,7 +7,7 @@ TC-Diag Tool Introduction ============ -.. note:: As of MET version 11.1.0, the TC-Diag tool is still in development. Each time it is run, the warning message listed below is printed. +.. note:: As of MET version 11.1.0, the TC-Diag tool is a beta release that lacks full functionality. The current version of the tool generates intermediate NetCDF output files of the input model’s data transformed onto an azimuth-range grid. When the full functionality of the tc_diag tool is released in MET v12.0.0, the tool will also output environmental diagnostics computed from callable Python scripts. For now, each time it is run, the warning message listed below is printed. .. code-block:: none @@ -18,13 +18,13 @@ Introduction A diagnosis of the large-scale environment of tropical cyclones (TCs) is foundational for many prediction techniques, including statistical-dynamical forecast aids and techniques based on artificial intelligence. Such diagnostics can also be used by forecasters seeking to understand how a given model's forecast will pan out. Finally, TC diagnostics can be useful in verification to stratify the performance of models in different environmental regimes over a longer period of time, thereby providing useful insights on model biases or deficiencies for model developers and forecasters. -Originally developed for the Statistical Hurricane Intensity Prediction Scheme (SHIPS), and later as a stand-alone package called 'Model Diagnostics', by the Cooperative Institute for Research in the Atmosphere (CIRA), MET now integrates these capabilities into the an extensible framework called the TC-Diag tool. This tool allows users compute diagnostics for the large-scale environment of TCs using ATCF track and gridded model data inputs. Importantly, the tool computes diagnostics along one or more user-specified tracks. The current version of the TC-Diag tool requires that the tracks and fields be self-consistent [i.e., the track should be the model's (or ensemble's) own predicted track(s)]. The reason is that the diagnostics are computed in a coordinate system centered on the model's moving model storm and the current version of the tool does not yet include vortex removal. If the track is not consistent with the underlying fields, the diagnostics output are unlikely to be useful because the model's simulated storm would contaminate the diagnostics calculations. +Originally developed for the Statistical Hurricane Intensity Prediction Scheme (SHIPS), and later as a stand-alone package called 'Model Diagnostics', by the Cooperative Institute for Research in the Atmosphere (CIRA), MET now integrates these capabilities into the an extensible framework called the TC-Diag tool. This tool allows users to compute diagnostics for the large-scale environment of TCs using ATCF track and gridded model data inputs. The current version of the TC-Diag tool requires that the tracks and fields be self-consistent [i.e., the track should be the model's (or ensemble's) own predicted track(s)]. The reason is that the diagnostics are computed in a coordinate system centered on the model's moving model storm and the current version of the tool does not yet include vortex removal. If the track is not consistent with the underlying fields, the diagnostics output are unlikely to be useful because the model's simulated storm would contaminate the diagnostics calculations. .. note:: A future version of the tool will include the capability to remove the model's own vortex, which will allow the user to specify any arbitrary track (such as the operational center's official forecast). Until then, users are advised that the track selected must be consistent with the model's predicted track. -TC-Diag is run once for each initialization time. The user provides track data (such as one or more ATCF a-deck track files), along with track filtering criteria as needed, to select one or more tracks to be processed. The user also provides gridded model data from which diagnostics should be computed. Gridded data can be provided for multiple concurrent storms, multiple models, and/or multiple domains (i.e. parent and nest) in a single run. +TC-Diag is run once for each initialization time to produce diagnostics for each user-specified combination of TC tracks and model fields. The user provides track data (such as one or more ATCF a-deck track files), along with track filtering criteria as needed, to select one or more tracks to be processed. The user also provides gridded model data from which diagnostics should be computed. Gridded data can be provided for multiple concurrent storms, multiple models, and/or multiple domains (i.e. parent and nest) in a single run. -TC-Diag first determines the list of valid times that appear in any one of the tracks. For each valid time, it processes all track points for that time. For each track point, it reads the gridded model fields requested in the configuration file and transforms the gridded data to a range-azimuth cyclindrical coordinates grid. For each domain, it writes the range-azimuth data to a temporary NetCDF file. +TC-Diag first determines the list of valid times that appear in any one of the tracks. For each valid time, it processes all track points for that time. For each track point, it reads the gridded model fields requested in the configuration file and transforms the gridded data to a range-azimuth cylindrical coordinates grid. For each domain, it writes the range-azimuth data to a temporary NetCDF file. .. note:: The current version of the tool does not yet include the capabilities described in the next three paragraphs. These additional capabilities are planned to be added in the MET v12.0.0 release later in 2023. @@ -130,7 +130,7 @@ The **n_azimuth** entry is an integer specifying the number of equally spaced az The **delta_range_km** entry is a floating point value specifying the spacing of the range rings in kilometers. -The **diag_script** entry is an array of strings. Each string specifies the path to a Python script to be executed to compute diagnostics from the transformed cyclindrical coordinates data for this domain. While the **diag_script** entry can be specified separately for each **domain_info** array entry, specifying it once at a higher level of context, as seen above, allows the same setting to be applied to all array entries. When multiple Python diagnostics scripts are run, the union of the diagnostics computed are written to the output. +The **diag_script** entry is an array of strings. Each string specifies the path to a Python script to be executed to compute diagnostics from the transformed cylindrical coordinates data for this domain. While the **diag_script** entry can be specified separately for each **domain_info** array entry, specifying it once at a higher level of context, as seen above, allows the same setting to be applied to all array entries. When multiple Python diagnostics scripts are run, the union of the diagnostics computed are written to the output. .. note:: As of MET version 11.1.0, no tropical cyclone diagnostics are actually computed or written to the output. @@ -143,7 +143,7 @@ Configuring data censoring and conversion options censor_val = []; convert(x) = x; -These data censoring and conversion options are common to multiple MET tools and are described in :numref:`config_options`. They can be specified separately in each **data.field** array entry, described below. If provided, those operations are performed after reading the gridded data but prior to conveting to the cylindrical coordinate range-azimuth grid. +These data censoring and conversion options are common to multiple MET tools and are described in :numref:`config_options`. They can be specified separately in each **data.field** array entry, described below. If provided, those operations are performed after reading the gridded data but prior to converting to the cylindrical coordinate range-azimuth grid. Configuring fields, levels, and domains ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -200,7 +200,7 @@ Configuring vortex removal option vortex_removel = FALSE; -These **vortex_removal** flag entry is a boolean specifying whether or not vortex removal logic should be applied. +The **vortex_removal** flag entry is a boolean specifying whether or not vortex removal logic should be applied. .. note:: As of MET version 11.1.0, vortex removal logic is not yet supported. diff --git a/docs/conf.py b/docs/conf.py index 2ce8140943..c3f0ca37c1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,11 +20,11 @@ project = 'MET' author = 'UCAR/NCAR, NOAA, CSU/CIRA, and CU/CIRES' author_list = 'Jensen, T., J. Prestopnik, H. Soh, L. Goodrich, B. Brown, R. Bullock, J. Halley Gotway, K. Newman, J. Opatz' -version = '11.1.0-rc1' +version = '11.1.0' verinfo = version release = f'{version}' release_year = '2023' -release_date = f'{release_year}-06-16' +release_date = f'{release_year}-07-31' copyright = f'{release_year}, {author}' # -- General configuration --------------------------------------------------- diff --git a/internal/test_unit/xml/unit_plot_tc.xml b/internal/test_unit/xml/unit_plot_tc.xml index d67ade00f0..03b772f253 100644 --- a/internal/test_unit/xml/unit_plot_tc.xml +++ b/internal/test_unit/xml/unit_plot_tc.xml @@ -23,13 +23,15 @@ -lookin &OUTPUT_DIR;/tc_pairs/alal2010.tcst \ -filter '-amodel AHWI,BCLP' \ -outdir &OUTPUT_DIR;/plot_tc \ - -dep 'TK_ERR,ABS(AMAX_WIND-BMAX_WIND)' + -dep 'TK_ERR,ABS(AMAX_WIND-BMAX_WIND)' \ + -save_data &OUTPUT_DIR;/plot_tc/plot_tc_TCMPR_data.tcst - &OUTPUT_DIR;/plot_tc/ABS_AMAX_WIND-BMAX_WIND_boxplot.png - &OUTPUT_DIR;/plot_tc/ABS_AMAX_WIND-BMAX_WIND_boxplot.log - &OUTPUT_DIR;/plot_tc/TK_ERR_boxplot.png - &OUTPUT_DIR;/plot_tc/TK_ERR_boxplot.log + &OUTPUT_DIR;/plot_tc/ABS_AMAX_WIND-BMAX_WIND_boxplot.png + &OUTPUT_DIR;/plot_tc/ABS_AMAX_WIND-BMAX_WIND_boxplot.log + &OUTPUT_DIR;/plot_tc/TK_ERR_boxplot.png + &OUTPUT_DIR;/plot_tc/TK_ERR_boxplot.log + &OUTPUT_DIR;/plot_tc/plot_tc_TCMPR_data.tcst diff --git a/src/basic/vx_log/concat_string.h b/src/basic/vx_log/concat_string.h index e26c30d9a8..c5d6e0f8c3 100644 --- a/src/basic/vx_log/concat_string.h +++ b/src/basic/vx_log/concat_string.h @@ -146,7 +146,7 @@ class ConcatString { void chomp(const char *); // removes trailing suffix, if possible - operator const std::string() const; + operator std::string() const; bool startswith(const char *) const; bool endswith(const char *) const; @@ -205,7 +205,7 @@ inline const char * ConcatString::float_format() const { return FloatFormat; } inline bool ConcatString::empty() const { return ( s ? s->empty() : true ); } inline bool ConcatString::nonempty() const { return ( s ? !s->empty() : false ); } -inline ConcatString::operator const std::string () const { return ( s ? *s : nullptr ); } +inline ConcatString::operator std::string () const { return ( s ? *s : nullptr ); } ////////////////////////////////////////////////////////////////////////