From c29f76ed56525b2279b1ef79079309787fc1f51e Mon Sep 17 00:00:00 2001 From: apearce Date: Fri, 2 Aug 2024 15:53:17 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20remove=20sig=5Ftf=5Ft=20from?= =?UTF-8?q?=20radial=20part=20of=20the=20tresca=20stress=20calc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 31860c0a25..da95fb79b7 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -4255,7 +4255,7 @@ def stresscl( # ----------------------------- # Array equation sig_tf_tresca_tmp1 = numpy.maximum( - numpy.absolute(sig_tf_r - sig_tf_t), numpy.absolute(sig_tf_r - sig_tf_z) + numpy.absolute(sig_tf_r), numpy.absolute(sig_tf_r - sig_tf_z) ) sig_tf_tresca = numpy.maximum( sig_tf_tresca_tmp1, numpy.absolute(sig_tf_z - sig_tf_t) From 5fccb979f2f46215458f3e67f5cb6bb1dc6f9004 Mon Sep 17 00:00:00 2001 From: apearce Date: Mon, 5 Aug 2024 15:25:47 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20rewrite=20tresca=20stress=20?= =?UTF-8?q?calc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index da95fb79b7..1320644126 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -4254,11 +4254,8 @@ def stresscl( # Tresca / Von Mises yield criteria calculations # ----------------------------- # Array equation - sig_tf_tresca_tmp1 = numpy.maximum( - numpy.absolute(sig_tf_r), numpy.absolute(sig_tf_r - sig_tf_z) - ) sig_tf_tresca = numpy.maximum( - sig_tf_tresca_tmp1, numpy.absolute(sig_tf_z - sig_tf_t) + numpy.absolute(sig_tf_r - sig_tf_z), numpy.absolute(sig_tf_z - sig_tf_t) ) # Array equation