cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix gas filter math (#42801) 

* fix gas filter math
i'm just a stunning genius aren't i

* yeah i can do it better
This commit is contained in:
ArtisticRoomba 2026-02-05 00:19:18 -08:00 committed by Coryler
parent 57155b811d
commit 231fb6ab3f
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
View File

@ -344,6 +344,26 @@ namespace Content.Server.Atmos.EntitySystems
/// transferred volume causing a pressure rise in the target <see cref="GasMixture"/>.</remarks>
[PublicAPI]
public static float FractionToMaxPressure(GasMixture mix1, GasMixture mix2, float targetPressure)
{
var molesToTransfer = MolesToMaxPressure(mix1, mix2, targetPressure);
return molesToTransfer / mix1.TotalMoles;
}
/// <summary>
/// Determines the number of moles to be removed and transferred from a source
/// <see cref="GasMixture"/> to a target <see cref="GasMixture"/> to reach a target pressure
/// in the target <see cref="GasMixture"/>.
/// </summary>
/// <param name="mix1">The source <see cref="GasMixture"/> that gas will be removed from.
/// This should always be of higher pressure than the second <see cref="GasMixture"/>.</param>
/// <param name="mix2">The target <see cref="GasMixture"/> that will increase in pressure
/// to the target pressure.</param>
/// <param name="targetPressure">The target mixture's desired pressure to target.</param>
/// <returns>The difference in moles required to reach the target pressure.</returns>
/// <remarks>Note that this method doesn't take into account the heat capacity of the
/// transferred volume causing a pressure rise in the target <see cref="GasMixture"/>.</remarks>
[PublicAPI]
public static float MolesToMaxPressure(GasMixture mix1, GasMixture mix2, float targetPressure)
{
/*
Calculate the moles required to reach the target pressure.
@ -388,7 +408,7 @@ namespace Content.Server.Atmos.EntitySystems
var requiredMoles = (delta * mix2.Volume) / (mix1.Temperature * Atmospherics.R);
// Return the fraction of moles to transfer.
return requiredMoles / mix1.TotalMoles;
return requiredMoles;
}
/// <summary>

2
Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
View File

@ -77,7 +77,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
{
// Make sure we don't pump over the pressure limit.
var limitMolesFilter =
AtmosphereSystem.FractionToMaxPressure(removed, filterNode.Air, Atmospherics.MaxOutputPressure);
AtmosphereSystem.MolesToMaxPressure(removed, filterNode.Air, Atmospherics.MaxOutputPressure);
var availableMoles = removed.GetMoles(filter.FilteredGas.Value);
var filteredMoles = Math.Max(Math.Min(limitMolesFilter, availableMoles), 0);