Merge pull request #601 from DLR-SL/develop

merge develop into master for 3.1 release
DLR-SL · Aug 26, 2019 · abaf240 · abaf240
2 parents b3b7fde + 82b97fa
commit abaf240
Show file tree

Hide file tree

Showing 22 changed files with 44,222 additions and 62,282 deletions.
diff --git a/development/release.md b/development/release.md
@@ -15,11 +15,9 @@ The release process is grouped into the following steps:
 
 ## 1. Create documentation                 --> createDocumentation.bat
 
-## 2. Create dummy file
-
-## 3. Create libraries                     --> generateLibraries.bat
+## 2. Create libraries                     --> generateLibraries.bat
 
 Currently, CPACS is supported by TIXI and TIGL as interfaces to CPACS. Additionally, there is the possibility to create bindings for other languages as well. This becomes especially handy once users try to generate CPACS files. Within the CPACS release schedule two binding will be generated: Python and Java. The Python bindings are created using the generateDS library; Java bindings via JAXB, see the tools section. Both calls are listed in the generateLibraries batch file. 
 
-## 4. Upload files 
+## 3. Upload files 
 tbd
diff --git a/documentation/Cpacs_doc_project.shfbproj b/documentation/Cpacs_doc_project.shfbproj
@@ -45,8 +45,8 @@
     <MissingTags>Summary, Parameter, Returns, Remarks, AutoDocumentCtors, Namespace, TypeParameter</MissingTags>
     <CopyrightHref>
     </CopyrightHref>
-    <CopyrightText>%28c%29 2018 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</CopyrightText>
-    <FeedbackEMailAddress>jonas.jepsen%40dlr.de</FeedbackEMailAddress>
+    <CopyrightText>%28c%29 2019 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</CopyrightText>
+    <FeedbackEMailAddress>marko.alder%40dlr.de</FeedbackEMailAddress>
     <FeedbackEMailLinkText>
     </FeedbackEMailLinkText>
     <HeaderText>
@@ -330,6 +330,44 @@
       <AlternateText>paramam Sbot wing Ansys Lc</AlternateText>
     </Image>
   </ItemGroup>
+  <ItemGroup>
+	<Image Include="equations\stress_strain_anisotropicSolid.png">
+	  <ImageId>stress_strain_anisotropicSolid</ImageId>
+	  <AlternateText>stress_strain_anisotropicSolid</AlternateText>
+	</Image>
+	<Image Include="equations\stress_strain_anisotropicShell.png">
+	  <ImageId>stress_strain_anisotropicShell</ImageId>
+	  <AlternateText>stress_strain_anisotropicShell</AlternateText>
+	</Image>
+	<Image Include="equations\G_E_nu_relation.png">
+	  <ImageId>G_E_nu_relation</ImageId>
+	  <AlternateText>G= \frac{E}{2(1+\nu)}</AlternateText>
+	</Image>
+	<Image Include="equations\strain_stress_orthotropicSolid.png">
+	  <ImageId>strain_stress_orthotropicSolid</ImageId>
+	  <AlternateText>strain_stress_orthotropicSolid</AlternateText>
+	</Image>
+	<Image Include="equations\nu_E_othotropicMaterial.png">
+	  <ImageId>nu_E_othotropicMaterial</ImageId>
+	  <AlternateText>nu_E_othotropicMaterial</AlternateText>
+	</Image>
+	<Image Include="equations\strain_stress_orthotropicShell.png">
+	  <ImageId>strain_stress_orthotropicShell</ImageId>
+	  <AlternateText>strain_stress_orthotropicShell</AlternateText>
+	</Image>
+	<Image Include="equations\stress_strain_orthotropicShell.png">
+	  <ImageId>stress_strain_orthotropicShell</ImageId>
+	  <AlternateText>stress_strain_orthotropicShell</AlternateText>
+	</Image>
+	<Image Include="equations\Q_EngineeringConstants_orthotropicShell.png">
+	  <ImageId>Q_EngineeringConstants_orthotropicShell</ImageId>
+	  <AlternateText>Q_EngineeringConstants_orthotropicShell</AlternateText>
+	</Image>
+	<Image Include="material_coordinates.png">
+	  <ImageId>material_coordinates</ImageId>
+	  <AlternateText>material_coordinates</AlternateText>
+	</Image>
+  </ItemGroup>
   <!-- Import the SHFB build targets -->
   <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
 </Project>
