USEPA · kaklise · Jul 21, 2023 · Jul 21, 2023 · Aug 5, 2023 · Sep 19, 2023
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ docker/
 *.html
 *.pickle
 *.xlsx
+*.out
+*.rpt
 
 temp*
 

diff --git a/documentation/attention.rst b/documentation/attention.rst
@@ -1,4 +1,8 @@
 .. attention:: 
     Version 1.2.0 is now available.  
     See `release notes <https://usepa.github.io/WNTR/whatsnew.html>`_
-    for more information.
+    for more information.
+
+.. attention:: 
+    WNTR now includes capabilities to model stormwater and wastewater systems. 
+    See :ref:`stormwater` for more information.
diff --git a/documentation/figures/Site-Post.jpg b/documentation/figures/Site-Post.jpg
diff --git a/documentation/figures/plot_Site_Drainage_Model.png b/documentation/figures/plot_Site_Drainage_Model.png
diff --git a/documentation/figures/plot_basic_stormwater_network.png b/documentation/figures/plot_basic_stormwater_network.png
diff --git a/documentation/figures/timeseries_plot.png b/documentation/figures/timeseries_plot.png
diff --git a/documentation/gis.rst b/documentation/gis.rst
@@ -10,6 +10,8 @@
     >>> import pandas as pd
     >>> pd.options.display.expand_frame_repr = False
     >>> pd.options.display.precision = 3
+    >>> pd.options.display.max_colwidth = 50
+    >>> pd.options.display.max_columns = 10
     >>> try:
     ...    import geopandas as gpd
     ... except ModuleNotFoundError:

diff --git a/documentation/index.rst b/documentation/index.rst
@@ -30,8 +30,10 @@ Key Features in WNTR
    :hidden:
 
    userguide
+   installation
    wntr-api
    users
+   S-WNTR <stormwater>
 
 .. include:: citing_wntr.rst
 

diff --git a/documentation/index_latex.rst b/documentation/index_latex.rst
@@ -32,6 +32,7 @@ WNTR documentation
    graphics
    gis
    advancedsim
+   stormwater
    license
    users	   
    developers

diff --git a/documentation/installation.rst b/documentation/installation.rst
@@ -276,8 +276,10 @@ The following Python packages are optional:
   https://rtree.readthedocs.io/
 * openpyxl :cite:p:`gacl18`: used to read/write to Microsoft® Excel® spreadsheets,
   https://openpyxl.readthedocs.io
+* pyswmm :cite:p:`pyswmm`: used to run SWMM hydraulic simulations, https://github.com/pyswmm/pyswmm
+* swmmio :cite:p:`swmmio`: used to access and modify SWMM INP files, https://github.com/pyswmm/swmmio
 
-All of these packages **except geopandas** are included in the Anaconda Python distribution.
+All of these packages **except geopandas, pyswmm, and swmmio** are included in the Anaconda Python distribution.
 To install optional dependencies, run::
 
 	pip install -r requirements.txt

diff --git a/documentation/overview.rst b/documentation/overview.rst
@@ -2,17 +2,17 @@
 
     \setcounter{secnumdepth}{1}
     \clearpage
-
-.. _wntr_overview:
-
-Overview 
-========
 
 .. raw:: latex
 
     \pagenumbering{arabic}
     \setcounter{page}{1}
-
+
+.. _wntr_overview:
+
+Overview 
+========
+
 Drinking water systems face multiple challenges, including aging infrastructure, 
 water quality concerns, uncertainty in supply and demand, natural disasters, 
 environmental emergencies, and cyber and terrorist attacks.  
@@ -49,7 +49,12 @@ and the associated analysis results. Information on EPANET can be found at https
 **WNTR is compatible with EPANET 2.00.12** :cite:p:`ross00` **and EPANET 2.2** :cite:p:`rwts20`. In addition, users should have 
 experience using Python, including the installation of additional Python packages. General information on Python can be found at https://www.python.org/. 
 
-
+.. note::
+   In addition to resilience analysis for drinking water systems, WNTR now includes 
+   functionality to simulate and analyze resilience of stormwater and wastewater systems.
+   This builds on **EPA's Storm Water Management Model (SWMM)** :cite:p:`ross22`.
+   See :ref:`stormwater` for more information.
+
 WNTR can be installed through the United States Environmental Protection Agency (US EPA) 
 GitHub organization at https://github.com/USEPA/WNTR.  An integrated development environment 
 (IDE), like Spyder, is recommended for users and developers.

diff --git a/documentation/references.bib b/documentation/references.bib
@@ -166,6 +166,38 @@ @article{lwfz17
     year = "2017"
 }
 
+@article{niemi2019automated,
+  title={Automated urban rainfall--runoff model generation with detailed land cover and flow routing},
+  author={Niemi, Tero J and Kokkonen, Teemu and Sillanp{\"a}{\"a}, Nora and Set{\"a}l{\"a}, Heikki and Koivusalo, Harri},
+  journal={Journal of Hydrologic Engineering},
+  volume={24},
+  number={5},
+  pages={04019011},
+  year={2019},
+  publisher={American Society of Civil Engineers},
+  doi = "10.1061/(ASCE)HE.1943-5584.0001784",
+}
+
+@misc{pcswmm,
+    author = "Computational Hydraulics International (CHI)",
+    howpublished = "Software",
+    title = "PCSWMM",
+    url = "https://www.pcswmm.com/",
+    urldate = "2024-01-16",
+    year = "2024"
+}
+
+@article{pyswmm,
+    author = "McDonnell, Bryant E and Ratliff, Katherine and Tryby, Michael E. and Jia Xin Wu, Jennifer and Mullapudi, Abhiram",
+    doi = "10.21105/joss.02292",
+    journal = "Journal of Open Source Software",
+    number = "5",
+    pages = "2292",
+    title = "PySWMM: The Python Interface to Stormwater Management Model (SWMM)",
+    volume = "52",
+    year = "2020"
+}
+
 @book{mcki13,
     author = "McKinney, Wes",
     publisher = "O'Reilly Media, Inc.",
@@ -211,6 +243,16 @@ @techreport{ross00
     pagetotal = "200"
 }
 
+@techreport{ross22,
+    author = "Rossman, L. A. and Simon, Michelle",
+    address = "Cincinnati, OH",
+    institution = "U.S. Environmental Protection Agency",
+    number = "EPA/600/R--22/030",
+    title = "Storm Water Management Model User's Manual Version 5.2",
+    year = "2022",
+    pagetotal = "423"
+}
+
 @misc{rtree,
     author = "Toblerity",
     howpublished = "Software",
@@ -250,6 +292,15 @@ @misc{sphc16
     optcomment = "modified from below preferred citation, per Plotly"
 }
 
+@misc{swmmio,
+    author = "Erispaha, Adam and swmmio developers",
+    howpublished = "Software",
+    title = "swmmio",
+    url = "https://github.com/pyswmm/swmmio",
+    urldate = "2024-01-24",
+    year = "2024"
+}
+
 @article{todi00,
     author = "Todini, Ezio",
     doi = "10.1016/S1462-0758(00)00049-2",