Making it easier to define orthotropic properties using MaterialPrope…

…rties class (#252)

* Fixing kappa init bug in MaterialProperties

* Generalizing orthotropic check in MaterialProperties

* Fixing incorrect cte kwarg in multiple places for MaterialProperties

* More cte fixes

examples/fuselage/composite_setup.py

@@ -44,7 +44,7 @@ def elemCallBack(dvNum, compID, compDescript, elemDescripts, globalDVs, **kwargs
         Yt=Yt,
         Yc=Yc,
         S12=S12,
-        cte=cte,
+        alpha=cte,
         kappa=kappa,
     )
 

src/constitutive/TACSMaterialProperties.cpp

@@ -113,6 +113,10 @@ TACSMaterialProperties::TACSMaterialProperties(
   alpha1 = _alpha1;
   alpha2 = _alpha2;
   alpha3 = _alpha3;
+
+  kappa1 = _kappa1;
+  kappa2 = _kappa2;
+  kappa3 = _kappa3;
 }
 
 // Get the material type

tacs/constitutive.pyx

@@ -215,6 +215,14 @@ cdef class MaterialProperties:
         cdef TacsScalar kappa2 = 230.0
         cdef TacsScalar kappa3 = 230.0
 
+        ISOTROPIC_KEYS = ["rho", "E", "nu", "G", "ys", "alpha", "specific_heat", "kappa"]
+
+        # Check if any input provided in kwargs was orthotropic
+        if any(input_key not in ISOTROPIC_KEYS for input_key in kwargs):
+            is_orthotropic = True
+        else:
+            is_orthotropic = False
+
         if 'rho' in kwargs:
             rho = kwargs['rho']
         if 'specific_heat' in kwargs:
@@ -313,7 +321,7 @@ cdef class MaterialProperties:
         if 'kappa3' in kwargs:
             kappa3 = kwargs['kappa3']
 
-        if 'E1' in kwargs:
+        if is_orthotropic:
             self.ptr = new TACSMaterialProperties(rho, specific_heat, E1, E2, E3,
                                                   nu12, nu13, nu23, G12, G13, G23,
                                                   T1, C1, T2, C2, T3, C3, S12, S13, S23,

tests/constitutive_tests/test_basic_beam_constitutive.py

@@ -42,7 +42,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/constitutive_tests/test_blade_sitffened_shell_constitutive.py

@@ -95,7 +95,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         iso_ply = constitutive.OrthotropicPly(1e-3, iso_prop)
@@ -129,7 +129,7 @@ def setUp(self):
             Yt=Yt,
             Yc=Yc,
             S12=S12,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         ortho_ply = constitutive.OrthotropicPly(1e-3, ortho_prop)

tests/constitutive_tests/test_composite_shell_constitutive.py

@@ -47,7 +47,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         iso_ply = constitutive.OrthotropicPly(ply_thickness, iso_prop)
@@ -82,7 +82,7 @@ def setUp(self):
             Yt=Yt,
             Yc=Yc,
             S12=S12,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         ortho_ply = constitutive.OrthotropicPly(ply_thickness, ortho_prop)

tests/constitutive_tests/test_iso_rectangle_beam_constitutive.py

@@ -42,7 +42,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         t = 0.1

tests/constitutive_tests/test_iso_shell_constitutive.py

@@ -41,7 +41,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/constitutive_tests/test_iso_tube_beam_constitutive.py

@@ -42,7 +42,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         t = 0.1

tests/constitutive_tests/test_plane_stress_constitutive.py

@@ -41,7 +41,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/constitutive_tests/test_smeared_composite_shell_constitutive.py

@@ -44,7 +44,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         iso_ply = constitutive.OrthotropicPly(thickness, iso_prop)
@@ -79,7 +79,7 @@ def setUp(self):
             Yt=Yt,
             Yc=Yc,
             S12=S12,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         ortho_ply = constitutive.OrthotropicPly(thickness, ortho_prop)

tests/constitutive_tests/test_solid_constitutive.py

@@ -41,7 +41,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_beam_centrifugal_force.py

@@ -57,7 +57,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_beam_element.py

@@ -51,7 +51,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_beam_inertial_force.py

@@ -56,7 +56,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_beam_traction.py

@@ -56,7 +56,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_shell_centrifugal_force.py

@@ -58,7 +58,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_shell_element.py

@@ -51,7 +51,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_shell_inertial_force.py

@@ -56,7 +56,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_shell_pressure.py

@@ -56,7 +56,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/shell_tests/test_shell_traction.py

@@ -56,7 +56,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_centrifugal_force_3d.py

@@ -54,7 +54,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_element_2d.py

@@ -50,7 +50,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_element_3d.py

@@ -50,7 +50,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_heat_conduction_2d.py

@@ -37,7 +37,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_heat_conduction_3d.py

@@ -37,7 +37,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_inertial_force_2d.py

@@ -53,7 +53,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_inertial_force_3d.py

@@ -53,7 +53,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_linear_elasticity_2d.py

@@ -37,7 +37,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_linear_elasticity_3d.py

@@ -37,7 +37,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_linear_thermoelasticity_2d.py

@@ -36,7 +36,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_linear_thermoelasticity_3d.py

@@ -37,7 +37,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_pressure_2d.py

@@ -55,7 +55,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_pressure_3d.py

@@ -55,7 +55,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_traction_2d.py

@@ -55,7 +55,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/element_tests/test_traction_3d.py

@@ -55,7 +55,7 @@ def setUp(self):
             E=E,
             nu=nu,
             ys=ys,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/integration_tests/test_shell_beam_comp.py

@@ -81,7 +81,7 @@ def setup_assembler(self, comm, dtype):
             Yt=Yt,
             Yc=Yc,
             S12=S12,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
 

tests/integration_tests/test_shell_comp_smeared.py

@@ -88,7 +88,7 @@ def setup_tacs_problems(self, comm):
             Yt=Yt,
             Yc=Yc,
             S12=S12,
-            cte=cte,
+            alpha=cte,
             kappa=kappa,
         )
         ortho_ply = constitutive.OrthotropicPly(ply_thickness, ortho_prop)