Dev #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

NicoRenaud merged 103 commits into main from dev

Dec 16, 2024

.github/workflows/build.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,9 +4,11 @@ on: @@
       push:
         branches:
         - main
+        - dev
       pull_request:
         branches:
         - main
+        - dev
     jobs:
@@ Expand Down @@

docs/notebooks/networks/Net0.inp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -16,8 +16,8 @@ File obtained via Mario of a 2 node sysem
  
    [PIPES]

    ;ID              	Node1           	Node2           	Length      	Diameter    	Roughness   	MinorLoss   	Status

     P1              	R1              	J1              	100         	250         	0.05        	0           	Open  	;

     P2              	J1              	D1              	1000        	200         	0.04        	0           	Open  	;

     P1              	R1              	J1              	1000        	250         	0.05        	0           	Open  	;

     P2              	J1              	D1              	1000        	250         	0.05        	0           	Open  	;

    [PUMPS]

    ;ID              	Node1           	Node2           	Parameters

    @@ -94,7 +94,7 @@ File obtained via Mario of a 2 node sysem
  
     Headloss           	D-W

     Specific Gravity   	1

     Viscosity          	1

     Trials             	40

     Trials             	50

     Accuracy           	0.1

     CHECKFREQ          	2

     MAXCHECK           	10

docs/notebooks/networks/Net0_CM.inp

-Original file line number
+Diff line change
@@ -0,0 +1,128 @@
+    [TITLE]
+    File obtained via Mario of a 2 node sysem
+    [JUNCTIONS]
+    ;ID              	Elev        	Demand      	Pattern
+     J1              	0           	0          	                	;
+     D1              	0           	50         	                	;
+    [RESERVOIRS]
+    ;ID              	Head        	Pattern
+     R1              	30          	                	;
+    [TANKS]
+    ;ID              	Elevation   	InitLevel   	MinLevel    	MaxLevel    	Diameter    	MinVol      	VolCurve        	Overflow
+    [PIPES]
+    ;ID              	Node1           	Node2           	Length      	Diameter    	Roughness   	MinorLoss   	Status
+     P1              	R1              	J1              	1000         	    1000        	0.015        	    0           	Open  	;
+     P2              	J1              	D1              	1000      	      1000         	0.015             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
+    [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           	1
+     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             	No
+     Summary            	No
+     Page               	0
+    [OPTIONS]
+     Units              	LPS
+     Headloss           	C-M
+     Specific Gravity   	1
+     Viscosity          	1
+     Trials             	40
+     Accuracy           	0.1
+     CHECKFREQ          	2
+     MAXCHECK           	10
+     DAMPLIMIT          	0
+     Unbalanced         	Continue 10
+     Pattern            	1
+     Demand Multiplier  	1.0
+     Emitter Exponent   	0.5
+     Quality            	None mg/L
+     Diffusivity        	1
+     Tolerance          	0.01
+    [COORDINATES]
+    ;Node            	X-Coord           	Y-Coord
+    J1              	10.00000          	60.00000
+    D1              	110.00000         	60.00000
+    R1              	-11.72214         	74.24023
+    [VERTICES]
+    ;Link            	X-Coord           	Y-Coord
+    [LABELS]
+    ;X-Coord             Y-Coord             Label & Anchor Node
+    [BACKDROP]
+      DIMENSIONS  	0.000             	0.000             	10000.000         	10000.000
+     UNITS          	None
+     FILE
+     OFFSET         	0.00            	0.00
+    [END]

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev #30

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!