Merge branch 'develop' into master

.github/workflows/build-and-test.yml

@@ -72,13 +72,14 @@ jobs:
         working-directory: ci-tools/windows
 
     steps:
-    - name: Checkout repo
+    - name: Checkout swmm repo
       uses: actions/checkout@v2
 
-    - name: Checkout submodule
+    - name: Checkout ci-tools repo
       uses: actions/checkout@v2
       with:
         repository: michaeltryby/ci-tools
+        ref: master
         path: ci-tools
 
     - name: Setup python
@@ -100,7 +101,7 @@ jobs:
         BENCHMARK_TAG: v2.1.0
       run: before-nrtest.cmd ${{ env.BENCHMARK_TAG }}
 
-    - name: Reg test
+    - name: Run reg test
       run: run-nrtests.cmd %GITHUB_RUN_ID%_%GITHUB_RUN_NUMBER%
 
     - name: Upload artifacts

README.md

@@ -1,14 +1,21 @@
-Stormwater-Management-Model
-===========================
+ORD Stormwater-Management-Model Solver
+==================================
 
-ORD Stormwater Management Model (aka "SWMM")
+Stormwater Management Model (aka "SWMM") solver only
 
-Introduction
-------------
-This is the official SWMM source code repository maintained by US EPA ORD, NRMRL, Water Supply and Water Resources Division located in Cincinnati, Ohio.
+
+## Build Status
+[![Build and Test](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build-and-test.yml)
+
+## Disclaimer 
+The United States Environmental Protection Agency (EPA) GitHub project code is provided on an "as is" basis and the user assumes responsibility for its use. EPA has relinquished control of the information and no longer has responsibility to protect the integrity, confidentiality, or availability of the information. Any reference to specific commercial products, processes, or services by service mark, trademark, manufacturer, or otherwise, does not constitute or imply their endorsement, recommendation or favoring by EPA. The EPA seal and logo shall not be used in any manner to imply endorsement of any commercial product or activity by EPA or the United States Government.
+
+
+## Introduction
+This is the official SWMM source code repository maintained by US EPA Office of Research and Development, Center For Environmental Solutions & Emergency Response, Water Infrastructure Division located in Cincinnati, Ohio.
 
 SWMM is a dynamic hydrology-hydraulic water quality simulation model. It is used for single event or long-term (continuous) simulation of runoff quantity and quality from primarily urban areas. SWMM source code is written in the C Programming Language and released in the Public Domain.
 
-Find Out More
--------------
+
+## Find Out More
 The source code distributed here is identical to the code found at the official [SWMM Website](http://www2.epa.gov/water-research/storm-water-management-model-swmm).