From 5dfcfe1ccc21b5ba7c8f320a767b0842d41ef7d2 Mon Sep 17 00:00:00 2001
From: Dmitrij Naumov <dmitrij@naumov.de>
Date: Thu, 30 Aug 2018 16:52:35 +0200
Subject: [PATCH] [T] TM; Vectorial sigma/eps output.
---
.../CreepAfterExcavation.prj | 20 ++++---------------
.../SimpleAxisymmetricCreep.prj | 20 ++++---------------
...eAxisymmetricCreepWithAnalyticSolution.prj | 20 ++++---------------
Tests/Data/ThermoMechanics/cube_1e3.prj | 20 ++++---------------
.../iglu_axisymmetric_plane_strain.prj | 20 ++++---------------
.../iglu_axisymmetric_plane_strain_quad.prj | 20 ++++---------------
.../iglu_quarter_plane_strain.prj | 20 ++++---------------
.../iglu_quarter_plane_strain_quad.prj | 20 ++++---------------
8 files changed, 32 insertions(+), 128 deletions(-)
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
index f25851f5eaa..1e00e2049f1 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -33,14 +33,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 -9.81</specific_body_force>
</process>
@@ -61,14 +55,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
index e7752f3824a..24c6dceb0da 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
@@ -29,14 +29,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
</process>
@@ -57,14 +51,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
index 7c66a11b8bb..ac9ddd2a5c8 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
@@ -29,14 +29,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
</process>
@@ -57,14 +51,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
diff --git a/Tests/Data/ThermoMechanics/cube_1e3.prj b/Tests/Data/ThermoMechanics/cube_1e3.prj
index 3373f1f04d1..b69fb7794d7 100644
--- a/Tests/Data/ThermoMechanics/cube_1e3.prj
+++ b/Tests/Data/ThermoMechanics/cube_1e3.prj
@@ -21,14 +21,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
</process>
@@ -49,14 +43,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
index 0c46219fe51..3c47888ff72 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
@@ -21,14 +21,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
</process>
@@ -49,14 +43,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
index 1b3497aa72c..92e216d176d 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
@@ -21,14 +21,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
</process>
@@ -49,14 +43,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
index e48dc31792d..52e17dcfe41 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
@@ -25,14 +25,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
</process>
@@ -53,14 +47,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
index b9033f35c96..e6bf0cbde15 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
@@ -25,14 +25,8 @@
<temperature>temperature</temperature>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
- <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
- <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
- <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
- <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
- <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
- <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
- <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
+ <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+ <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
</process>
@@ -53,14 +47,8 @@
<variables>
<variable>displacement</variable>
<variable>temperature</variable>
- <variable>sigma_xx</variable>
- <variable>sigma_yy</variable>
- <variable>sigma_zz</variable>
- <variable>sigma_xy</variable>
- <variable>epsilon_xx</variable>
- <variable>epsilon_yy</variable>
- <variable>epsilon_zz</variable>
- <variable>epsilon_xy</variable>
+ <variable>sigma</variable>
+ <variable>epsilon</variable>
</variables>
</output>
<time_stepping>
--
GitLab