Merge pull request #141 from stoiver/appveyor-runtests

Appveyor test_all working

anuga/__init__.py

@@ -302,6 +302,7 @@ def get_args():
     from anuga.utilities.model_tools import read_hole_dir_single_file_with_multi_poly
     from anuga.utilities.model_tools import read_multi_poly_file_value
     from anuga.utilities.model_tools import Create_culvert_bridge_Operator
+    from anuga.utilities.model_tools import get_WCC_2002_Blockage_factor
     from anuga.utilities.model_tools import get_WCC_2016_Blockage_factor
 
 

anuga/utilities/model_tools.py

@@ -592,3 +592,46 @@ def get_WCC_2016_Blockage_factor(Structure,Event,Scenario, long_result=False, ve
     else:
         return(BF)
 
+
+
+def get_WCC_2002_Blockage_factor(Structure, verbose=True):
+    """
+    If the Structure has a single dimension it is assumed a Diameter (hence Pipe)
+    Else it is a Box with w & h
+
+    --------------------------------------------------------------------
+    2017 - 06 - 22
+    
+    Wollongong Blockage Factor Calculator for 2002 Blockage Policy
+    
+    Author: Petar Milevski
+    
+    --------------------------------------------------------------------
+    For all design storm events    
+     
+    if diag >= 6.0m, blockage factor = 0.25, otherwise blockage factor is 100%
+
+    """
+
+    if len(Structure) > 1:# ====== FOR BOX =================
+        h = float(Structure[0])
+        w = float(Structure[1])
+        diag = (w**2+h**2)**0.5
+
+    else:   # ====== FOR PIPE ================
+        d = float(Structure[0])
+        diag = d
+
+    if diag >= 6.0:
+        BF = 0.25
+    else:
+        BF = 1.0
+
+    if verbose:
+        print '       Importing Culverts'
+        print '   Culvert Size ([H,W] or [d]): ', Structure
+        print '                      Diagonal: ', diag
+        print '               Blockage Factor: ', BF
+        print ''
+
+    return(BF)

appveyor.yml

@@ -28,5 +28,4 @@ build_script:
   - python setup.py install --skip-build 
 
 test_script:
-  - cd ..
-  - python -c "import anuga; anuga.test()"
+  - python test_all.py