References update

documentation/conf.py

@@ -212,11 +212,6 @@ def setup(app):
             # The type of image to be used (see below for details)
             "type": "fontawesome",
         },
-        {
-            "name": "PyPI",
-            "url": "https://pypi.org/project/wntr",
-            "icon": "fa-brands fa-pypi",
-        },
         {
             "name": "Sandia National Laboratories",
             "url": "https://sandia.gov",  # required

documentation/reference.rst

@@ -5,11 +5,7 @@
 References
 ====================
 
-.. 
-    only:: html
-
-   Due to limitations with cross referenced citations in reStructuredText (e.g., commas and spaces are not supported), 
-   citations are cross referenced using a 6 digit notation [*]_. 
+`These references <https://github.com/USEPA/WNTR/blob/main/documentation/references.bib>`_ are also available in BibTeX format.
 
 ..
      [ALA01] American Lifelines Alliance. (2001).  Seismic Fragility Formulations for Water Systems, Part 1 and 2.  Report for the American Lifelines Alliance, ASCE (Ed.) Reston, VA: American Society of Civil Engineers. April 2001.
@@ -107,27 +103,7 @@ References
 .. 
     [WCSG03] Walski, T.M., Chase, D.V., Savic, D.A., Grayman, W., Beckwith, S. (2003). Advanced Water Distribution Modeling and Management. HAESTAD Press, Waterbury, CT, 693p.
 
-.. 
-    [*] Cross reference labels begins with 4 letters:
-
-   * If the citation has one author, the first 4 letters of name are used
-   * If the citation has two authors, the first 2 letters of author 1 and first 2 letters of author 2 are used
-   * If the citation has three authors, the first 2 letters of author 1, first letter of author 2, and first letter of author 3 are used
-   * If the citation has four authors, the first letter of each author is used
-   * If the citation has more than four authors, the first letter of first four authors is used
-   * Exceptions are made for American Lifelines Alliance (ALA) and United States Environmental Protection Agency (USEPA)
-
-   The next two digits are the year (century ignored).
-   If the 6 digits match another citation, a lower case letter (a, b, ...) is added.
-   Cross reference notation will be updated to a standard format when better options come available.
-
 
 .. bibliography::
     :cited:
 
-
-
-...................
-
-`These references <https://github.com/USEPA/WNTR/blob/main/documentation/references.bib>`_ are also available in BibTeX format.
-

documentation/references.bib

@@ -1,14 +1,16 @@
 
 @techreport{ALA01,
 	address = {Reston, VA},
-	author = {ALA},
-	institution = {American Lifelines Alliance (ALA)},
+	editor = {ASCE},
+	institution = {American Society of Civil Engineers},
 	title = {Seismic Fragility Formulations for Water Systems, Part 1 and 2},
-	year = {2001}
+    subtitle    = {Report for the American Lifelines Alliance},
+	year = {2001},
+    month = {4},
 }
 
 @article{AwGB90,
-	author = {Awumah, K and Goulter, I and Bhatt, SK},
+	author = {K. Awumah and I. Goulter and S. K. Bhatt},
 	doi = {10.1007/BF01544084},
 	journal = {Stochastic Hydrology and Hydraulics},
 	pages = {309--320},
@@ -22,16 +24,16 @@ @article{BaRR13
 	author = {Kash Barker and Jose Emmanuel Ramirez-Marquez and Claudio M. Rocco},
 	doi = {10.1016/j.ress.2013.03.012},
 	issn = {0951-8320},
-	journal = {Reliability Engineering \& System Safety},
+	journal = {Reliability Engineering and System Safety},
 	keywords = {Network resilience, Component importance measure, Vulnerability, Recoverability},
-	pages = {89-97},
+	pages = {89--97},
 	title = {Resilience-based network component importance measures},
 	volume = {117},
 	year = {2013}
 }
 
 @misc{Bieni19,
-	author = {Bieniek, T. and van Andel, B. and B{\o}, T.I},
+	author = {Bieniek, T. and van Andel, B. and B{\o}, T.I.},
 	howpublished = {Software},
 	title = {Bidirectional {UTM}-{WGS84} converter for python},
 	url = {https://github.com/Turbo87/utm},
@@ -44,7 +46,7 @@ @book{CrLo02
 	author = {Crowl, D.A. and Louvar, J.F.},
 	edition = {3},
 	isbn = {0-13-138226-8},
-	pages = {720},
+	pagetotal = {720},
 	publisher = {Prentice Hall},
 	title = {Chemical Process Safety: Fundamentals with Applications},
 	year = {2011}
@@ -55,6 +57,8 @@ @techreport{ELLT12
 	doi = {10.2172/1055706},
 	institution = {Lawrence Berkeley National Laboratory},
 	month = {1},
+    number = {LBNL-5268E},
+    pagetotal   = {68},
 	place = {Berkeley, CA},
 	title = {An Examination of Temporal Trends in Electricity Reliability Based on Reports from {U.S.} Electric Utilities},
 	year = {2012}
@@ -87,9 +91,9 @@ @misc{GaCl18
 }
 
 @inproceedings{HaSS08,
-	address = {Pasadena, CA},
 	author = {Aric A. Hagberg and Daniel A. Schult and Pieter J. Swart},
 	booktitle = {Proceedings of the 7th {Python} in Science Conference},
+    booksubtitle = {August 19-24, 2008, Pasadena, CA, USA},
 	editor = {Ga\"el Varoquaux and Travis Vaught and Jarrod Millman},
 	pages = {11 - 15},
 	title = {Exploring Network Structure, Dynamics, and Function using {NetworkX}},
@@ -102,24 +106,24 @@ @article{Hunt07
 	doi = {10.1109/MCSE.2007.55},
 	journal = {Computing in Science & Engineering},
 	number = {3},
-	pages = {90-95},
+	pages = {90--95},
 	title = {Matplotlib: A {2D} Graphics Environment},
 	volume = {9},
 	year = {2007}
 }
 
 @book{ICC12,
-	author = {International Code Council},
+    address = {Country Club Hills, IL},
+	author = {ICC},
 	isbn = {978-1-60983-046-5},
 	publisher = {International Code Council},
-	title = {2012 International Fire Code, Appendix B - Fire-Flow Requirements for Buildings},
+	title = {2012 International Fire Code, Appendix {B} - Fire-Flow Requirements for Buildings},
 	year = {2011}}
 
 @article{JaSr08,
 	author = {Jayaram, Nirmal and Srinivasan, K.},
 	doi = {10.1029/2006WR005316},
 	journal = {Water Resources Research},
-	keywords = {reliability, design and rehabilitation, life cycle costing, multiobjective optimization, resilience index, heuristic method},
 	number = {1},
 	title = {Performance-based optimal design and rehabilitation of water distribution networks using life cycle costing},
 	volume = {44},
@@ -132,7 +136,7 @@ @article{JCMG11
 	doi = {10.1145/2110170.2110185},
 	issn = {1932-2240},
 	issue_date = {September/December 2011},
-	journal = {ACM Communications in Computer Algebra},
+	journal = {{ACM} Communications in Computer Algebra},
 	month = {jan},
 	number = {3/4},
 	numpages = {10},