From c6ab471b5bddb9d70aee4dd5aa42ce277f6819c5 Mon Sep 17 00:00:00 2001 From: lbutler Date: Tue, 9 Jan 2024 14:14:19 -0500 Subject: [PATCH 1/2] Update release notes and remove depreciated constants --- ReleaseNotes2_3.md | 5 ++++- src/text.h | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes2_3.md b/ReleaseNotes2_3.md index f35ad3c..86afb52 100644 --- a/ReleaseNotes2_3.md +++ b/ReleaseNotes2_3.md @@ -48,4 +48,7 @@ This document describes the changes and updates that have been made in version 2 - `EN_STATUS_REPORT` can now be used with `EN_getoption` and `EN_setoption` to get or set the type of status report that EPANET will generate (`EN_NO_REPORT`, `EN_NORMAL_REPORT` or `EN_FULL_REPORT`). - A possible parser error that could result in a Trace Node ID in an input file not being recognized was fixed. - Additional API functions for enabling/disabling controls and rules were added (`EN_getcontrolenabled`, `EN_setcontrolenabled`, `EN_getruleenabled`, `EN_setruleenabled`). - - Updated the internal function `getclosedlink` in report.c to use a loop instead of recursion to prevent a stack overflow during the analysis of very large disconnections. \ No newline at end of file + - Updated the internal function `getclosedlink` in report.c to use a loop instead of recursion to prevent a stack overflow during the analysis of very large disconnections. +- Setting the demand multiplier within the `[DEMANDS]` section of INP has been depreciated, please use `DEMAND MULTIPLIER` inside `[OPTIONS]` instead. +- `EN_PRESS_UNITS` can now be used with `EN_getoption` and `EN_setoption` to get or set the pressure unit used in EPANET. +- Continuous barrier functions were added to constrain emitter flows to allowable values. diff --git a/src/text.h b/src/text.h index f65414e..3f3b50a 100755 --- a/src/text.h +++ b/src/text.h @@ -52,9 +52,6 @@ #define w_IS "IS" #define w_NOT "NOT" -#define w_ADD "ADD" -#define w_MULTIPLY "MULT" - #define w_LIMITING "LIMIT" #define w_ORDER "ORDER" #define w_GLOBAL "GLOB" From 6c2bf2f48af45c019411464885b002e4158ab8c3 Mon Sep 17 00:00:00 2001 From: lbutler Date: Tue, 9 Jan 2024 14:22:34 -0500 Subject: [PATCH 2/2] Add en_openx to release notes --- ReleaseNotes2_3.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ReleaseNotes2_3.md b/ReleaseNotes2_3.md index 86afb52..67680a8 100644 --- a/ReleaseNotes2_3.md +++ b/ReleaseNotes2_3.md @@ -52,3 +52,4 @@ This document describes the changes and updates that have been made in version 2 - Setting the demand multiplier within the `[DEMANDS]` section of INP has been depreciated, please use `DEMAND MULTIPLIER` inside `[OPTIONS]` instead. - `EN_PRESS_UNITS` can now be used with `EN_getoption` and `EN_setoption` to get or set the pressure unit used in EPANET. - Continuous barrier functions were added to constrain emitter flows to allowable values. +- The `EN_openx` function has been added to enable the opening of input files with formatting errors through the API. This allows users to continue using toolkit functions even when such errors are present.