diff --git a/src/solver/consts.h b/src/solver/consts.h index e5d851b14..764289f6e 100644 --- a/src/solver/consts.h +++ b/src/solver/consts.h @@ -3,7 +3,7 @@ // // Project: EPA SWMM5 // Version: 5.2 -// Date: 02/12/23 (Build 5.2.3) +// Date: 07/15/23 (Build 5.2.4) // Author: L. Rossman // // Various Constants @@ -16,7 +16,7 @@ // General Constants //------------------ -#define VERSION 52003 +#define VERSION 52004 #define MAGICNUMBER 516114522 #define EOFMARK 0x1A // Use 0x04 for UNIX systems #define MAXTITLE 3 // Max. # title lines diff --git a/src/solver/inlet.c b/src/solver/inlet.c index d7232d717..a51d8078b 100644 --- a/src/solver/inlet.c +++ b/src/solver/inlet.c @@ -1479,7 +1479,7 @@ double getCurbInletCapture(double Q, double L) // Input: Q = flow rate seen by inlet (cfs) // L = length of inlet opening (ft) // Output: returns captured flow rate (cfs) -// Purpose: finds the flow captured by an on-sag inlet. +// Purpose: finds the flow captured by an on-grade curb opening inlet. // { double Se = Sx, // equivalent gutter slope diff --git a/src/solver/project.c b/src/solver/project.c index a5a20dbd8..266fef914 100644 --- a/src/solver/project.c +++ b/src/solver/project.c @@ -3,7 +3,7 @@ // // Project: EPA SWMM5 // Version: 5.2 -// Date: 11/21/22 (Build 5.2.2) +// Date: 07/17/23 (Build 5.2.4) // Author: L. Rossman // // Project management functions. @@ -52,6 +52,10 @@ // Build 5.2.2: // - Default number of threads changed from OMP max. number to 1 // to be consistent with User Manual. +// Build 5.2.4: +// - Default Inertial Damping changed from SOME to PARTIAL_DAMPING. +// - Default CourantFactor changed from 0 (fixed routing time step) +// - to 0.75 (variable time step) //----------------------------------------------------------------------------- #define _CRT_SECURE_NO_DEPRECATE @@ -842,12 +846,12 @@ void setDefaults() SurchargeMethod = EXTRAN; // Use EXTRAN method for surcharging CrownCutoff = 0.96; // Fractional pipe crown cutoff AllowPonding = FALSE; // No ponding at nodes - InertDamping = SOME; // Partial inertial damping + InertDamping = PARTIAL_DAMPING; // Partial inertial damping NormalFlowLtd = BOTH; // Default normal flow limitation ForceMainEqn = H_W; // Hazen-Williams eqn. for force mains LinkOffsets = DEPTH_OFFSET; // Use depth for link offsets LengtheningStep = 0; // No lengthening of conduits - CourantFactor = 0.0; // No variable time step + CourantFactor = 0.75; // Variable time step reduced to 75% MinSurfArea = 0.0; // Force use of default min. surface area MinSlope = 0.0; // No user supplied minimum conduit slope SkipSteadyState = FALSE; // Do flow routing in steady state periods diff --git a/src/solver/text.h b/src/solver/text.h index 353296b8e..4bb46f059 100644 --- a/src/solver/text.h +++ b/src/solver/text.h @@ -3,7 +3,7 @@ // // Project: EPA SWMM5 // Version: 5.2 -// Date: 12/22/22 (Build 5.2.3) +// Date: 07/15/23 (Build 5.2.4) // Author: L. Rossman // // Text strings @@ -25,7 +25,7 @@ #define FMT03 " There are errors.\n" #define FMT04 " There are warnings.\n" #define FMT08 \ - "\n EPA STORM WATER MANAGEMENT MODEL - VERSION 5.2 (Build 5.2.3)" + "\n EPA STORM WATER MANAGEMENT MODEL - VERSION 5.2 (Build 5.2.4)" #define FMT09 \ "\n ------------------------------------------------------------" #define FMT10 "\n"