Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump csharpier from 0.28.2 to 0.29.1 #302

Merged
merged 3 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.28.2",
"version": "0.29.1",
"commands": [
"dotnet-csharpier"
]
Expand Down
2 changes: 1 addition & 1 deletion src/SharpProp/Enums/FluidsList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1088,5 +1088,5 @@ public enum FluidsList
R513A,

[FluidInfo("TypicalNaturalGas.mix")]
TypicalNaturalGas
TypicalNaturalGas,
}
2 changes: 1 addition & 1 deletion src/SharpProp/Enums/InputPairs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ public enum InputPairs
DmassSmass_INPUTS,
DmolarSmolar_INPUTS,
DmassUmass_INPUTS,
DmolarUmolar_INPUTS
DmolarUmolar_INPUTS,
}
2 changes: 1 addition & 1 deletion src/SharpProp/Enums/Mix.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ public enum Mix
/// <summary>
/// Volume-based mixture.
/// </summary>
Volume
Volume,
}
2 changes: 1 addition & 1 deletion src/SharpProp/Enums/Parameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ public enum Parameters
iPH,
iODP,
iPhase,
iundefined_parameter
iundefined_parameter,
}
2 changes: 1 addition & 1 deletion src/SharpProp/Enums/Phases.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ public enum Phases
Gas,
TwoPhase,
Unknown,
NotImposed
NotImposed,
}
4 changes: 2 additions & 2 deletions src/SharpProp/Extensions/JsonExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ internal static class JsonExtensions
Converters = new List<JsonConverter>
{
new StringEnumConverter(),
new UnitsNetIQuantityJsonConverter()
}
new UnitsNetIQuantityJsonConverter(),
},
};

public static string ConvertToJson(this object? instance, bool indented)
Expand Down
22 changes: 11 additions & 11 deletions src/SharpProp/Fluids/IFluid.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IKeyedInput<Parameters> secondInput
);

/// <summary>
/// The process of isentropic compression to a given pressure.
/// The process of isentropic compression to given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <returns>
Expand All @@ -48,7 +48,7 @@ IKeyedInput<Parameters> secondInput
IFluid IsentropicCompressionTo(Pressure pressure);

/// <summary>
/// The process of compression to a given pressure.
/// The process of compression to given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <param name="isentropicEfficiency">
Expand All @@ -64,7 +64,7 @@ IKeyedInput<Parameters> secondInput
IFluid CompressionTo(Pressure pressure, Ratio isentropicEfficiency);

/// <summary>
/// The process of isenthalpic expansion to a given pressure.
/// The process of isenthalpic expansion to given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <returns>The state of the fluid at the end of the process.</returns>
Expand All @@ -74,7 +74,7 @@ IKeyedInput<Parameters> secondInput
IFluid IsenthalpicExpansionTo(Pressure pressure);

/// <summary>
/// The process of isentropic expansion to a given pressure.
/// The process of isentropic expansion to given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <returns>The state of the fluid at the end of the process.</returns>
Expand All @@ -84,7 +84,7 @@ IKeyedInput<Parameters> secondInput
IFluid IsentropicExpansionTo(Pressure pressure);

/// <summary>
/// The process of expansion to a given pressure.
/// The process of expansion to given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <param name="isentropicEfficiency">
Expand Down Expand Up @@ -164,10 +164,10 @@ IKeyedInput<Parameters> secondInput
IFluid HeatingTo(SpecificEnergy enthalpy, Pressure? pressureDrop = null);

/// <summary>
/// Returns a bubble point at a given pressure.
/// Returns a bubble point at given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <returns>A bubble point at a given pressure.</returns>
/// <returns>A bubble point at given pressure.</returns>
IFluid BubblePointAt(Pressure pressure);

/// <summary>
Expand All @@ -178,10 +178,10 @@ IKeyedInput<Parameters> secondInput
IFluid BubblePointAt(Temperature temperature);

/// <summary>
/// Returns a dew point at a given pressure.
/// Returns a dew point at given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <returns>A dew point at a given pressure.</returns>
/// <returns>A dew point at given pressure.</returns>
IFluid DewPointAt(Pressure pressure);

/// <summary>
Expand All @@ -192,11 +192,11 @@ IKeyedInput<Parameters> secondInput
IFluid DewPointAt(Temperature temperature);

