Skip to content

Commit 384ed3f

Browse files
committed
update OWA SWMM to v5.2.3
- add inlet api functions - set release version
1 parent 1199894 commit 384ed3f

File tree

10 files changed

+652
-5
lines changed

10 files changed

+652
-5
lines changed

swmm-toolkit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cmake_minimum_required (VERSION 3.17)
1515

1616
project(swmm-toolkit
1717
VERSION
18-
0.13.0
18+
0.14.0
1919
)
2020

2121

swmm-toolkit/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def exclude_files(cmake_manifest):
8888

8989
setup(
9090
name = "swmm-toolkit",
91-
version = "0.13.0",
91+
version = "0.14.0",
9292

9393
packages = ["swmm_toolkit", "swmm.toolkit"],
9494
package_dir = package_dir,

swmm-toolkit/src/swmm/toolkit/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
__credits__ = "Colleen Barr, Sam Hatchett"
2020
__license__ = "CC0 1.0 Universal"
2121

22-
__version__ = "0.13.0"
22+
__version__ = "0.14.0"
2323
__date__ = "June 7, 2021"
2424

2525
__maintainer__ = "Michael Tryby"

swmm-toolkit/src/swmm/toolkit/shared_enum.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,3 +739,17 @@ class RainResult(Enum):
739739
TOTAL = 0
740740
RAINFALL = 1
741741
SNOWFALL = 2
742+
743+
class InletProperty(Enum):
744+
NUM_INLETS = 0
745+
CLOG_FACTOR = 1
746+
FLOW_LIMIT = 2
747+
DEPRESSION_HEIGHT = 3
748+
DEPRESSION_WIDTH = 4
749+
750+
751+
class InletResult(Enum):
752+
FLOW_FACTOR = 0
753+
FLOW_CAPTURE = 1
754+
BACK_FLOW = 2
755+
BLACK_FLOW_RATIO = 3

swmm-toolkit/src/swmm/toolkit/solver.i

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@
158158
SM_LidLayerProperty,
159159
SM_LidUProperty,
160160
SM_LidUOptions,
161-
SM_LidResult
161+
SM_LidResult,
162+
SM_InletProperty,
163+
SM_InletResult
162164
}
163165

164166

swmm-toolkit/src/swmm/toolkit/solver_docs.i

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,3 +1293,57 @@ total_precip: double
12931293
The new total precipitation intensity.
12941294
"
12951295
) swmm_setGagePrecip;
1296+
1297+
1298+
%feature("autodoc",
1299+
"Get a property value for the inlet of a specified link.
1300+
1301+
Parameters
1302+
----------
1303+
index: int
1304+
The index of a link with desired inlets
1305+
param: SM_InletProperty
1306+
The property type code (See :ref: SM_InletProperty)
1307+
1308+
Returns
1309+
-------
1310+
value: double *
1311+
The value of the inlet's property
1312+
"
1313+
) swmm_getInletParam;
1314+
1315+
1316+
%feature("autodoc",
1317+
"Get a property value for the inlet of a specified link.
1318+
1319+
Parameters
1320+
----------
1321+
index: int
1322+
The index of a link with desired inlets
1323+
param: SM_InletProperty
1324+
The property type code (See :ref: SM_InletProperty)
1325+
1326+
Returns
1327+
-------
1328+
value: double *
1329+
The new value of the inlet's property
1330+
"
1331+
) swmm_setInletParam;
1332+
1333+
1334+
%feature("autodoc",
1335+
"Get a result value for specified link.
1336+
1337+
Parameters
1338+
----------
1339+
index: int
1340+
The index of a link with desired inlets
1341+
type: SM_InletResult
1342+
The result type code (See :ref: SM_InletResult)
1343+
1344+
Returns
1345+
-------
1346+
result: double *
1347+
The value of the inlet's result at the current simulation timestep
1348+
"
1349+
) swmm_getInletResult;

swmm-toolkit/src/swmm/toolkit/solver_rename.i

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
%rename(link_set_target_setting) swmm_setLinkSetting;
6969
%rename(link_get_stats) swmm_getLinkStats;
7070

71+
%rename(inlet_get_parameter) swmm_getInletParam;
72+
%rename(inlet_set_parameter) swmm_setInletParam;
73+
%rename(inlet_get_result) swmm_getInletResult;
7174

7275
%rename(pump_get_stats) swmm_getPumpStats;
7376

swmm-toolkit/swmm-solver

0 commit comments

Comments
 (0)