EPyT: Add new EPANET functions

Author: andreArtelt

epanet_plus/epanet_wrapper.py

@@ -857,6 +857,20 @@ def setnodevalue(self, index: int, node_property: int, value: float):
             return self._process_result(epanet.EN_setnodevalue(self._ph, index, node_property,
                                                                value))
 
+    def setnodevaluse(self, node_property: int, values: list[float]):
+        """
+        EN_setnodevalues
+
+        Parameters
+        ----------
+        node_property : `int`
+        values : `list[float]`
+        """
+        if self._use_project is False:
+            return self._process_result(epanet.ENsetnodevalues(node_property, values))
+        else:
+            return self._process_result(epanet.EN_setnodevalues(self._ph, node_property, values))
+
     def setjuncdata(self, index: int, elev: float, dmnd: float, dmnd_pat: str):
         """
         EN_setjuncdata

python-extension/pyepanet.c

@@ -1021,6 +1021,34 @@ PyObject* method_EN_setnodevalue(PyObject* self, PyObject* args)
     return r;
 }
 
+PyObject* method_EN_setnodevalues(PyObject* self, PyObject* args)
+{
+    uintptr_t ptr;
+    int property;
+    PyObject* values = NULL;
+    if(!PyArg_ParseTuple(args, "KiO", &ptr, &property, &values)) {
+        return NULL;
+    }
+    EN_Project ph = (EN_Project) ptr;
+
+    int count = PyList_GET_SIZE(values);
+    double* rawValues = (double*) malloc(sizeof(double) * count); 
+    for(int i=0; i != count; i++) {
+        rawValues[i] = PyFloat_AsDouble(PyList_GET_ITEM(values, i));
+    }
+
+    int badIndex;
+    PyObject* err = PyLong_FromLong(EN_setnodevalues(ph, property, rawValues, &badIndex));
+    PyObject* pyBadIndex = PyLong_FromLong(badIndex);
+    free(rawValues);
+
+    PyObject* r = PyTuple_Pack(1, err, pyBadIndex);
+    Py_DECREF(err);
+    Py_DECREF(pyBadIndex);
+
+    return r;
+}
+
 PyObject* method_EN_setjuncdata(PyObject* self, PyObject* args)
 {
     uintptr_t ptr;

python-extension/pyepanet.h

@@ -57,6 +57,7 @@ PyObject* method_EN_setnodeid(PyObject* self, PyObject* args);
 PyObject* method_EN_getnodetype(PyObject* self, PyObject* args);
 PyObject* method_EN_getnodevalue(PyObject* self, PyObject* args);
 PyObject* method_EN_setnodevalue(PyObject* self, PyObject* args);
+PyObject* method_EN_setnodevalues(PyObject* self, PyObject* args);
 PyObject* method_EN_setjuncdata(PyObject* self, PyObject* args);
 PyObject* method_EN_settankdata(PyObject* self, PyObject* args);
 PyObject* method_EN_getcoord(PyObject* self, PyObject* args);

python-extension/pyepanet2.c

@@ -1833,6 +1833,33 @@ PyObject* method_ENsetnodevalue(PyObject* self, PyObject* args)
     return r;
 }
 
+PyObject* method_ENsetnodevalues(PyObject* self, PyObject* args)
+{
+    int property;
+    PyObject* values = NULL;
+
+    if(!PyArg_ParseTuple(args, "iO", &property, &values)) {
+        return NULL;
+    }
+
+    int count = PyList_GET_SIZE(values);
+    float* rawValues = (float*) malloc(sizeof(float) * count);
+    for(int i=0; i != count; i++) {
+        rawValues[i] = PyFloat_AsDouble(PyList_GET_ITEM(values, i));
+    }
+
+    int badIndex;
+    PyObject* err = PyLong_FromLong(ENsetnodevalues(property, rawValues, &badIndex));
+    PyObject* pyBadIndex = PyLong_FromLong(badIndex);
+    free(rawValues);
+
+    PyObject* r = PyTuple_Pack(1, err, pyBadIndex);
+    Py_DECREF(err);
+    Py_DECREF(pyBadIndex);
+
+    return r;
+}
+
 PyObject* method_ENsetoption(PyObject* self, PyObject* args)
 {
     int option;

python-extension/pyepanet2.h

@@ -105,6 +105,7 @@ PyObject* method_ENsetlinktype(PyObject* self, PyObject* args);
 PyObject* method_ENsetlinkvalue(PyObject* self, PyObject* args);
 PyObject* method_ENsetnodeid(PyObject* self, PyObject* args);
 PyObject* method_ENsetnodevalue(PyObject* self, PyObject* args);
+PyObject* method_ENsetnodevalues(PyObject* self, PyObject* args);
 PyObject* method_ENsetoption(PyObject* self, PyObject* args);
 PyObject* method_ENsetpattern(PyObject* self, PyObject* args);
 PyObject* method_ENsetpatternid(PyObject* self, PyObject* args);