Adding tests for pressure dependent demands, rearranging

OpenWaterAnalytics · Aug 24, 2018 · 18dc2cc · 18dc2cc · eladsal · Aug 24, 2018
1 parent 9f768d3
commit 18dc2cc
Show file tree

Hide file tree

Showing 6 changed files with 159 additions and 0 deletions.
diff --git a/epanet-tests/network_one/NET1emit.inp → epanet-tests/press_depend/NET1emit.inp b/epanet-tests/network_one/NET1emit.inp → epanet-tests/press_depend/NET1emit.inp
diff --git a/epanet-tests/network_one/NET1emit.json → epanet-tests/press_depend/NET1emit.json b/epanet-tests/network_one/NET1emit.json → epanet-tests/press_depend/NET1emit.json
diff --git a/epanet-tests/network_one/NET1negemit.inp → epanet-tests/press_depend/NET1negemit.inp b/epanet-tests/network_one/NET1negemit.inp → epanet-tests/press_depend/NET1negemit.inp
diff --git a/epanet-tests/network_one/NET1negemit.json → epanet-tests/press_depend/NET1negemit.json b/epanet-tests/network_one/NET1negemit.json → epanet-tests/press_depend/NET1negemit.json
diff --git a/epanet-tests/press_depend/cheung.inp b/epanet-tests/press_depend/cheung.inp
@@ -0,0 +1,142 @@
+[TITLE]
+PDD Example from Cheung, et al. 2005.
+
+[JUNCTIONS]
+;ID              	Elev        	Demand      	Pattern         
+ 2               	90          	33.3        	                	;
+ 3               	88          	33.4        	                	;
+ 4               	90          	50.0        	                	;
+ 5               	85          	66.7        	                	;
+
+[RESERVOIRS]
+;ID              	Head        	Pattern         
+ 1               	100          	                	;
+
+[TANKS]
+;ID              	Elevation   	InitLevel   	MinLevel    	MaxLevel    	Diameter    	MinVol      	VolCurve
+
+[PIPES]
+;ID              	Node1           	Node2           	Length      	Diameter    	Roughness   	MinorLoss   	Status
+ 1               	1               	2               	1000        	400         	130         	0           	Open  	;
+ 2               	2               	3               	1000        	350         	130         	0           	Open  	;
+ 3               	3               	4               	1000        	300         	130         	0           	Open  	;
+ 4               	4               	5               	1000        	300         	130         	0           	Open  	;
+
+[PUMPS]
+;ID              	Node1           	Node2           	Parameters
+
+[VALVES]
+;ID              	Node1           	Node2           	Diameter    	Type	Setting     	MinorLoss   
+
+[TAGS]
+
+[DEMANDS]
+;Junction        	Demand      	Pattern         	Category
+
+[STATUS]
+;ID              	Status/Setting
+
+[PATTERNS]
+;ID              	Multipliers
+
+[CURVES]
+;ID              	X-Value     	Y-Value
+
+[CONTROLS]
+
+[RULES]
+
+[ENERGY]
+ Global Efficiency  	75
+ Global Price       	0
+ Demand Charge      	0
+
+[EMITTERS]
+;Junction        	Coefficient
+ 2               	0
+ 3               	0
+ 4               	0
+ 5               	0
+
+[QUALITY]
+;Node            	InitQual
+
+[SOURCES]
+;Node            	Type        	Quality     	Pattern
+
+[REACTIONS]
+;Type     	Pipe/Tank       	Coefficient
+
+[REACTIONS]
+ Order Bulk            	1
+ Order Tank            	1
+ Order Wall            	1
+ Global Bulk           	0
+ Global Wall           	0
+ Limiting Potential    	0
+ Roughness Correlation 	0
+
+[MIXING]
+;Tank            	Model
+
+[TIMES]
+ Duration           	0:00 
+ Hydraulic Timestep 	1:00 
+ Quality Timestep   	0:05 
+ Pattern Timestep   	1:00 
+ Pattern Start      	0:00 
+ Report Timestep    	1:00 
+ Report Start       	0:00 
+ Start ClockTime    	12 am
+ Statistic          	NONE
+
+[REPORT]
+ Status             	Full
+ Summary            	Yes
+ Page               	0
+ Nodes                  All
+ Links                  All
+
+[OPTIONS]
+ Units              	LPS
+ Headloss           	H-W
+ Specific Gravity   	1
+ Viscosity          	1
+ Trials             	40
+ Accuracy           	0.001
+ CHECKFREQ          	2
+ MAXCHECK           	10
+ DAMPLIMIT          	0
+ Unbalanced         	Continue 10
+ Pattern            	1
+ Demand Multiplier  	1.0
+ Emitter Exponent   	0.5
+ Pressure Exponent      0.5
+ Minimum Pressure   	0
+ Required Pressure   	20
+ Demand Model           PDA
+ Quality            	None mg/L
+ Diffusivity        	1
+ Tolerance          	0.01
+
+[COORDINATES]
+;Node            	X-Coord         	Y-Coord
+ 2               	1346.15         	6900.45         
+ 3               	3676.47         	6787.33         
+ 4               	6255.66         	6809.95         
+ 5               	8834.84         	6809.95         
+ 1               	-1074.66        	6855.20         
+
+[VERTICES]
+;Link            	X-Coord         	Y-Coord
+
+[LABELS]
+;X-Coord           Y-Coord          Label & Anchor Node
+
+[BACKDROP]
+ DIMENSIONS     	0.00            	0.00            	10000.00        	10000.00        
+ UNITS          	None
+ FILE           	
+ OFFSET         	0.00            	0.00            
+
+[END]
diff --git a/epanet-tests/press_depend/cheung.json b/epanet-tests/press_depend/cheung.json
@@ -0,0 +1,17 @@
+{
+    "name": "cheung",
+    "version": "1.0",
+    "description": "Pressure dependant demands",
+    "args": [
+        "cheung.inp",
+        "cheung.rpt", 
+        "cheung.out"
+    ],
+    "input_files": [
+        "cheung.inp"
+    ],
+    "output_files": {
+        "cheung.rpt": "epanet report",
+        "cheung.out": "epanet allclose"
+    }
+}