Skip to content

Commit

Permalink
Merge pull request #14 from arup-group/task/GSAGH-454-Change-unit-of-…
Browse files Browse the repository at this point in the history 
…Moment-per-Length-to-kNm-m-etc

GSAGH-454-Change-unit-of-Moment-per-Length-to-kNm-m-etc
  • Loading branch information
@tlmnrnhrdt
tlmnrnhrdt committed Jan 18, 2024
2 parents 7918f68 + 1be90f5 commit df7776e
Show file tree
Hide file tree
Showing 142 changed files with 5,272 additions and 136 deletions.
4 changes: 2 additions & 2 deletions CodeGen/CodeGen.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NuGet.Protocol" Version="6.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NuGet.Protocol" Version="6.8.0" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.2.0-alpha.19174.3" />
Expand Down
2 changes: 1 addition & 1 deletion CodeGen/Generators/NanoFrameworkGen/NuspecGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public string Generate()
<package xmlns=""http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"">
<metadata>
<id>OasysUnits.nanoFramework.{_quantity.Name}</id>
<version>5.12.0</version>
<version>1.1.1</version>
<title>Units.NET {_quantity.Name} - nanoFramework</title>
<authors>Andreas Gullberg Larsen,nanoFramework project contributors</authors>
<owners>OasysUnits</owners>
Expand Down
305 changes: 305 additions & 0 deletions Common/UnitDefinitions/MomentPerLength.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,305 @@
{
"Name": "MomentPerLength",
"BaseUnit": "NewtonMeterPerMeter",
"XmlDocSummary": "The magnitude of moment per unit length.",
"BaseDimensions": {
"L": 1,
"M": 1,
"T": -2
},
"Units": [
{
"SingularName": "NewtonMeterPerMeter",
"PluralName": "NewtonMetersPerMeter",
"FromUnitToBaseFunc": "{x}",
"FromBaseToUnitFunc": "{x}",
"Prefixes": [ "Kilo", "Mega" ],
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "N·m/m" ]
}
]
},
{
"SingularName": "NewtonMeterPerCentimeter",
"PluralName": "NewtonMetersPerCentimeter",
"FromUnitToBaseFunc": "{x} * 1e2",
"FromBaseToUnitFunc": "{x} / 1e2",
"Prefixes": [ "Kilo", "Mega" ],
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "N·m/cm" ]
}
]
},
{
"SingularName": "NewtonMeterPerMillimeter",
"PluralName": "NewtonMetersPerMillimeter",
"FromUnitToBaseFunc": "{x} * 1e3",
"FromBaseToUnitFunc": "{x} / 1e3",
"Prefixes": [ "Kilo", "Mega" ],
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "N·m/mm" ]
}
]
},
{
"SingularName": "NewtonCentimeterPerCentimeter",
"PluralName": "NewtonCentimetersPerCentimeter",
"FromUnitToBaseFunc": "{x}",
"FromBaseToUnitFunc": "{x}",
"Prefixes": [ "Kilo", "Mega" ],
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "N·cm/cm" ]
}
]
},
{
"SingularName": "NewtonMillimeterPerMillimeter",
"PluralName": "NewtonMillimetersPerMillimeter",
"FromUnitToBaseFunc": "{x}",
"FromBaseToUnitFunc": "{x}",
"Prefixes": [ "Kilo", "Mega" ],
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "N·mm/mm" ]
}
]
},
{
"SingularName": "KilogramForceMeterPerMeter",
"PluralName": "KilogramForceMetersPerMeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864",
"FromBaseToUnitFunc": "{x} / 9.80665002864",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kgf·m/m" ]
}
]
},
{
"SingularName": "KilogramForceMeterPerCentimeter",
"PluralName": "KilogramForceMetersPerCentimeter",
"FromUnitToBaseFunc": "{x} * 980.665002864",
"FromBaseToUnitFunc": "{x} / 980.665002864",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kgf·m/cm" ]
}
]
},
{
"SingularName": "KilogramForceMeterPerMillimeter",
"PluralName": "KilogramForceMetersPerMillimeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864e3",
"FromBaseToUnitFunc": "{x} / 9.80665002864e3",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kgf·m/mm" ]
}
]
},
{
"SingularName": "KilogramForceCentimeterPerCentimeter",
"PluralName": "KilogramForceCentimetersPerCentimeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864",
"FromBaseToUnitFunc": "{x} / 9.80665002864",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kgf·cm/cm" ]
}
]
},
{
"SingularName": "KilogramForceMillimeterPerMillimeter",
"PluralName": "KilogramForceMillimetersPerMillimeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864",
"FromBaseToUnitFunc": "{x} / 9.80665002864",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kgf·mm/mm" ]
}
]
},
{
"SingularName": "TonneForceMeterPerMeter",
"PluralName": "TonneForceMetersPerMeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864e3",
"FromBaseToUnitFunc": "{x} / 9.80665002864e3",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "tf·m/m" ]
}
]
},
{
"SingularName": "TonneForceMeterPerCentimeter",
"PluralName": "TonneForceMetersPerCentimeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864e5",
"FromBaseToUnitFunc": "{x} / 9.80665002864e5",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "tf·m/cm" ]
}
]
},
{
"SingularName": "TonneForceMeterPerMillimeter",
"PluralName": "TonneForceMetersPerMillimeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864e6",
"FromBaseToUnitFunc": "{x} / 9.80665002864e6",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "tf·m/mm" ]
}
]
},
{
"SingularName": "TonneForceCentimeterPerCentimeter",
"PluralName": "TonneForceCentimetersPerCentimeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864e3",
"FromBaseToUnitFunc": "{x} / 9.80665002864e3",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "tf·cm/cm" ]
}
]
},
{
"SingularName": "TonneForceMillimeterPerMillimeter",
"PluralName": "TonneForceMillimetersPerMillimeter",
"FromUnitToBaseFunc": "{x} * 9.80665002864e3",
"FromBaseToUnitFunc": "{x} / 9.80665002864e3",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "tf·mm/mm" ]
}
]
},
{
"SingularName": "PoundForceFootPerFoot",
"PluralName": "PoundForceFeetPerFoot",
"FromUnitToBaseFunc": "{x} * 4.4482216152605095551842641431421",
"FromBaseToUnitFunc": "{x} / 4.4482216152605095551842641431421",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "lbf·ft/ft" ]
}
]
},
{
"SingularName": "PoundForceFootPerInch",
"PluralName": "PoundForceFeetPerInch",
"FromUnitToBaseFunc": "{x} * 53.378659383126",
"FromBaseToUnitFunc": "{x} / 53.378659383126",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "lbf·ft/in" ]
}
]
},
{
"SingularName": "PoundForceFootPerYard",
"PluralName": "PoundForceFeetPerYard",
"FromUnitToBaseFunc": "{x} * 1.48274053842017",
"FromBaseToUnitFunc": "{x} / 1.48274053842017",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "lbf·ft/yd" ]
}
]
},
{
"SingularName": "PoundForceInchPerInch",
"PluralName": "PoundForceInchesPerInch",
"FromUnitToBaseFunc": "{x} * 4.4482216152605095551842641431421",
"FromBaseToUnitFunc": "{x} / 4.4482216152605095551842641431421",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "lbf·in/in" ]
}
]
},
{
"SingularName": "PoundForceInchPerFoot",
"PluralName": "PoundForceInchesPerFoot",
"FromUnitToBaseFunc": "{x} * 0.370685135",
"FromBaseToUnitFunc": "{x} / 0.370685135",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "lbf·in/ft" ]
}
]
},
{
"SingularName": "KilopoundForceFootPerFoot",
"PluralName": "KilopoundForceFeetPerFoot",
"FromUnitToBaseFunc": "{x} * 4448.2216152605095551842641431421",
"FromBaseToUnitFunc": "{x} / 4448.2216152605095551842641431421",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kip·ft/ft" ]
}
]
},
{
"SingularName": "KilopoundForceFootPerInch",
"PluralName": "KilopoundForceFeetPerInch",
"FromUnitToBaseFunc": "{x} * 53378.659383126",
"FromBaseToUnitFunc": "{x} / 53378.659383126",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kip·ft/in" ]
}
]
},
{
"SingularName": "KilopoundForceInchPerInch",
"PluralName": "KilopoundForceInchesPerInch",
"FromUnitToBaseFunc": "{x} * 4448.2216152605095551842641431421",
"FromBaseToUnitFunc": "{x} / 4448.2216152605095551842641431421",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kip·in/in" ]
}
]
},
{
"SingularName": "KilopoundForceInchPerFoot",
"PluralName": "KilopoundForceInchesPerFoot",
"FromUnitToBaseFunc": "{x} * 370.6851346",
"FromBaseToUnitFunc": "{x} / 370.6851346",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "kip·in/ft" ]
}
]
}
]
}
67 changes: 67 additions & 0 deletions Common/UnitEnumValues.g.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1813,5 +1813,72 @@
"MilliStrain": 7,
"Percent": 4,
"Ratio": 6
},
"MomentPerLength": {
"CentinewtonCentimeterPerCentimeter": 5,
"CentinewtonMeterPerCentimeter": 6,
"CentinewtonMeterPerMeter": 4,
"CentinewtonMeterPerMillimeter": 2,
"CentinewtonMillimeterPerMillimeter": 8,
"DecanewtonCentimeterPerCentimeter": 1,
"DecanewtonMeterPerCentimeter": 9,
"DecanewtonMeterPerMeter": 10,
"DecanewtonMeterPerMillimeter": 7,
"DecanewtonMillimeterPerMillimeter": 3,
"DecinewtonCentimeterPerCentimeter": 20,
"DecinewtonMeterPerCentimeter": 19,
"DecinewtonMeterPerMeter": 13,
"DecinewtonMeterPerMillimeter": 18,
"DecinewtonMillimeterPerMillimeter": 12,
"KilogramForceCentimeterPerCentimeter": 16,
"KilogramForceMeterPerCentimeter": 11,
"KilogramForceMeterPerMeter": 17,
"KilogramForceMeterPerMillimeter": 15,
"KilogramForceMillimeterPerMillimeter": 14,
"KilonewtonCentimeterPerCentimeter": 26,
"KilonewtonMeterPerCentimeter": 27,
"KilonewtonMeterPerMeter": 28,
"KilonewtonMeterPerMillimeter": 25,
"KilonewtonMillimeterPerMillimeter": 24,
"KilopoundForceFootPerFoot": 21,
"KilopoundForceFootPerInch": 22,
"KilopoundForceInchPerInch": 30,
"MeganewtonCentimeterPerCentimeter": 23,
"MeganewtonMeterPerCentimeter": 29,
"MeganewtonMeterPerMeter": 39,
"MeganewtonMeterPerMillimeter": 40,
"MeganewtonMillimeterPerMillimeter": 34,
"MicronewtonCentimeterPerCentimeter": 32,
"MicronewtonMeterPerCentimeter": 38,
"MicronewtonMeterPerMeter": 31,
"MicronewtonMeterPerMillimeter": 33,
"MicronewtonMillimeterPerMillimeter": 36,
"MillinewtonCentimeterPerCentimeter": 35,
"MillinewtonMeterPerCentimeter": 37,
"MillinewtonMeterPerMeter": 49,
"MillinewtonMeterPerMillimeter": 46,
"MillinewtonMillimeterPerMillimeter": 50,
"NanonewtonCentimeterPerCentimeter": 44,
"NanonewtonMeterPerCentimeter": 47,
"NanonewtonMeterPerMeter": 43,
"NanonewtonMeterPerMillimeter": 42,
"NanonewtonMillimeterPerMillimeter": 48,
"NewtonCentimeterPerCentimeter": 45,
"NewtonMeterPerCentimeter": 41,
"NewtonMeterPerMeter": 59,
"NewtonMeterPerMillimeter": 54,
"NewtonMillimeterPerMillimeter": 57,
"PoundForceFootPerFoot": 52,
"PoundForceFootPerInch": 55,
"PoundForceFootPerYard": 58,
"PoundForceInchPerInch": 56,
"PoundForceYardPerYard": 53,
"TonneForceCentimeterPerCentimeter": 51,
"TonneForceMeterPerCentimeter": 60,
"TonneForceMeterPerMeter": 62,
"TonneForceMeterPerMillimeter": 63,
"TonneForceMillimeterPerMillimeter": 70,
"PoundForceInchPerFoot": 61,
"KilopoundForceInchPerFoot": 65
}
}

0 comments on commit df7776e

Please sign in to comment.