Minor update

TLCFEM · Sep 18, 2024 · 1d2c3ab · 1d2c3ab
1 parent b1c0e0c
commit 1d2c3ab
Show file tree

Hide file tree

Showing 8 changed files with 2,472 additions and 6,061 deletions.
diff --git a/Include/catch/catch_amalgamated.cpp b/Include/catch/catch_amalgamated.cpp
diff --git a/Include/catch/catch_amalgamated.hpp b/Include/catch/catch_amalgamated.hpp
diff --git a/Material/Material1D/vonMises/ArmstrongFrederick1D.cpp b/Material/Material1D/vonMises/ArmstrongFrederick1D.cpp
@@ -17,8 +17,6 @@
 
 #include "ArmstrongFrederick1D.h"
 
-#include <Recorder/OutputType.h>
-
 ArmstrongFrederick1D::ArmstrongFrederick1D(const unsigned T, DataArmstrongFrederick1D&& D, const double R)
     : DataArmstrongFrederick1D(std::move(D))
     , Material1D(T, R) {}
@@ -86,10 +84,8 @@ int ArmstrongFrederick1D::update_trial_status(const vec& t_strain) {
 
         jacobian = -elastic_modulus - dk;
 
-        if(xi > 0.)
-            for(auto I = 0u; I < size; ++I) jacobian += (b(I) * trial_history(I) - a(I)) * pow(1. + b(I) * gamma, -2.);
-        else
-            for(auto I = 0u; I < size; ++I) jacobian -= (b(I) * trial_history(I) + a(I)) * pow(1. + b(I) * gamma, -2.);
+        if(xi > 0.) for(auto I = 0u; I < size; ++I) jacobian += (b(I) * trial_history(I) - a(I)) * pow(1. + b(I) * gamma, -2.);
+        else for(auto I = 0u; I < size; ++I) jacobian -= (b(I) * trial_history(I) + a(I)) * pow(1. + b(I) * gamma, -2.);
 
         const auto incre = yield_func / jacobian;
         const auto error = fabs(incre);

diff --git a/Material/Material1D/vonMises/VAFCRP1D.cpp b/Material/Material1D/vonMises/VAFCRP1D.cpp
@@ -18,7 +18,6 @@
 #include "VAFCRP1D.h"
 #include <Domain/DomainBase.h>
 #include <Domain/Factory.hpp>
-#include <Recorder/OutputType.h>
 
 constexpr double VAFCRP1D::unit_time = 1.;
 

diff --git a/Material/Material3D/vonMises/ArmstrongFrederick.cpp b/Material/Material3D/vonMises/ArmstrongFrederick.cpp
@@ -16,7 +16,6 @@
  ******************************************************************************/
 
 #include "ArmstrongFrederick.h"
-#include <Recorder/OutputType.h>
 #include <Toolbox/tensor.h>
 
 const double ArmstrongFrederick::root_three_two = sqrt(1.5);

diff --git a/Material/Material3D/vonMises/BilinearJ2.cpp b/Material/Material3D/vonMises/BilinearJ2.cpp
@@ -16,7 +16,6 @@
  ******************************************************************************/
 
 #include "BilinearJ2.h"
-#include <Recorder/OutputType.h>
 #include <Toolbox/tensor.h>
 
 constexpr double BilinearJ2::two_third = 2. / 3.;

diff --git a/Material/Material3D/vonMises/NonlinearJ2.cpp b/Material/Material3D/vonMises/NonlinearJ2.cpp
@@ -16,7 +16,6 @@
  ******************************************************************************/
 
 #include "NonlinearJ2.h"
-#include <Recorder/OutputType.h>
 #include <Toolbox/tensor.h>
 
 const double NonlinearJ2::root_two_third = sqrt(two_third);

diff --git a/Material/Material3D/vonMises/VAFCRP.cpp b/Material/Material3D/vonMises/VAFCRP.cpp
@@ -18,7 +18,6 @@
 #include "VAFCRP.h"
 #include <Domain/DomainBase.h>
 #include <Domain/Factory.hpp>
-#include <Recorder/OutputType.h>
 #include <Toolbox/tensor.h>
 
 const double VAFCRP::root_three_two = sqrt(1.5);