Merge pull request #484 from llnl/tinyChanges

Fixed typo in ShadowIvanoviSALEDamageModel.py file and added guard to JohnsonCookStrength

Author: jmikeowen

src/Damage/ShadowIvanoviSALEDamageModel.py

@@ -118,7 +118,7 @@ def __init__(self, *args, **kwargs):
                            "criticalDamageThreshold",
                            "mask"]
             for iarg, argval in enumerate(args):
-                damage_kwargs[kward_order[iarg]] = argval
+                damage_kwargs[kwarg_order[iarg]] = argval
 
             # Process any keyword arguments.  Note we already removed any deprecated keywords.
             for argname in kwargs:

src/SolidMaterial/JohnsonCookStrength.cc

@@ -47,6 +47,8 @@ JohnsonCookStrength(const SolidEquationOfState<Dimension>& eos,
   mShearModulusScaling(shearModulusScaling) {
   VERIFY2(mEpsdot0 > 0.0,
           "JohnsonCookStrength ERROR: reference strain-rate must be greater than zero.");
+  VERIFY2(mEpsdotmin > 0.0,
+          "JohnsonCookStrength ERROR: minimum strain-rate must be greater than zero.");
   VERIFY2(mTmelt > mTroom,
           "JohnsonCookStrength ERROR: Tmelt must be greater than or equal Troom.");
   VERIFY2((not shearModulusScaling) or mu0 > 0.0,