diff --git a/documentation/equations/G_E_nu_relation.png b/documentation/equations/G_E_nu_relation.png
diff --git a/documentation/equations/Q_EngineeringConstants_orthotropicShell.png b/documentation/equations/Q_EngineeringConstants_orthotropicShell.png
diff --git a/documentation/equations/Q_EngineeringConstants_orthotropicShell.tex b/documentation/equations/Q_EngineeringConstants_orthotropicShell.tex
@@ -0,0 +1,5 @@
+Q_{11}=\frac{E_1}{1-\nu_{12}\nu_{21}} \; , \quad
+Q_{22}=\frac{E_2}{1-\nu_{12}\nu_{21}} \; , \quad
+\newline
+Q_{12}=\frac{\nu_{12} E_2}{1-\nu_{12}\nu_{21}} = \frac{\nu_{21} E_1}{1-\nu_{12}\nu_{21}} \; , \quad
+Q_{33}=G_{12}
diff --git a/documentation/equations/nu_E_othotropicMaterial.png b/documentation/equations/nu_E_othotropicMaterial.png
diff --git a/documentation/equations/nu_E_othotropicMaterial.tex b/documentation/equations/nu_E_othotropicMaterial.tex
@@ -0,0 +1 @@
+\frac{\nu_{ij}}{E_i}=\frac{\nu_{ji}}{E_j}
diff --git a/documentation/equations/strain_stress_orthotropicShell.png b/documentation/equations/strain_stress_orthotropicShell.png
diff --git a/documentation/equations/strain_stress_orthotropicShell.tex b/documentation/equations/strain_stress_orthotropicShell.tex
@@ -0,0 +1,20 @@
+\begin{pmatrix}
+\varepsilon_1 \\ 
+\varepsilon_2 \\ 
+\gamma_{12}
+\end{pmatrix}
+
+= 
+
+\begin{bmatrix}
+\frac{1}{E_1} & -\frac{\nu_{21}}{E_2} & 0  \\ 
+-\frac{\nu_{12}}{E_1}&  \frac{1}{E_2} & 0  \\ 
+0 & 0 &  \frac{1}{G_{12}}  \\
+
+\end{bmatrix}
+
+\begin{pmatrix}
+\sigma_1 \\ 
+\sigma_2 \\ 
+\tau_{12}
+\end{pmatrix}
diff --git a/documentation/equations/strain_stress_orthotropicSolid.png b/documentation/equations/strain_stress_orthotropicSolid.png
diff --git a/documentation/equations/strain_stress_orthotropicSolid.tex b/documentation/equations/strain_stress_orthotropicSolid.tex
@@ -0,0 +1,30 @@
+\begin{pmatrix}
+\varepsilon_1 \\ 
+\varepsilon_2 \\ 
+\varepsilon_3 \\ 
+\gamma_{23} \\ 
+\gamma_{31} \\ 
+\gamma_{12}
+\end{pmatrix}
+
+
+
+= 
+
+\begin{bmatrix}
+\frac{1}{E_1} & -\frac{\nu_{21}}{E_2} & -\frac{\nu_{31}}{E_3} & 0 & 0 & 0 \\ 
+-\frac{\nu_{12}}{E_1}&  \frac{1}{E_2} & -\frac{\nu_{32}}{E_3} & 0 & 0 & 0 \\ 
+-\frac{\nu_{13}}{E_1}& -\frac{\nu_{23}}{E_2} &  \frac{1}{E_3} & 0 & 0 & 0 \\
+   0    &     0   &   0     & \frac{1}{G_{23}} & 0 & 0 \\ 
+   0    &     0   &   0     & 0 & \frac{1}{G_{31}} & 0 \\ 
+   0    &     0   &   0     & 0 & 0 & \frac{1}{G_{12}} \\ 
+\end{bmatrix}
+
+\begin{pmatrix}
+\sigma_1 \\ 
+\sigma_2 \\ 
+\sigma_3 \\ 
+\tau_{23}\\ 
+\tau_{31}\\ 
+\tau_{12}
+\end{pmatrix}
diff --git a/documentation/equations/stress_strain_anisotropicShell.png b/documentation/equations/stress_strain_anisotropicShell.png
diff --git a/documentation/equations/stress_strain_anisotropicShell.tex b/documentation/equations/stress_strain_anisotropicShell.tex
@@ -0,0 +1,30 @@
+\begin{pmatrix}
+\sigma_1 \\ 
+\sigma_2 \\ 
+\tau_{12}
+\end{pmatrix}
+
+= 
+
+\begin{bmatrix}
+Q_{11} & Q_{12} & Q_{13}  \\ 
+       & Q_{22} & Q_{23}  \\ 
+ \text{symm.}   &        & Q_{33}
+\end{bmatrix}
+
+\left(
+\begin{pmatrix}
+\varepsilon_1 \\ 
+\varepsilon_2 \\ 
+\gamma_{12}
+\end{pmatrix}
+-
+\left( T - T_{\text{ref}} \right )
+
+\begin{pmatrix}
+\text{thermalExpansionCoeff}_1 \\ 
+\text{thermalExpansionCoeff}_2 \\ 
+\text{thermalExpansionCoeff}_{12}
+\end{pmatrix}
+
+\right )
diff --git a/documentation/equations/stress_strain_anisotropicSolid.png b/documentation/equations/stress_strain_anisotropicSolid.png
diff --git a/documentation/equations/stress_strain_anisotropicSolid.tex b/documentation/equations/stress_strain_anisotropicSolid.tex
@@ -0,0 +1,42 @@
+\begin{pmatrix}
+\sigma_1 \\ 
+\sigma_2 \\ 
+\sigma_3 \\ 
+\tau_{23}\\ 
+\tau_{31}\\ 
+\tau_{12}
+\end{pmatrix}
+
+= 
+
+\begin{bmatrix}
+C_{11} & C_{12} & C_{13} & C_{14} & C_{15} & C_{16} \\ 
+       & C_{22} & C_{23} & C_{24} & C_{25} & C_{26} \\ 
+       &        & C_{33} & C_{34} & C_{35} & C_{36} \\ 
+       &        &        & C_{44} & C_{45} & C_{46} \\ 
+       &   \text{symm.}  &        &        & C_{55} & C_{56} \\ 
+       &        &        &        &        & C_{66} 
+\end{bmatrix}
+
+\left(
+\begin{pmatrix}
+\varepsilon_1 \\ 
+\varepsilon_2 \\ 
+\varepsilon_3 \\ 
+\gamma_{23} \\ 
+\gamma_{31} \\ 
+\gamma_{12}
+\end{pmatrix}
+-
+\left( T - T_{\text{ref}} \right )
+
+\begin{pmatrix}
+\text{thermalExpansionCoeff}_1 \\ 
+\text{thermalExpansionCoeff}_2 \\ 
+\text{thermalExpansionCoeff}_3 \\ 
+\text{thermalExpansionCoeff}_{23} \\ 
+\text{thermalExpansionCoeff}_{31} \\ 
+\text{thermalExpansionCoeff}_{12}
+\end{pmatrix}
+
+\right )
diff --git a/documentation/equations/stress_strain_orthotropicShell.png b/documentation/equations/stress_strain_orthotropicShell.png
diff --git a/documentation/equations/stress_strain_orthotropicShell.tex b/documentation/equations/stress_strain_orthotropicShell.tex
@@ -0,0 +1,33 @@
+\begin{pmatrix}
+\sigma_1 \\ 
+\sigma_2 \\ 
+\tau_{12}
+\end{pmatrix}
+
+= 
+
+\begin{bmatrix}
+Q_{11} & Q_{12} & 0  \\ 
+Q_{12}&  Q_{22} & 0  \\ 
+0 & 0 &  Q_{33}  \\
+\end{bmatrix}
+
+\left( 
+\begin{pmatrix}
+\varepsilon_1 \\ 
+\varepsilon_2 \\ 
+\gamma_{12}
+\end{pmatrix}
+
+-
+\left( T - T_{\text{ref}} \right )
+
+\begin{pmatrix}
+\text{thermalExpansionCoeff}_1 \\ 
+\text{thermalExpansionCoeff}_2 \\ 
+0 \\ 
+
+\end{pmatrix}
+
+
+\right )
diff --git a/documentation/material_coordinates.png b/documentation/material_coordinates.png