Revert "Fixed incorrect geom for elliptical pipes #144, fixed dead li…

…nks"

This reverts commit 467e52a.

README.md

@@ -5,7 +5,7 @@ Stormwater Management Model (aka "SWMM") solver only
 
 
 ## Build Status
-[![Build and Test](../../actions/workflows/build-and-test.yml/badge.svg)](../../actions/workflows/build-and-test.yml)
+[![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.
@@ -18,4 +18,4 @@ SWMM is a dynamic hydrology-hydraulic water quality simulation model. It is used
 
 
 ## Find Out More
-The source code distributed here is identical to the code found at the official [SWMM Website](https://www.epa.gov/water-research/storm-water-management-model-swmm).
+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).

src/solver/xsect.c

@@ -34,10 +34,6 @@
 //   - Support added for Street cross sections.
 //   Build 5.2.2:
 //   - Feasibility check added to Mod. Baskethandle & Rect.-Round shapes.
-//   Build 5.2.5:
-//   - Addressing inconsistent results for custom sized elliptical pipes.
-//     Stems from inccorect equations for pipe full area and hydraulic radius
-//     for elliptical pipes from SWMM 4.4.
 //-----------------------------------------------------------------------------
 #define _CRT_SECURE_NO_DEPRECATE
 
@@ -573,8 +569,8 @@ int xsect_setParams(TXsect *xsect, int type, double p[], double ucf)
             // --- length of major axis
             if ( p[1] < 0.0 ) return FALSE;
             xsect->wMax = p[1]/ucf;
-            xsect->aFull = 0.8117 * xsect->yFull * xsect->wMax;
-            xsect->rFull = 0.2448 * sqrt(xsect->yFull * xsect->wMax);
+            xsect->aFull = 1.2692 * xsect->yFull * xsect->yFull;
+            xsect->rFull = 0.3061 * xsect->yFull;
         }
         xsect->sFull = xsect->aFull * pow(xsect->rFull, 2./3.);
         xsect->sMax  = xsect->sFull;
@@ -601,8 +597,8 @@ int xsect_setParams(TXsect *xsect, int type, double p[], double ucf)
             // --- length of minor axis
             xsect->yFull = p[0]/ucf;
             xsect->wMax = p[1]/ucf;
-            xsect->aFull = 0.8117 * xsect->yFull * xsect->wMax;
-            xsect->rFull = 0.2448 * sqrt(xsect->yFull * xsect->wMax);
+            xsect->aFull = 1.2692 * xsect->wMax * xsect->wMax;
+            xsect->rFull = 0.3061 * xsect->wMax;
         }
         xsect->sFull = xsect->aFull * pow(xsect->rFull, 2./3.);
         xsect->sMax  = xsect->sFull;