Skip to content

Commit

Permalink
Fem: add air and water fluid material into data/Mod/Material
Browse files Browse the repository at this point in the history
  • Loading branch information
qingfengxia committed Jan 19, 2017
1 parent a378a16 commit 8252616
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Mod/Fem/_TaskPanelFemMaterial.py
Expand Up @@ -264,7 +264,7 @@ def vtec_changed(self, value):
if not (1 - variation < float(old_vtec) / value < 1 + variation):
# VolumetricThermalExpansionCoefficient has changed
material = self.material
value_in_one_per_K = value * 1e6 # To compensate for use of SI units
value_in_one_per_K = value
material['VolumetricThermalExpansionCoefficient'] = unicode(value_in_one_per_K) + " m/m/K"
self.material = material

Expand All @@ -275,7 +275,7 @@ def kinematic_viscosity_changed(self, value):
if not (1 - variation < float(old_nu) / value < 1 + variation):
# KinematicViscosity has changed
material = self.material
value_in_m2_per_second = value * 1e6 # To compensate for use of SI units
value_in_m2_per_second = value
material['KinematicViscosity'] = unicode(value_in_m2_per_second) + " m^2/s"
self.material = material

Expand Down
17 changes: 17 additions & 0 deletions src/Mod/Material/CMakeLists.txt
Expand Up @@ -27,6 +27,14 @@ SET (MaterialLib_Files
)
SOURCE_GROUP("MatLib" FILES ${MaterialLib_Files})

SET (FluidMaterial_Files
FluidMaterial/None.FCMat
FluidMaterial/Air.FCMat
FluidMaterial/Water.FCMat
FluidMaterial/Readme.txt
)
SOURCE_GROUP("MatLib" FILES ${FluidMaterial_Files})

ADD_CUSTOM_TARGET(Material ALL
SOURCES ${Material_SRCS} ${Material_QRC_SRCS}
)
Expand All @@ -46,13 +54,20 @@ ENDIF (BUILD_GUI)
ADD_CUSTOM_TARGET(MaterialLib ALL
SOURCES ${MaterialLib_Files}
)
ADD_CUSTOM_TARGET(FluidMaterialLib ALL
SOURCES ${FluidMaterial_Files}
)

# When a target copies files to different output directories then apparently it always builds the project
# which is very annoying. So, the trick is to split this into two targets to avoid this behaviour.
fc_target_copy_resource(MaterialLib
${CMAKE_SOURCE_DIR}/src/Mod/Material
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material
${MaterialLib_Files})
fc_target_copy_resource(FluidMaterialLib
${CMAKE_SOURCE_DIR}/src/Mod/Material
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material
${FluidMaterial_Files})

INSTALL(
FILES ${Material_SRCS} ${Material_QRC_SRCS}
Expand All @@ -62,6 +77,8 @@ INSTALL(
INSTALL(
DIRECTORY
StandardMaterial
DIRECTORY
FluidMaterial
DESTINATION
${CMAKE_INSTALL_DATADIR}/Mod/Material
FILES_MATCHING PATTERN "*.FCMat*"
Expand Down
15 changes: 15 additions & 0 deletions src/Mod/Material/FluidMaterial/Air.FCMat
@@ -0,0 +1,15 @@
[FCMat]
Name = Air
Description = Standard air properties at 20 Degrees Celsius and 1 atm
MolarMass = 28.965

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 = 0.7

SpecificHeat = 1.005 J/kg/K
ThermalConductivity = 0.0257 W/m/K

12 changes: 12 additions & 0 deletions src/Mod/Material/FluidMaterial/None.FCMat
@@ -0,0 +1,12 @@
[FCdMat]
Name = None
Description = None

Density = 0 kg/m^3
DynamicViscosity = 0 kg/m/s
KinematicViscosity = 0 m^2/s
VolumetricExpansionCoefficient = 0 m/m/K

SpecificHeat = 0 J/kg/K
ThermalConductivity = 0 W/m/K
ThermalExpansionCoefficient = 0 um/m/K
7 changes: 7 additions & 0 deletions src/Mod/Material/FluidMaterial/Readme.txt
@@ -0,0 +1,7 @@
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

14 changes: 14 additions & 0 deletions src/Mod/Material/FluidMaterial/Water.FCMat
@@ -0,0 +1,14 @@
[FCdMat]
Name = Water
Description = Standard distilled water properties at 20 Degrees Celsius and 1 atm
MolarMass = 18

Density = 998 kg/m^3
DynamicViscosity = 1.003e-3 kg/m/s
KinematicViscosity = 1.005 m^2/s

VolumetricExpansionCoefficient = 2.07e-4 m/m/K

SpecificHeat = 4.182 J/kg/K
ThermalConductivity = 0.591 W/m/K

0 comments on commit 8252616

Please sign in to comment.