/// <summary>
/// Returns a two-phase point at a given pressure.
/// Returns a two-phase point at given pressure.
/// </summary>
/// <param name="pressure">Pressure.</param>
/// <param name="quality">Vapor quality.</param>
/// <returns>Two-phase point at a given pressure.</returns>
/// <returns>Two-phase point at given pressure.</returns>
IFluid TwoPhasePointAt(Pressure pressure, Ratio quality);

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/SharpProp/Fluids/IMixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public interface IMixture
IJsonable
{
/// <summary>
/// List of selected names of pure fluids.
/// List of selected pure fluid names.
/// </summary>
IReadOnlyList<FluidsList> Fluids { get; }

Expand Down
2 changes: 1 addition & 1 deletion src/SharpProp/Fluids/Mixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class Mixture : AbstractFluid, IMixture
private const string AvailableBackend = "HEOS";

/// <inheritdoc cref="Mixture"/>
/// <param name="fluids">List of selected names of pure fluids.</param>
/// <param name="fluids">List of selected pure fluid names.</param>
/// <param name="fractions">List of mass-based fractions.</param>
/// <exception cref="ArgumentException">
/// Invalid input! Fluids and Fractions should be of the same length.
Expand Down
2 changes: 1 addition & 1 deletion src/SharpProp/HumidAir/HumidAir.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ IKeyedInput<string> thirdInput
{
firstInput,
secondInput,
thirdInput
thirdInput,
};
CheckInputs();
}
Expand Down
4 changes: 2 additions & 2 deletions src/SharpProp/SharpProp.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>A simple, full-featured, lightweight, cross-platform CoolProp wrapper for C#</Description>
<Description>Simple, full-featured, lightweight, cross-platform CoolProp wrapper for C#</Description>
<NoWarn>$(NoWarn);1591;NU5129;CA2101;SYSLIB1054</NoWarn>
<Summary>A simple, full-featured, lightweight, cross-platform CoolProp wrapper for C#</Summary>
<Summary>Simple, full-featured, lightweight, cross-platform CoolProp wrapper for C#</Summary>
<Title>SharpProp</Title>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions tests/SharpProp.Tests/Fluids/FluidTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void Update_VariousFluids_MatchesWithCoolProp(FluidsList name)
fluid.SurfaceTension?.NewtonsPerMeter,
fluid.Temperature.Kelvins,
fluid.TriplePressure?.Pascals,
fluid.TripleTemperature?.Kelvins
fluid.TripleTemperature?.Kelvins,
};
var expected = new[]
{
Expand All @@ -134,7 +134,7 @@ public void Update_VariousFluids_MatchesWithCoolProp(FluidsList name)
"I",
"T",
"p_triple",
"T_triple"
"T_triple",
}
.Select(CoolPropInterface)
.ToList();
Expand Down Expand Up @@ -260,11 +260,11 @@ public void AsJson_IndentedOrNot_ReturnsProperlyFormattedJson(bool indented)
Converters = new List<JsonConverter>
{
new StringEnumConverter(),
new UnitsNetIQuantityJsonConverter()
new UnitsNetIQuantityJsonConverter(),
},
Formatting = indented
? Formatting.Indented
: Formatting.None
: Formatting.None,
}
)
);
Expand Down
16 changes: 8 additions & 8 deletions tests/SharpProp.Tests/Fluids/MixtureTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ public void AsJson_IndentedOrNot_ReturnsProperlyFormattedJson(bool indented)
Converters = new List<JsonConverter>
{
new StringEnumConverter(),
new UnitsNetIQuantityJsonConverter()
new UnitsNetIQuantityJsonConverter(),
},
Formatting = indented
? Formatting.Indented
: Formatting.None
: Formatting.None,
}
)
);
Expand Down Expand Up @@ -201,35 +201,35 @@ public static IEnumerable<object[]> WrongFluidsOrFractions() =>
new List<FluidsList> { FluidsList.Water },
new List<Ratio> { 60.Percent(), 40.Percent() },
"Invalid input! Fluids and Fractions "
+ "should be of the same length."
+ "should be of the same length.",
},
new object[]
{
new List<FluidsList> { FluidsList.MPG, FluidsList.MEG },
new List<Ratio> { 60.Percent(), 40.Percent() },
"Invalid components! All of them "
+ "should be a pure fluid with HEOS backend."
+ "should be a pure fluid with HEOS backend.",
},
new object[]
{
new List<FluidsList> { FluidsList.Water, FluidsList.Ethanol },
new List<Ratio> { -200.Percent(), 40.Percent() },
"Invalid component mass fractions! "
+ "All of them should be in (0;100) %."
+ "All of them should be in (0;100) %.",
},
new object[]
{
new List<FluidsList> { FluidsList.Water, FluidsList.Ethanol },
new List<Ratio> { 60.Percent(), 200.Percent() },
"Invalid component mass fractions! "
+ "All of them should be in (0;100) %."
+ "All of them should be in (0;100) %.",
},
new object[]
{
new List<FluidsList> { FluidsList.Water, FluidsList.Ethanol },
new List<Ratio> { 80.Percent(), 80.Percent() },
"Invalid component mass fractions! "
+ "Their sum should be equal to 100 %."
}
+ "Their sum should be equal to 100 %.",
},
};
}
8 changes: 4 additions & 4 deletions tests/SharpProp.Tests/HumidAir/HumidAirTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void Update_VariousConditions_MatchesWithCoolProp(
_humidAir.SpecificHeat.JoulesPerKilogramKelvin,
_humidAir.SpecificVolume.CubicMetersPerKilogram,
_humidAir.Temperature.Kelvins,
_humidAir.WetBulbTemperature.Kelvins
_humidAir.WetBulbTemperature.Kelvins,
};
var expected = new[]
{
Expand All @@ -107,7 +107,7 @@ public void Update_VariousConditions_MatchesWithCoolProp(
"Cha",
"Vha",
"T",
"B"
"B",
}
.Select(CoolPropInterface)
.ToList();
Expand Down Expand Up @@ -229,11 +229,11 @@ public void AsJson_IndentedOrNot_ReturnsProperlyFormattedJson(bool indented)
Converters = new List<JsonConverter>
{
new StringEnumConverter(),
new UnitsNetIQuantityJsonConverter()
new UnitsNetIQuantityJsonConverter(),
},
Formatting = indented
? Formatting.Indented
: Formatting.None
: Formatting.None,
}
)
);
Expand Down
Loading