engine almost working, backup before adding gas types.
This commit is contained in:
@@ -13,11 +13,12 @@ namespace FluidSim.Core
|
||||
public double DischargeCoefficient { get; set; } = 0.62;
|
||||
|
||||
public double EffectiveLength { get; set; } = 0.001;
|
||||
public bool UseInertance { get; set; } = true;
|
||||
public bool UseInertance { get; set; } = false;
|
||||
|
||||
private double _mdot; // positive = volume → pipe
|
||||
// Current mass flow (kg/s, positive = volume → pipe)
|
||||
private double _mdot;
|
||||
|
||||
public double LastMassFlowRate { get; private set; }
|
||||
public double LastMassFlowRate { get; private set; } // positive = into volume
|
||||
public double LastFaceDensity { get; private set; }
|
||||
public double LastFaceVelocity { get; private set; }
|
||||
public double LastFacePressure { get; private set; }
|
||||
@@ -41,10 +42,10 @@ namespace FluidSim.Core
|
||||
}
|
||||
|
||||
// Gather states
|
||||
double volP = VolumePort.Pressure;
|
||||
double volP = VolumePort.Pressure;
|
||||
double volRho = VolumePort.Density;
|
||||
double volT = VolumePort.Temperature;
|
||||
double volH = VolumePort.SpecificEnthalpy;
|
||||
double volT = VolumePort.Temperature;
|
||||
double volH = VolumePort.SpecificEnthalpy;
|
||||
|
||||
(double pipeRho, double pipeU, double pipeP) = IsPipeLeftEnd
|
||||
? Pipe.GetInteriorStateLeft()
|
||||
@@ -52,25 +53,34 @@ namespace FluidSim.Core
|
||||
|
||||
double pipeT = pipeP / Math.Max(pipeRho * 287.0, 1e-12);
|
||||
double gamma = 1.4;
|
||||
double R = 287.0;
|
||||
double R = 287.0;
|
||||
|
||||
// ---- 1. Steady‑state nozzle solution (gives correct exit pressure) ----
|
||||
double mdotSS;
|
||||
// ---- Steady‑state nozzle solution (gives correct exit state) ----
|
||||
double mdotSS; // positive = volume → pipe
|
||||
double rhoFace0, uFace0, pFace0;
|
||||
if (volP >= pipeP)
|
||||
{
|
||||
IsentropicOrifice.Compute(volP, volRho, volT, pipeP, gamma, R, area, DischargeCoefficient,
|
||||
out double mdotUpToDown, out rhoFace0, out uFace0, out pFace0);
|
||||
mdotSS = mdotUpToDown; // volume → pipe
|
||||
mdotSS = mdotUpToDown;
|
||||
}
|
||||
else
|
||||
{
|
||||
IsentropicOrifice.Compute(pipeP, pipeRho, pipeT, volP, gamma, R, area, DischargeCoefficient,
|
||||
out double mdotUpToDown, out rhoFace0, out uFace0, out pFace0);
|
||||
mdotSS = -mdotUpToDown; // pipe → volume → negative for volume→pipe convention
|
||||
mdotSS = -mdotUpToDown;
|
||||
}
|
||||
|
||||
// ---- 2. Inertance dynamics ----
|
||||
// ====== Hard physical cap: max sonic flow × 1.1 ======
|
||||
double upRho = mdotSS >= 0 ? volRho : pipeRho;
|
||||
double upT = mdotSS >= 0 ? volT : pipeT;
|
||||
double upC = Math.Sqrt(gamma * R * upT);
|
||||
double maxFlow = upRho * upC * area * 1.1;
|
||||
if (Math.Abs(mdotSS) > maxFlow)
|
||||
mdotSS = Math.Sign(mdotSS) * maxFlow;
|
||||
// ====================================================
|
||||
|
||||
// ---- Dynamic update ----
|
||||
if (UseInertance)
|
||||
{
|
||||
double rhoUp = _mdot >= 0 ? volRho : pipeRho;
|
||||
@@ -85,39 +95,39 @@ namespace FluidSim.Core
|
||||
_mdot = mdotSS;
|
||||
}
|
||||
|
||||
// Clamp outflow to available mass
|
||||
// Clamp outflow to available mass (if finite volume)
|
||||
if (VolumePort.Owner is Volume0D vol)
|
||||
{
|
||||
double maxOut = vol.Mass / dtSub;
|
||||
if (_mdot > maxOut) _mdot = maxOut;
|
||||
}
|
||||
|
||||
// ---- 3. Ghost state (use nozzle‑exit pressure!) ----
|
||||
double rhoFace = _mdot >= 0 ? volRho : pipeRho; // upstream density
|
||||
double pFace = pFace0; // correct exit pressure (choked/subsonic)
|
||||
// ---- Ghost state ----
|
||||
double rhoFace = _mdot >= 0 ? volRho : pipeRho;
|
||||
double pFace = pFace0;
|
||||
double mdotMag = Math.Abs(_mdot);
|
||||
double uFace = mdotMag / (rhoFace * area);
|
||||
double uFace = mdotMag / (rhoFace * area);
|
||||
|
||||
if (IsPipeLeftEnd)
|
||||
uFace = _mdot >= 0 ? uFace : -uFace; // left: +u into pipe
|
||||
uFace = _mdot >= 0 ? uFace : -uFace;
|
||||
else
|
||||
uFace = _mdot >= 0 ? -uFace : uFace; // right: +u out of pipe
|
||||
uFace = _mdot >= 0 ? -uFace : uFace;
|
||||
|
||||
if (IsPipeLeftEnd)
|
||||
Pipe.SetGhostLeft(rhoFace, uFace, pFace);
|
||||
else
|
||||
Pipe.SetGhostRight(rhoFace, uFace, pFace);
|
||||
|
||||
// Store for monitoring
|
||||
double mdotIntoVolume = -_mdot;
|
||||
LastMassFlowRate = mdotIntoVolume;
|
||||
LastFaceDensity = rhoFace;
|
||||
// Store results (positive = into volume)
|
||||
LastMassFlowRate = -_mdot;
|
||||
LastFaceDensity = rhoFace;
|
||||
LastFaceVelocity = uFace;
|
||||
LastFacePressure = pFace;
|
||||
|
||||
VolumePort.MassFlowRate = mdotIntoVolume;
|
||||
VolumePort.MassFlowRate = -_mdot;
|
||||
|
||||
if (mdotIntoVolume >= 0)
|
||||
// Enthalpy transport
|
||||
if (-_mdot >= 0) // inflow → pipe enthalpy
|
||||
{
|
||||
double hPipe = gamma / (gamma - 1.0) * pipeP / Math.Max(pipeRho, 1e-12);
|
||||
VolumePort.SpecificEnthalpy = hPipe;
|
||||
@@ -140,7 +150,7 @@ namespace FluidSim.Core
|
||||
Pipe.SetGhostRight(rInt, -uInt, pInt);
|
||||
|
||||
LastMassFlowRate = 0.0;
|
||||
LastFaceDensity = rInt;
|
||||
LastFaceDensity = rInt;
|
||||
LastFaceVelocity = 0.0;
|
||||
LastFacePressure = pInt;
|
||||
if (VolumePort != null)
|
||||
|
||||
Reference in New Issue
Block a user