JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Allow API to get/set type of status report

Browse Source 
The existing EN_setstatusreport function only allows one to set the level of status reporting and not retrieve this value. A new EN_STATUS_REPORT constant was added, to be used with EN_setoption and EN_getoption, to provide read/write access to the level of status reporting.
This commit is contained in:
Lew Rossman
2023-07-19 09:15:25 -04:00
parent 2825f96120
commit 353ba4eb34
8 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/epanet2.bas
View File

@@ -5,7 +5,7 @@ Attribute VB_Name = "Module1"
'Declarations of functions in the EPANET PROGRAMMERs TOOLKIT
'(EPANET2.DLL)
'Last updated on 05/13/2023
'Last updated on 07/18/2023
' These are codes used by the DLL functions
Public Const EN_ELEVATION = 0 ' Node parameters
@@ -188,6 +188,7 @@ Public Const EN_CONCENLIMIT = 22
Public Const EN_DEMANDPATTERN = 23
Public Const EN_EMITBACKFLOW = 24
Public Const EN_PRESS_UNITS = 25
Public Const EN_STATUS_REPORT = 26
Public Const EN_LOWLEVEL = 0 ' Control types
Public Const EN_HILEVEL = 1

3
include/epanet2.cs
View File

@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
//epanet2.cs[By Oscar Vegas]
//Last updated on 05/13/2023
//Last updated on 07/18/2023
//Declarations of functions in the EPANET PROGRAMMERs TOOLKIT
//(EPANET2.DLL) for use with C#
@@ -192,6 +192,7 @@ namespace EpanetCSharpLibrary
public const int EN_DEMANDPATTERN = 23;
public const int EN_EMITBACKFLOW = 24;
public const int EN_PRESS_UNITS = 25;
public const int EN_STATUS_REPORT = 26;
public const int EN_LOWLEVEL = 0; //Control types
public const int EN_HILEVEL = 1;

2
include/epanet2.pas
View File

@@ -191,6 +191,8 @@ const
EN_CONCENLIMIT = 22;
EN_DEMANDPATTERN = 23;
EN_EMITBACKFLOW = 24;
EN_PRESS_UNITS = 25;
EN_STATUS_REPORT = 26;
EN_LOWLEVEL = 0; { Control types }
EN_HILEVEL = 1;

3
include/epanet2.vb
View File

@@ -4,7 +4,7 @@
'Declarations of functions in the EPANET PROGRAMMERs TOOLKIT
'(EPANET2.DLL) for use with VB.Net.
'Last updated on 05/13/2023
'Last updated on 07/18/2023
Imports System.Runtime.InteropServices
Imports System.Text
@@ -183,6 +183,7 @@ Public Const EN_CONCENLIMIT = 22
Public Const EN_DEMANDPATTERN = 23
Public Const EN_EMITBACKFLOW = 24
Public Const EN_PRESS_UNITS = 25
Public Const EN_STATUS_REPORT = 26
Public Const EN_LOWLEVEL = 0 ' Control types
Public Const EN_HILEVEL = 1

10
include/epanet2_enums.h
View File

@@ -3,13 +3,13 @@
/*
******************************************************************************
Project: OWA EPANET
Version: 2.2
Version: 2.3
Module: epanet2_enums.h
Description: enumerations of symbolic constants used by the API functions
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 04/28/2023
Last Updated: 07/17/2023
******************************************************************************
*/
@@ -352,7 +352,8 @@ typedef enum {
EN_CONCENLIMIT = 22, //!< Limiting concentration for growth reactions
EN_DEMANDPATTERN = 23, //!< Name of default demand pattern
EN_EMITBACKFLOW = 24, //!< 1 if emitters can backflow, 0 if not
EN_PRESS_UNITS = 25 //!< Pressure units (see @ref EN_PressUnits)
EN_PRESS_UNITS = 25, //!< Pressure units (see @ref EN_PressUnits)
EN_STATUS_REPORT = 26 //!< Type of status report to produce (see @ref EN_StatusReport)
} EN_Option;
/// Simple control types
@@ -446,7 +447,8 @@ typedef enum {
/// Status reporting levels
/**
These choices specify the level of status reporting written to a project's report
file during a hydraulic analysis. The level is set using the @ref EN_setstatusreport function.
file during a hydraulic analysis. The level is set using the @ref EN_setstatusreport
or the @ref EN_setoption functions.
*/
typedef enum {
EN_NO_REPORT = 0, //!< No status reporting