Merge pull request #221 from OpenWaterAnalytics/master

update dev

Author: Mariosmsk

CITATION.md

@@ -0,0 +1,15 @@
+## If you use this software, please cite it as below.
+
+D.G. Eliades, M. Kyriakou, S. Vrachimis and M.M. Polycarpou, "EPANET-MATLAB Toolkit: An Open-Source Software for Interfacing EPANET with MATLAB", in *Proc. 14th International Conference on Computing and Control for the Water Industry (CCWI)*, The Netherlands, Nov 2016, p.8. (doi:10.5281/zenodo.831493)
+
+```
+@INPROCEEDINGS{Eliades2016,
+author={Eliades, Demetrios G. and Kyriakou, Marios and Vrachimis, Stelios and Polycarpou, Marios M.},
+title={EPANET-MATLAB Toolkit: An Open-Source Software for Interfacing EPANET with MATLAB},
+booktitle={Proc. 14th International Conference on Computing and Control for the Water Industry (CCWI)},
+year={2016},
+pages={8},
+address = {The Netherlands},
+month={Nov},
+DOI={10.5281/zenodo.831493}}
+```

README.md

@@ -212,6 +212,7 @@ The `EPANET-Matlab Toolkit` is based/inspired on the [EPANET-Matlab Toolkit](htt
 |getLinkVelocity|Current computed flow velocity (read only)|
 |getLinkVertices|Retrieves the coordinate's of a vertex point assigned to a link.|
 |getLinkVerticesCount|Retrieves the number of internal vertex points assigned to a link|
+|getLinkVolumes|Get link volumes|
 |getLinkWallReactionCoeff|Pipe wall chemical reaction coefficient|
 |getNodeActualDemand|Retrieves the computed value of all actual demands|
 |getNodeActualDemandSensingNodes|Retrieves the computed demand values at some sensing nodes|

epanet_matlab_toolkit/epanet.m

@@ -390,7 +390,7 @@
 
     end
     properties (Constant = true)
-        classversion='v2.2.2 - Last Update: 07/08/2022';
+        classversion='v2.2.3 - Last Update: 19/09/2022';
 
         LOGOP={'IF', 'AND', 'OR'} % Constants for rule-based controls: 'IF', 'AND', 'OR' % EPANET Version 2.2
         RULEOBJECT={'NODE', 'LINK', 'SYSTEM'}; % Constants for rule-based controls: 'NODE', 'LINK', 'SYSTEM' % EPANET Version 2.2
@@ -8603,6 +8603,7 @@ function setCurveValue(obj, index, curvePnt, value)
             Fmean = mean(obj.getComputedTimeSeries.Flow,1); % ignores events also you can use getComputedHydraulicTimeSeries
 
             Fsign = sign(Fmean);
+            A = zeros(obj.getNodeCount);
             Nidx = obj.getLinkNodesIndex;
             for i = 1:size(Nidx,1)
                 if Fsign(i) == 1
@@ -8612,6 +8613,18 @@ function setCurveValue(obj, index, curvePnt, value)
                 end
             end
         end
+        function V = getLinkVolumes(obj)
+            % Get link volumes
+            % Link volume = pi * (diameter/2).^2 * length
+            L = obg.getLinkLength;
+            D = obj.getLinkDiameter;
+            if obj.Units_SI_Metric
+                unt = 100;
+            else
+                unt = 328.08399;
+            end
+            V = pi*((D/unt).^2/4).*L; 
+        end
         function valueIndex = addCurve(obj, varargin)
             % Adds a new curve appended to the end of the existing curves. (EPANET Version 2.1)
             % Returns the new curve's index.