Merge pull request #68 from UCBoulder/dev

Release: 0.4.1
UCBoulder · Jan 25, 2024 · dce1288 · dce1288
2 parents e2d4f7d + 50ab0c5
commit dce1288
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 15 deletions.
diff --git a/docs/sphinx/changelog.rst b/docs/sphinx/changelog.rst
@@ -6,11 +6,23 @@ Changelog
 #########
 
 ******************
-0.4.1 (unreleased)
+0.4.2 (unreleased)
 ******************
 
 ******************
-0.4.0 (01-24-2023)
+0.4.1 (01-24-2024)
+******************
+
+Release
+=======
+- Released version (:pull:`68`). By `Nathan Miller`_.
+
+Internal Changes
+================
+- Removed unused variables (:pull:`67`). By `Nathan Miller`_.
+
+******************
+0.4.0 (01-24-2024)
 ******************
 
 Release
@@ -41,7 +53,7 @@ Bug Fixes
 - Changed the plastic-multiplier residual so that it will attempt to force the plastic multipliers to be positive (:pull:`64`). By `Nathan Miller`_.
 
 ******************
-0.3.1 (01-19-2023)
+0.3.1 (01-19-2024)
 ******************
 
 Release
@@ -73,7 +85,7 @@ Internal Changes
 - Added the residuals and jacobians of the state variables (:pull:`51`). By `Nathan Miller`_.
 
 ******************
-0.3.0 (01-03-2023)
+0.3.0 (01-03-2024)
 ******************
 
 Release

diff --git a/src/cpp/tardigrade_hydraMicromorphicDruckerPragerPlasticity.cpp b/src/cpp/tardigrade_hydraMicromorphicDruckerPragerPlasticity.cpp
@@ -7668,10 +7668,10 @@ namespace tardigradeHydra{
             floatVector residual( get_plasticStateVariables( )->size( ), 0 );
 
             floatType macroMac  = tardigradeConstitutiveTools::mac( *macroYield );
-            floatType nMacroMac = tardigradeConstitutiveTools::mac( -( *macroYield ) );
+            tardigradeConstitutiveTools::mac( -( *macroYield ) );
 
             floatType microMac  = tardigradeConstitutiveTools::mac( *microYield );
-            floatType nMicroMac = tardigradeConstitutiveTools::mac( -( *microYield ) );
+            tardigradeConstitutiveTools::mac( -( *microYield ) );
 
             floatVector microGradientMac( microGradientYield->size( ), 0 );
             floatVector nMicroGradientMac( microGradientYield->size( ), 0 );
@@ -7684,10 +7684,10 @@ namespace tardigradeHydra{
             if ( *useWeakenedMacaulay( ) ){
 
                 macroMac  = weakMac( *macroYield, *getWeakenedMacaulayParameter( ) );
-                nMacroMac = weakMac( -( *macroYield ), *getWeakenedMacaulayParameter( ) );
+                weakMac( -( *macroYield ), *getWeakenedMacaulayParameter( ) );
 
                 microMac  = weakMac( *microYield, *getWeakenedMacaulayParameter( ) );
-                nMicroMac = weakMac( -( *microYield ), *getWeakenedMacaulayParameter( ) );
+                weakMac( -( *microYield ), *getWeakenedMacaulayParameter( ) );
 
                 macNegMacroGamma = weakMac( -( *plasticMultipliers )[ 0 ] , *getWeakenedMacaulayParameter( ) );
                 macNegMicroGamma = weakMac( -( *plasticMultipliers )[ 1 ] , *getWeakenedMacaulayParameter( ) );
@@ -7702,10 +7702,10 @@ namespace tardigradeHydra{
             else{
 
                 macroMac  = tardigradeConstitutiveTools::mac( *macroYield );
-                nMacroMac = tardigradeConstitutiveTools::mac( -( *macroYield ) );
+                tardigradeConstitutiveTools::mac( -( *macroYield ) );
 
                 microMac  = tardigradeConstitutiveTools::mac( *microYield );
-                nMicroMac = tardigradeConstitutiveTools::mac( -( *microYield ) );
+                tardigradeConstitutiveTools::mac( -( *microYield ) );
 
                 macNegMacroGamma = tardigradeConstitutiveTools::mac( -( *plasticMultipliers )[ 0 ] );
                 macNegMicroGamma = tardigradeConstitutiveTools::mac( -( *plasticMultipliers )[ 1 ] );
@@ -7811,7 +7811,7 @@ namespace tardigradeHydra{
 
             // Stress Jacobians
             floatType dMacroMacdx, dMicroMacdx;
-            floatType nMacroMac, ndMacroMacdx, nMicroMac, ndMicroMacdx;
+            floatType ndMacroMacdx, ndMicroMacdx;
 
             floatVector microGradientMac( numPlasticMultipliers - 2 );
             floatVector dMicroGradientMacdx( numPlasticMultipliers - 2 );
@@ -7830,9 +7830,9 @@ namespace tardigradeHydra{
 
                 weakMac( *microYield, *getWeakenedMacaulayParameter( ), dMicroMacdx );
 
-                nMacroMac = weakMac( -( *macroYield ), *getWeakenedMacaulayParameter( ), ndMacroMacdx );
+                weakMac( -( *macroYield ), *getWeakenedMacaulayParameter( ), ndMacroMacdx );
 
-                nMicroMac = weakMac( -( *microYield ), *getWeakenedMacaulayParameter( ), ndMicroMacdx );
+                weakMac( -( *microYield ), *getWeakenedMacaulayParameter( ), ndMicroMacdx );
 
                 weakMac( -( *plasticMultipliers )[ 0 ], *getWeakenedMacaulayParameter( ), dMacNegMacroGammadGamma );
 
@@ -7855,9 +7855,9 @@ namespace tardigradeHydra{
 
                 tardigradeConstitutiveTools::mac( *microYield, dMicroMacdx );
 
-                nMacroMac = tardigradeConstitutiveTools::mac( -( *macroYield ), ndMacroMacdx );
+                tardigradeConstitutiveTools::mac( -( *macroYield ), ndMacroMacdx );
 
-                nMicroMac = tardigradeConstitutiveTools::mac( -( *microYield ), ndMicroMacdx );
+                tardigradeConstitutiveTools::mac( -( *microYield ), ndMicroMacdx );
 
                 tardigradeConstitutiveTools::mac( -( *plasticMultipliers )[ 0 ], dMacNegMacroGammadGamma );