From 9637f5c092cc5cddc7e15e2201805e3b6d5939aa Mon Sep 17 00:00:00 2001 From: Abel Heinsbroek Date: Wed, 24 Apr 2024 15:20:59 +0200 Subject: [PATCH] change names of new functions to ENgetnodevalues and ENgetlinkvalues --- include/epanet2.h | 2 +- include/epanet2_2.h | 4 ++-- src/epanet.c | 4 ++-- src/epanet2.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/epanet2.h b/include/epanet2.h index c9fe5f83..18a7345f 100644 --- a/include/epanet2.h +++ b/include/epanet2.h @@ -293,7 +293,7 @@ extern "C" { int DLLEXPORT ENgetlinkvalue(int index, int property, EN_API_FLOAT_TYPE *value); - int DLLEXPORT ENgetlinksvalues(int property, EN_API_FLOAT_TYPE *value); + int DLLEXPORT ENgetlinkvalues(int property, EN_API_FLOAT_TYPE *value); int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value); diff --git a/include/epanet2_2.h b/include/epanet2_2.h index 01082e7d..1094280d 100644 --- a/include/epanet2_2.h +++ b/include/epanet2_2.h @@ -882,7 +882,7 @@ typedef struct Project *EN_Project; (see @ref Units). */ - int DLLEXPORT EN_getnodesvalues(EN_Project ph, int property, double *out_values); + int DLLEXPORT EN_getnodevalues(EN_Project ph, int property, double *out_values); /** @brief Retrieves an array of property values for all nodes. @@ -1265,7 +1265,7 @@ typedef struct Project *EN_Project; Values are returned in units that depend on the units used for flow rate (see @ref Units). */ - int DLLEXPORT EN_getlinksvalues(EN_Project ph, int property, double *out_values); + int DLLEXPORT EN_getlinkvalues(EN_Project ph, int property, double *out_values); /** @brief Sets a property value for a link. diff --git a/src/epanet.c b/src/epanet.c index 45170f93..8844cd54 100644 --- a/src/epanet.c +++ b/src/epanet.c @@ -2358,7 +2358,7 @@ int DLLEXPORT EN_getnodevalue(EN_Project p, int index, int property, double *val return 0; } -int DLLEXPORT EN_getnodesvalues(EN_Project p, int property, double *values) +int DLLEXPORT EN_getnodevalues(EN_Project p, int property, double *values) /*---------------------------------------------------------------- ** Input: property = node property code (see EN_NodeProperty) ** Output: values = array of node property values @@ -3923,7 +3923,7 @@ int DLLEXPORT EN_getlinkvalue(EN_Project p, int index, int property, double *val return 0; } -int DLLEXPORT EN_getlinksvalues(EN_Project p, int property, double *values) +int DLLEXPORT EN_getlinkvalues(EN_Project p, int property, double *values) /*---------------------------------------------------------------- ** Input: property = link property code (see EN_LinkProperty) ** Output: values = array of link property values diff --git a/src/epanet2.c b/src/epanet2.c index 63b2217a..82e74905 100644 --- a/src/epanet2.c +++ b/src/epanet2.c @@ -355,9 +355,9 @@ int DLLEXPORT ENgetnodevalue(int index, int property, EN_API_FLOAT_TYPE *value) return errcode; } -int DLLEXPORT ENgetnodesvalues(int property, EN_API_FLOAT_TYPE *values) +int DLLEXPORT ENgetnodevalues(int property, EN_API_FLOAT_TYPE *values) { - return EN_getnodesvalues(_defaultProject, property, values); + return EN_getnodevalues(_defaultProject, property, values); } int DLLEXPORT ENsetnodevalue(int index, int property, EN_API_FLOAT_TYPE value) @@ -528,9 +528,9 @@ int DLLEXPORT ENgetlinkvalue(int index, int property, EN_API_FLOAT_TYPE *value) *value = (EN_API_FLOAT_TYPE)v; return errcode; } -int DLLEXPORT ENgetlinksvalues(int property, EN_API_FLOAT_TYPE *values) +int DLLEXPORT ENgetlinkvalues(int property, EN_API_FLOAT_TYPE *values) { - return EN_getlinksvalues(_defaultProject, property, values); + return EN_getlinkvalues(_defaultProject, property, values); } int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value)