From 555f07a1dc363c6f6d1c86be4ae76e0600a67d41 Mon Sep 17 00:00:00 2001 From: "Xia, Qingfeng" Date: Fri, 24 Jan 2020 11:30:47 +0000 Subject: [PATCH] Material: update fluid material and correct 2 value errors --- src/Mod/Material/CMakeLists.txt | 2 +- src/Mod/Material/FluidMaterial/Air.FCMat | 11 +++++-- src/Mod/Material/FluidMaterial/None.FCMat | 12 +++++--- src/Mod/Material/FluidMaterial/Readme.md | 34 ++++++++++++++++++++++ src/Mod/Material/FluidMaterial/Readme.txt | 7 ----- src/Mod/Material/FluidMaterial/Water.FCMat | 20 +++++++++---- 6 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 src/Mod/Material/FluidMaterial/Readme.md delete mode 100644 src/Mod/Material/FluidMaterial/Readme.txt diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt index ad4fc01f2e..54daf1c795 100644 --- a/src/Mod/Material/CMakeLists.txt +++ b/src/Mod/Material/CMakeLists.txt @@ -45,7 +45,7 @@ SET (FluidMaterial_Files FluidMaterial/None.FCMat FluidMaterial/Air.FCMat FluidMaterial/Water.FCMat - FluidMaterial/Readme.txt + FluidMaterial/Readme.md ) SOURCE_GROUP("MatLib" FILES ${FluidMaterial_Files}) diff --git a/src/Mod/Material/FluidMaterial/Air.FCMat b/src/Mod/Material/FluidMaterial/Air.FCMat index c1e99a7a34..aed9a29a10 100644 --- a/src/Mod/Material/FluidMaterial/Air.FCMat +++ b/src/Mod/Material/FluidMaterial/Air.FCMat @@ -1,17 +1,22 @@ -[FCMat] +[General] Name = Air Description = Standard air properties at 20 Degrees Celsius and 1 atm MolarMass = 28.965 +Father = Gas +[Fluidic] Density = 1.20 kg/m^3 DynamicViscosity = 1.80e-5 kg/m/s KinematicViscosity = 1.511e-5 m^2/s - -VolumetricThermalExpansionCoefficient = 3.43e-3 m/m/K +; PrandtlNumber is a nondimension number for CFD simulation PrandtlNumber = 0.7 +[Thermal] SpecificHeat = 1.005 J/kg/K ThermalConductivity = 0.0257 W/m/K +; volumetric expansion coeff of ideal gas depends on temperature and pressure +VolumetricThermalExpansionCoefficient = 3.43e-3 m/m/K +[Electrical] RelativePermittivity = 1.00059 ; at 18°C and 50Hz diff --git a/src/Mod/Material/FluidMaterial/None.FCMat b/src/Mod/Material/FluidMaterial/None.FCMat index 41b44668b5..785d59adcb 100644 --- a/src/Mod/Material/FluidMaterial/None.FCMat +++ b/src/Mod/Material/FluidMaterial/None.FCMat @@ -1,12 +1,16 @@ -[FCdMat] -Name = None -Description = None +; None means nothing, as the starting point of making a new fluid material +[General] +Name = None +Description = "None" + +[Fluidic] Density = 0 kg/m^3 DynamicViscosity = 0 kg/m/s KinematicViscosity = 0 m^2/s -VolumetricThermalExpansionCoefficient = 0 m/m/K +[Thermal] SpecificHeat = 0 J/kg/K ThermalConductivity = 0 W/m/K ThermalExpansionCoefficient = 0 um/m/K +VolumetricThermalExpansionCoefficient = 0 m/m/K diff --git a/src/Mod/Material/FluidMaterial/Readme.md b/src/Mod/Material/FluidMaterial/Readme.md new file mode 100644 index 0000000000..8475a9c84b --- /dev/null +++ b/src/Mod/Material/FluidMaterial/Readme.md @@ -0,0 +1,34 @@ +# FreeCAD fluid material library + + It's intended to gather the most common fluid properties, water, air, which are useful for other modules and workbenches. + +## User defined material + +To prevent the database from becomming inefficiently large it is only limited to commonly used variables at 20 degrees Celcius at 1 atm. + +Users can defined new material, either in Fem material card editor, or directly generate textual material file, * .FCMat, see example in this folder. + +To enable new material, go to FreeCAD menu "Edit->Preference..." Cfd preference page (select on the left panel) and switch to materail tab on the right. Browse to your material folder, and save/apply this preference, new material will b + +Material with same name as FreeCAD material has higher priority, so user defined` Water` material will not appear in Fem material task panel's dropbox list, just give it a different name! + +### Edit material value + +Please verify the fluid material properties before use. It aims to serve as a quick reference and does not aim to be an extended look up table. + + + +## Add new material to Material module + +1. follow examples in material folders to create new material file +2. stick to the meta data definition in `src/Mod/Material/Templatematerial.yml` for property name +3. add the file name into the `src/Mod/Material/CMakeLists.txt` , so the new files can be installed to the properly place during compiling and installation. + +## Change log + +CfdOF module authored 5 material types, values are taken from FM White (2011) Fluid Mechanics. + + + +Currently, 3 (Water, Air, None) are merged into Fem module and maintained by Cfd module author, Qingfeng Xia + diff --git a/src/Mod/Material/FluidMaterial/Readme.txt b/src/Mod/Material/FluidMaterial/Readme.txt deleted file mode 100644 index ca7ceaff82..0000000000 --- a/src/Mod/Material/FluidMaterial/Readme.txt +++ /dev/null @@ -1,7 +0,0 @@ -This is the FreeCAD simple fluid material library -data is taken from matweb -currently only water and air at the standard condition (20C and 1 atm) is prepared for testing - - -CSIR team is working on CfdFluidMaterial in CFD workbench to support more complex fluid material - diff --git a/src/Mod/Material/FluidMaterial/Water.FCMat b/src/Mod/Material/FluidMaterial/Water.FCMat index 5c2f1cb77d..c88709d60f 100644 --- a/src/Mod/Material/FluidMaterial/Water.FCMat +++ b/src/Mod/Material/FluidMaterial/Water.FCMat @@ -1,16 +1,24 @@ -[FCdMat] +; see meta data definition in the file: src/Mod/Material/Templatematerial.yml +[General] Name = Water Description = Standard distilled water properties at 20 Degrees Celsius and 1 atm MolarMass = 18 +Father = Gas +ReferenceSource = '' +[Fluidic] Density = 998 kg/m^3 -DynamicViscosity = 1.003e-3 kg/m/s -KinematicViscosity = 1.005 m^2/s +DynamicViscosity = 1.003e-3 kg/m/s +KinematicViscosity = 1.005e-6 m^2/s +; PrandtlNumber is a nondimension number for CFD simulation +PrandtlNumber = 7.56 +[Thermal] +SpecificHeat = 4182 J/kg/K +ThermalConductivity = 0.591 W/m/K +; https://en.wikipedia.org/wiki/Water VolumetricThermalExpansionCoefficient = 2.07e-4 m/m/K -SpecificHeat = 4.182 J/kg/K -ThermalConductivity = 0.591 W/m/K - +[Electrical] RelativePermittivity = 80.0 ; at 20°C and 50Hz