-
Notifications
You must be signed in to change notification settings - Fork 394
Added support for molar flow units #1196
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
abf4766
Added support for molar flow units
dcasaseca 7030b55
Overload operator for MolarFlow / Molarity = VolumeFlow
dcasaseca 907a835
Changes requested + HTC fix
dcasaseca 2ba3c45
Molarity unit fix
dcasaseca 210e907
Update MolarFlowTests.cs
angularsen e37d766
Changed to cal (IT) + marked obsolete property
dcasaseca 52dcd55
Merge branch 'add_molar_flow' of https://github.com/dcasaseca/UnitsNe…
dcasaseca fd76610
Missing using directive
dcasaseca 38452a7
Fix build error, remove obsolete attribute in generated test case
angularsen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
{ | ||
"Name": "MolarFlow", | ||
"BaseUnit": "MolePerSecond", | ||
"XmlDocSummary": "Molar flow is the ratio of the amount of substance change to the time during which the change occurred (value of amount of substance changes per unit time).", | ||
"BaseDimensions": { | ||
"N": 1, | ||
"T": -1 | ||
}, | ||
"Units": [ | ||
{ | ||
"SingularName": "MolePerSecond", | ||
"PluralName": "MolesPerSecond", | ||
"BaseUnits": { | ||
"N": "Mole", | ||
"T": "Second" | ||
}, | ||
"Prefixes": [ "Kilo" ], | ||
"FromUnitToBaseFunc": "{x}", | ||
"FromBaseToUnitFunc": "{x}", | ||
"Localization": [ | ||
{ | ||
"Culture": "en-US", | ||
"Abbreviations": [ "mol/s" ] | ||
} | ||
] | ||
}, | ||
{ | ||
"SingularName": "MolePerMinute", | ||
"PluralName": "MolesPerMinute", | ||
"BaseUnits": { | ||
"N": "Mole", | ||
"T": "Minute" | ||
}, | ||
"Prefixes": [ "Kilo" ], | ||
"FromUnitToBaseFunc": "{x} / 60", | ||
"FromBaseToUnitFunc": "{x} * 60", | ||
"Localization": [ | ||
{ | ||
"Culture": "en-US", | ||
"Abbreviations": [ "mol/min" ] | ||
} | ||
] | ||
}, | ||
{ | ||
"SingularName": "MolePerHour", | ||
"PluralName": "MolesPerHour", | ||
"BaseUnits": { | ||
"N": "Mole", | ||
"T": "Hour" | ||
}, | ||
"Prefixes": [ "Kilo" ], | ||
"FromUnitToBaseFunc": "{x} / 3600", | ||
"FromBaseToUnitFunc": "{x} * 3600", | ||
"Localization": [ | ||
{ | ||
"Culture": "en-US", | ||
"Abbreviations": [ "kmol/h" ] | ||
} | ||
] | ||
}, | ||
{ | ||
"SingularName": "PoundMolePerSecond", | ||
angularsen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"PluralName": "PoundMolesPerSecond", | ||
"BaseUnits": { | ||
"N": "PoundMole", | ||
"T": "Second" | ||
}, | ||
"FromUnitToBaseFunc": "{x} * 453.59237", | ||
"FromBaseToUnitFunc": "{x} / 453.59237", | ||
"Localization": [ | ||
{ | ||
"Culture": "en-US", | ||
"Abbreviations": [ "lbmol/s" ] | ||
} | ||
] | ||
}, | ||
{ | ||
"SingularName": "PoundMolePerMinute", | ||
"PluralName": "PoundMolesPerMinute", | ||
"BaseUnits": { | ||
"N": "PoundMole", | ||
"T": "Minute" | ||
}, | ||
"FromUnitToBaseFunc": "({x} * 453.59237) / 60", | ||
"FromBaseToUnitFunc": "({x} / 453.59237) * 60", | ||
"Localization": [ | ||
{ | ||
"Culture": "en-US", | ||
"Abbreviations": [ "lbmol/min" ] | ||
} | ||
] | ||
}, | ||
{ | ||
"SingularName": "PoundMolePerHour", | ||
"PluralName": "PoundMolesPerHour", | ||
"BaseUnits": { | ||
"N": "PoundMole", | ||
"T": "Hour" | ||
}, | ||
"FromUnitToBaseFunc": "({x} * 453.59237) / 3600", | ||
"FromBaseToUnitFunc": "({x} / 453.59237) * 3600", | ||
"Localization": [ | ||
{ | ||
"Culture": "en-US", | ||
"Abbreviations": [ "lbmol/h" ] | ||
} | ||
] | ||
} | ||
] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
UnitsNet.NanoFramework/GeneratedCode/MolarFlow/MolarFlow.nfproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<PropertyGroup Label="Globals"> | ||
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath> | ||
</PropertyGroup> | ||
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" /> | ||
<PropertyGroup> | ||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
<ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
<ProjectGuid>{49cc942b-d836-a48b-0429-25bf95247759}</ProjectGuid> | ||
<OutputType>Library</OutputType> | ||
<AppDesignerFolder>Properties</AppDesignerFolder> | ||
<FileAlignment>512</FileAlignment> | ||
<RootNamespace>UnitsNet</RootNamespace> | ||
<AssemblyName>UnitsNet.MolarFlow</AssemblyName> | ||
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion> | ||
<DocumentationFile>bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile> | ||
</PropertyGroup> | ||
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" /> | ||
<ItemGroup> | ||
<Compile Include="..\Quantities\MolarFlow.g.cs" /> | ||
<Compile Include="..\Units\MolarFlowUnit.g.cs" /> | ||
<Compile Include="..\Properties\AssemblyInfo.cs" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731"> | ||
<HintPath>..\packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath> | ||
<Private>True</Private> | ||
<SpecificVersion>True</SpecificVersion> | ||
</Reference> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<None Include="packages.config" /> | ||
</ItemGroup> | ||
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" /> | ||
<ProjectExtensions> | ||
<ProjectCapabilities> | ||
<ProjectConfigurationsDeclaredAsItems /> | ||
</ProjectCapabilities> | ||
</ProjectExtensions> | ||
</Project> |
26 changes: 26 additions & 0 deletions
26
UnitsNet.NanoFramework/GeneratedCode/MolarFlow/UnitsNet.NanoFramework.MolarFlow.nuspec
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> | ||
<metadata> | ||
<id>UnitsNet.nanoFramework.MolarFlow</id> | ||
<version>5.1.0</version> | ||
<title>Units.NET MolarFlow - nanoFramework</title> | ||
<authors>Andreas Gullberg Larsen,nanoFramework project contributors</authors> | ||
<owners>UnitsNet</owners> | ||
<license type="expression">MIT</license> | ||
<projectUrl>https://github.com/angularsen/UnitsNet</projectUrl> | ||
<requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
<description>Adds MolarFlow units for Units.NET on .NET nanoFramework. For .NET or .NET Core, use UnitsNet instead.</description> | ||
<iconUrl>https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</iconUrl> | ||
<releaseNotes> | ||
</releaseNotes> | ||
<copyright>Copyright 2013 Andreas Gullberg Larsen ([email protected]).</copyright> | ||
<language>en-US</language> | ||
<tags>nanoframework molarflow unit units quantity quantities measurement si metric imperial abbreviation abbreviations convert conversion parse immutable</tags> | ||
<dependencies> | ||
<dependency id="nanoFramework.CoreLibrary" version="1.14.2" /> | ||
</dependencies> | ||
</metadata> | ||
<files> | ||
<file src="..\..\..\Artifacts\UnitsNet.NanoFramework\MolarFlow\UnitsNet.*" target="lib" /> | ||
</files> | ||
</package> |
4 changes: 4 additions & 0 deletions
4
UnitsNet.NanoFramework/GeneratedCode/MolarFlow/packages.config
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnanoframework10" /> | ||
</packages> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.