Merge branch 'main' of https://github.com/USEPA/WNTR

Author: kaklise

MANIFEST.in

@@ -6,4 +6,5 @@ include wntr/epanet/Windows/*
 include wntr/sim/aml/*.pyd
 include wntr/sim/aml/*.so
 include wntr/sim/network_isolation/*.pyd
-include wntr/sim/network_isolation/*.so
+include wntr/sim/network_isolation/*.so
+include wntr/tests/networks_for_testing/*.inp

documentation/resultsobject.rst

@@ -19,7 +19,7 @@ Simulation results are stored in a results object which contains:
     >>> import pandas as pd
     >>> import matplotlib.pylab as plt
 	>>> import wntr
-    >>> pd.set_option('precision', 2)
+    >>> pd.set_option('display.precision', 2)
     >>> try:
     ...    wn = wntr.network.model.WaterNetworkModel('../examples/networks/Net3.inp')
     ... except:
@@ -201,4 +201,4 @@ For example, DataFrames can be saved to Excel files using:
    >>> pressure.to_excel('pressure.xlsx')
 
 .. note:: 
-   The Pandas method ``to_excel`` requires the Python package **openpyxl** [GaCl18]_, which is an optional dependency of WNTR.
+   The Pandas method ``to_excel`` requires the Python package **openpyxl** [GaCl18]_, which is an optional dependency of WNTR.

wntr/network/model.py

@@ -1955,7 +1955,7 @@ def add_tank(self, name, elevation=0.0, init_level=3.048,
         assert isinstance(diameter, (int, float)), "diameter must be a float"
         assert isinstance(min_vol, (int, float)), "min_vol must be a float"
         assert isinstance(vol_curve, (type(None), str)), "vol_curve must be a string"
-        assert isinstance(overflow, (type(None), bool)), "overflow must be a Boolean"
+        assert isinstance(overflow, (type(None), str, bool, int)), "overflow must be a bool, 'YES' or 'NO, or 0 or 1"
         assert isinstance(coordinates, (type(None), (tuple,list,))), "coordinates must be a tuple"
 
         elevation = float(elevation)