From 57a0acffc03235b01c4ef33ea2b7049593dd8266 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Thu, 14 Feb 2019 07:37:59 +0100
Subject: [PATCH] Units: add various Material stress properties

---
 src/App/FreeCADInit.py | 10 ++++++++--
 src/Base/Unit.cpp      | 10 ++++++++--
 src/Base/Unit.h        |  9 ++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py
index 7d391edd32..900f0a6b5b 100644
--- a/src/App/FreeCADInit.py
+++ b/src/App/FreeCADInit.py
@@ -351,8 +351,14 @@ App.Units.ElectricPotential = App.Units.Unit(2,1,-3,-1)
 App.Units.AmountOfSubstance = App.Units.Unit(0,0,0,0,0,1)
 App.Units.LuminousIntensity = App.Units.Unit(0,0,0,0,0,0,1)
 
-App.Units.Stress        = App.Units.Unit(-1,1,-2) 
-App.Units.Pressure      = App.Units.Unit(-1,1,-2) 
+# Pressure
+App.Units.CompressiveStrength     = App.Units.Unit(-1,1,-2)
+App.Units.Pressure                = App.Units.Unit(-1,1,-2)
+App.Units.ShearModulus            = App.Units.Unit(-1,1,-2)
+App.Units.Stress                  = App.Units.Unit(-1,1,-2)
+App.Units.UltimateTensileStrength = App.Units.Unit(-1,1,-2)
+App.Units.YieldStrength           = App.Units.Unit(-1,1,-2)
+App.Units.YoungsModulus           = App.Units.Unit(-1,1,-2)
 
 App.Units.Force         = App.Units.Unit(1,1,-2) 
 App.Units.Work          = App.Units.Unit(2,1,-2) 
diff --git a/src/Base/Unit.cpp b/src/Base/Unit.cpp
index cc2872938c..8cca625a82 100644
--- a/src/Base/Unit.cpp
+++ b/src/Base/Unit.cpp
@@ -474,8 +474,14 @@ Unit Unit::ElectricPotential(2,1,-3,-1);
 Unit Unit::AmountOfSubstance(0,0,0,0,0,1);
 Unit Unit::LuminousIntensity(0,0,0,0,0,0,1);
 
-Unit Unit::Stress  (-1,1,-2);  // kg/m*s^2 or N/m^2 or PSI
-Unit Unit::Pressure(-1,1,-2);  // kg/m*s^2 or N/m^2 or PSI
+// Pressure, kg/m*s^2 or N/m^2 or PSI or MPa
+Unit Unit::CompressiveStrength     (-1,1,-2);
+Unit Unit::Pressure                (-1,1,-2);
+Unit Unit::ShearModulus            (-1,1,-2);
+Unit Unit::Stress                  (-1,1,-2);
+Unit Unit::UltimateTensileStrength (-1,1,-2);
+Unit Unit::YieldStrength           (-1,1,-2);
+Unit Unit::YoungsModulus           (-1,1,-2);
 
 Unit Unit::Force   (1,1,-2);
 Unit Unit::Work    (2,1,-2);
diff --git a/src/Base/Unit.h b/src/Base/Unit.h
index d4d822c3f4..6f9eb49d07 100644
--- a/src/Base/Unit.h
+++ b/src/Base/Unit.h
@@ -109,8 +109,15 @@ public:
     static Unit AmountOfSubstance;
     static Unit LuminousIntensity;
 
-    static Unit Stress;
+    // Pressure
+    static Unit CompressiveStrength;
     static Unit Pressure;
+    static Unit ShearModulus;
+    static Unit Stress;
+    static Unit UltimateTensileStrength;
+    static Unit YieldStrength;
+    static Unit YoungsModulus;
+
     static Unit Force;
     static Unit Work;
     static Unit Power;