From d33005d14e73fdfcc94cc5bd131c578339aa3b8a Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 3 Feb 2023 16:20:23 +0100 Subject: [PATCH] [Material] add support for magnetic permeability - also rename property group to "electromagnetic" (this change has no influence on any existing simulation, is only the name in the material editor) --- src/Mod/Material/FluidMaterial/Air.FCMat | 3 ++- src/Mod/Material/FluidMaterial/Argon.FCMat | 3 ++- src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat | 3 ++- src/Mod/Material/FluidMaterial/Nitrogen.FCMat | 3 ++- src/Mod/Material/FluidMaterial/Water.FCMat | 3 ++- src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat | 3 ++- src/Mod/Material/StandardMaterial/Copper-Generic.FCMat | 3 ++- src/Mod/Material/StandardMaterial/Graphite.FCMat | 3 ++- src/Mod/Material/StandardMaterial/Invar-Generic.FCMat | 2 +- src/Mod/Material/StandardMaterial/TEMPLATE.FCMat | 6 +++++- src/Mod/Material/Templatematerial.yml | 6 +++++- 11 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/Mod/Material/FluidMaterial/Air.FCMat b/src/Mod/Material/FluidMaterial/Air.FCMat index bdffc4680a..19447e1eab 100644 --- a/src/Mod/Material/FluidMaterial/Air.FCMat +++ b/src/Mod/Material/FluidMaterial/Air.FCMat @@ -17,7 +17,8 @@ ThermalConductivity = 0.02587 W/m/K ; thermal expansion coefficient of ideal gas is 1/temperature ThermalExpansionCoefficient = 3.43e-3 1/K -[Electrical] +[Electromagnetic] RelativePermittivity = 1.00059 ; at 18°C and 50Hz ElectricalConductivity = 1e-12 S/m +RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/Argon.FCMat b/src/Mod/Material/FluidMaterial/Argon.FCMat index b32161c91c..59ef9a5ea4 100644 --- a/src/Mod/Material/FluidMaterial/Argon.FCMat +++ b/src/Mod/Material/FluidMaterial/Argon.FCMat @@ -18,6 +18,7 @@ ThermalConductivity = 0.018 W/m/K ; thermal expansion coefficient of ideal gas is 1/temperature ThermalExpansionCoefficient = 3.43e-3 1/K -[Electrical] +[Electromagnetic] RelativePermittivity = 1.000513 ElectricalConductivity = 1e-15 S/m +RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat b/src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat index ab0e8a784f..ca4b9bf57f 100644 --- a/src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat +++ b/src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat @@ -18,6 +18,7 @@ ThermalConductivity = 0.016242 W/m/K ; thermal expansion coefficient of ideal gas is 1/temperature ThermalExpansionCoefficient = 3.43e-3 1/K -[Electrical] +[Electromagnetic] RelativePermittivity = 1.0009217 ElectricalConductivity = 1e-12 S/m +RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/Nitrogen.FCMat b/src/Mod/Material/FluidMaterial/Nitrogen.FCMat index f60e155400..4f957c8ae0 100644 --- a/src/Mod/Material/FluidMaterial/Nitrogen.FCMat +++ b/src/Mod/Material/FluidMaterial/Nitrogen.FCMat @@ -18,6 +18,7 @@ ThermalConductivity = 25.83e-3 W/m/K ; thermal expansion coefficient of ideal gas is 1/temperature ThermalExpansionCoefficient = 3.43e-3 1/K -[Electrical] +[Electromagnetic] RelativePermittivity = 1.00058 ElectricalConductivity = 1e-12 S/m +RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/Water.FCMat b/src/Mod/Material/FluidMaterial/Water.FCMat index a277dfaaa6..ced22ef6f5 100644 --- a/src/Mod/Material/FluidMaterial/Water.FCMat +++ b/src/Mod/Material/FluidMaterial/Water.FCMat @@ -19,7 +19,8 @@ ThermalConductivity = 0.591 W/m/K ; https://en.wikipedia.org/wiki/Water ThermalExpansionCoefficient = 2.07e-4 m/m/K -[Electrical] +[Electromagnetic] RelativePermittivity = 80.0 ; at 20°C and 50Hz ElectricalConductivity = 5.5e-6 S/m +RelativePermeability = 0.999992 diff --git a/src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat b/src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat index bc2953e950..5d02a9e9dc 100644 --- a/src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat +++ b/src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat @@ -21,5 +21,6 @@ SpecificHeat = 897.0 J/kg/K ThermalConductivity = 237.0 W/m/K ThermalExpansionCoefficient = 23.1 µm/m/K -[Electrical] +[Electromagnetic] ElectricalConductivity = 370370.4 S/m +RelativePermeability = 1.0 diff --git a/src/Mod/Material/StandardMaterial/Copper-Generic.FCMat b/src/Mod/Material/StandardMaterial/Copper-Generic.FCMat index 3ad69c6c3c..e917a9d7cf 100644 --- a/src/Mod/Material/StandardMaterial/Copper-Generic.FCMat +++ b/src/Mod/Material/StandardMaterial/Copper-Generic.FCMat @@ -22,5 +22,6 @@ SpecificHeat = 385.0 J/kg/K ThermalConductivity = 398.0 W/m/K ThermalExpansionCoefficient = 16.5 µm/m/K -[Electrical] +[Electromagnetic] ElectricalConductivity = 588235.3 S/m +RelativePermeability = 0.999994 diff --git a/src/Mod/Material/StandardMaterial/Graphite.FCMat b/src/Mod/Material/StandardMaterial/Graphite.FCMat index d686617e49..abfad7f039 100644 --- a/src/Mod/Material/StandardMaterial/Graphite.FCMat +++ b/src/Mod/Material/StandardMaterial/Graphite.FCMat @@ -24,9 +24,10 @@ SpecificHeat = 0,72 kJ/kg/K ThermalConductivity = 96,000 W/m/K ThermalExpansionCoefficient = 8e-6 1/K -[Electrical] +[Electromagnetic] RelativePermittivity = 0.7 ElectricalConductivity = 2e4 S/m +RelativePermeability = 1.0 [UserDefined] MolarMass = 12 diff --git a/src/Mod/Material/StandardMaterial/Invar-Generic.FCMat b/src/Mod/Material/StandardMaterial/Invar-Generic.FCMat index b16ca7eeef..fd65cc87c1 100644 --- a/src/Mod/Material/StandardMaterial/Invar-Generic.FCMat +++ b/src/Mod/Material/StandardMaterial/Invar-Generic.FCMat @@ -21,5 +21,5 @@ SpecificHeat = 515.0 J/kg/K ThermalConductivity = 13.5 W/m/K ThermalExpansionCoefficient = 1.25 µm/m/K -[Electrical] +[Electromagnetic] ElectricalConductivity = 1250000 S/m diff --git a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat index 4d6fc258a5..8ddba3773d 100644 --- a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat +++ b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat @@ -110,7 +110,7 @@ ThermalConductivity = ; https://en.wikipedia.org/wiki/Volumetric_thermal_expansion_coefficient ThermalExpansionCoefficient = -[Electrical] +[Electromagnetic] ; The ratio to the permittivity of the vacuum ; https://en.wikipedia.org/wiki/Relative_permittivity RelativePermittivity = @@ -119,6 +119,10 @@ RelativePermittivity = ; https://en.wikipedia.org/wiki/Electrical_resistivity_and_conductivity ElectricalConductivity = +; The ratio to the permeability of the vacuum +; https://en.wikipedia.org/wiki/Permeability_(electromagnetism) +RelativePermeability = + [Architectural] ; Description to be updated diff --git a/src/Mod/Material/Templatematerial.yml b/src/Mod/Material/Templatematerial.yml index 75299d4add..d7c40db263 100644 --- a/src/Mod/Material/Templatematerial.yml +++ b/src/Mod/Material/Templatematerial.yml @@ -155,7 +155,7 @@ Type: 'Quantity' URL: 'https://en.wikipedia.org/wiki/Volumetric_thermal_expansion_coefficient' Description: "Thermal expansion coefficient (linear) in [FreeCAD ThermalExpansionCoefficient unit]" -- Electrical: +- Electromagnetic: RelativePermittivity: Type: 'Float' URL: 'https://en.wikipedia.org/wiki/Relative_permittivity' @@ -164,6 +164,10 @@ Type: 'Quantity' URL: 'https://en.wikipedia.org/wiki/Electrical_resistivity_and_conductivity' Description: "The electrical conductivity in [FreeCAD ElectricalConductivity unit]" + RelativePermeability: + Type: 'Float' + URL: 'https://en.wikipedia.org/wiki/Permeability_(electromagnetism)' + Description: "The ratio to the permeability of the vacuum" - Architectural: Color: Type: 'String'