diff --git a/src/cpp/tardigrade_hydra.cpp b/src/cpp/tardigrade_hydra.cpp index b7fb1fac..3db7f592 100644 --- a/src/cpp/tardigrade_hydra.cpp +++ b/src/cpp/tardigrade_hydra.cpp @@ -21,128 +21,6 @@ namespace tardigradeHydra{ /** \brief Define required number of Abaqus material constants for the Abaqus interface. */ const int nMaterialParameters = 2; - const floatVector* residualBase::getResidual( ){ - /*! - * Get the residual equations. Must be of size numEquations - */ - - if ( !_residual.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setResidual( ) ); - - } - - return &_residual.second; - - } - - const floatMatrix* residualBase::getJacobian( ){ - /*! - * Get the Jacobian matrix. Must be of size numEquations x numUnknowns - * numUnknowns is of the size numConfigurations * dim * dim + numNonLinearSolveStateVariables - */ - - if ( !_jacobian.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setJacobian( ) ); - - } - - return &_jacobian.second; - - } - - const floatMatrix* residualBase::getdRdF( ){ - /*! - * Get the derivative of the residual w.r.t. the deformation gradient - */ - - if ( !_dRdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdRdF( ) ); - - } - - return &_dRdF.second; - - } - - const floatVector* residualBase::getdRdT( ){ - /*! - * Get the derivative of the residual w.r.t. the temperature - */ - - if ( !_dRdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdRdT( ) ); - - } - - return &_dRdT.second; - - } - - const floatMatrix* residualBase::getAdditionalDerivatives( ){ - /*! - * Get the derivative of the residual w.r.t. additional terms - */ - - if ( !_additionalDerivatives.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setAdditionalDerivatives( ) ); - - } - - return &_additionalDerivatives.second; - - } - - const floatVector* residualBase::getStress( ){ - /*! - * Get the stress - */ - - if ( !_stress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setStress( ) ); - - } - - return &_stress.second; - - } - - const floatVector* residualBase::getPreviousStress( ){ - /*! - * Get the previous stress - */ - - if ( !_previousStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousStress( ) ); - - } - - return &_previousStress.second; - - } - - const floatVector* residualBase::getCurrentAdditionalStateVariables( ){ - /*! - * Get the updated additional state variables which don't require the - * hydra non-linear solve to find - */ - - if ( !_currentAdditionalStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setCurrentAdditionalStateVariables( ) ); - - } - - return &_currentAdditionalStateVariables.second; - - } - void residualBase::addIterationData( dataBase *data ){ /*! * Add data to the vector of values which will be cleared after each iteration @@ -379,13 +257,13 @@ namespace tardigradeHydra{ set_previousNonLinearSolveStateVariables( floatVector( getPreviousStateVariables( )->begin( ) + ( ( *nConfig ) - 1 ) * ( *getConfigurationUnknownCount( ) ), getPreviousStateVariables( )->begin( ) + ( ( *nConfig ) - 1 ) * ( *getConfigurationUnknownCount( ) ) + *nNLISV ) ); - set_nonLinearSolveStateVariables( *getPreviousNonLinearSolveStateVariables( ) ); + set_nonLinearSolveStateVariables( *get_previousNonLinearSolveStateVariables( ) ); // Extract the additional state variables set_previousAdditionalStateVariables( floatVector( getPreviousStateVariables( )->begin( ) + ( ( *nConfig ) - 1 ) * ( *getConfigurationUnknownCount( ) ) + *nNLISV, getPreviousStateVariables( )->end( ) ) ); - set_additionalStateVariables( *getPreviousAdditionalStateVariables( ) ); + set_additionalStateVariables( *get_previousAdditionalStateVariables( ) ); } @@ -497,7 +375,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfiguration( *getConfigurations( ), lowerIndex, upperIndex ); + return getSubConfiguration( *get_configurations( ), lowerIndex, upperIndex ); } @@ -544,7 +422,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfiguration( *getPreviousConfigurations( ), lowerIndex, upperIndex ); + return getSubConfiguration( *get_previousConfigurations( ), lowerIndex, upperIndex ); } @@ -594,7 +472,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfigurationJacobian( *getConfigurations( ), lowerIndex, upperIndex ); + return getSubConfigurationJacobian( *get_configurations( ), lowerIndex, upperIndex ); } @@ -633,7 +511,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfigurationJacobian( *getPreviousConfigurations( ), lowerIndex, upperIndex ); + return getSubConfigurationJacobian( *get_previousConfigurations( ), lowerIndex, upperIndex ); } @@ -731,7 +609,7 @@ namespace tardigradeHydra{ floatMatrix dF1dFn; - calculateFirstConfigurationJacobians( *getConfigurations( ), dF1dF, dF1dFn ); + calculateFirstConfigurationJacobians( *get_configurations( ), dF1dF, dF1dFn ); set_dF1dF( dF1dF ); @@ -748,7 +626,7 @@ namespace tardigradeHydra{ floatMatrix dF1dFn; - calculateFirstConfigurationJacobians( *getPreviousConfigurations( ), dF1dF, dF1dFn ); + calculateFirstConfigurationJacobians( *get_previousConfigurations( ), dF1dF, dF1dFn ); set_previousdF1dF( dF1dF ); @@ -756,66 +634,6 @@ namespace tardigradeHydra{ } - const floatMatrix* hydraBase::getdF1dF( ){ - /*! - * Get the partial derivative of the first deformation gradient w.r.t. the deformation gradient - */ - - if ( !_dF1dF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstConfigurationJacobians( ) ); - - } - - return &_dF1dF.second; - - } - - const floatMatrix* hydraBase::getdF1dFn( ){ - /*! - * Get the partial derivative of the first deformation gradient w.r.t. the other deformation gradients - */ - - if ( !_dF1dFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstConfigurationJacobians( ) ); - - } - - return &_dF1dFn.second; - - } - - const floatMatrix* hydraBase::getPreviousdF1dF( ){ - /*! - * Get the partial derivative of the previous first deformation gradient w.r.t. the deformation gradient - */ - - if ( !_previousdF1dF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstConfigurationJacobians( ) ); - - } - - return &_previousdF1dF.second; - - } - - const floatMatrix* hydraBase::getPreviousdF1dFn( ){ - /*! - * Get the partial derivative of the previous first deformation gradient w.r.t. the other deformation gradients - */ - - if ( !_previousdF1dFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstConfigurationJacobians( ) ); - - } - - return &_previousdF1dFn.second; - - } - void hydraBase::resetIterationData( ){ /*! * Reset the iteration data to the new base state @@ -1276,9 +1094,9 @@ namespace tardigradeHydra{ const floatVector *cauchyStress; TARDIGRADE_ERROR_TOOLS_CATCH( cauchyStress = getStress( ) ); - const floatMatrix *configurations = getConfigurations( ); + const floatMatrix *configurations = get_configurations( ); - const floatVector *nonLinearSolveStateVariables = getNonLinearSolveStateVariables( ); + const floatVector *nonLinearSolveStateVariables = get_nonLinearSolveStateVariables( ); floatMatrix Xmat( 1 + configurations->size( ) ); diff --git a/src/cpp/tardigrade_hydra.h b/src/cpp/tardigrade_hydra.h index 4b0e7e6b..e7525f8f 100644 --- a/src/cpp/tardigrade_hydra.h +++ b/src/cpp/tardigrade_hydra.h @@ -17,6 +17,35 @@ #include #include +/*! + * \brief Declares a named getter function + * \param getname: The name of the getter function + * \param varname: The name of the variable + * \param vartype: The ctype of the variable + * \param uncall: The function that is called if the variable is undefined. + * This should set the variable or throw an error. + */ +#define TARDIGRADE_HYDRA_DECLARE_NAMED_GETTER(getname,varname,vartype,uncall) \ + const vartype *getname( ){ \ + /*! \ + * Get the value of varname \ + */ \ + if(!_##varname.first){ \ + TARDIGRADE_ERROR_TOOLS_CATCH( uncall( ) ) \ + } \ + return &_##varname.second; \ + } + +/*! + * \brief Declares a getter function + * \param varname: The name of the variable + * \param vartype: The ctype of the variable + * \param uncall: The function that is called if the variable is undefined. + * This should set the variable or throw an error + */ +#define TARDIGRADE_HYDRA_DECLARE_GETTER(varname,vartype,setfun) \ + TARDIGRADE_HYDRA_DECLARE_NAMED_GETTER(get_##varname,varname,vartype,uncall) + /*! * \brief Declares a named setter function * \param setname: The name of the setter function @@ -27,7 +56,7 @@ #define TARDIGRADE_HYDRA_DECLARE_NAMED_SETTER(setname,varname,vartype,setfun) \ void setname(const vartype &varname ){ \ /*! \ - * Declaration of the storage variable varname of type vartype \ + * Set the storage variable varname of type vartype \ * \ * \param &varname: The value of varname \ */ \ @@ -47,13 +76,16 @@ * \brief Declare a dataStorage variable and the associated named setters and getters * \param context: The context (public, protected, private) that the macro should return to * \param setname: The name of the setter function + * \param getname: The name of the getter function * \param varname: The name of the variable * \param vartype: The ctype of the variable * \param setfun: The class member function that sets the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,varname,vartype,setfun) \ +#define TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,getname,varname,vartype,setfun,uncall) \ private: dataStorage _##varname; \ public: TARDIGRADE_HYDRA_DECLARE_NAMED_SETTER(setname,varname,vartype,setfun) \ + public: TARDIGRADE_HYDRA_DECLARE_NAMED_GETTER(getname,varname,vartype,uncall) \ context: /*! @@ -62,66 +94,76 @@ * \param varname: The name of the variable * \param vartype: The ctype of the variable * \param setfun: The class member function that sets the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setfun) \ - TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,set_##varname,varname,vartype,setfun) +#define TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setfun,uncall) \ + TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,set_##varname,get_##varname,varname,vartype,setfun,uncall) /*! * \brief Declare a named dataStorage variable that uses setIterationData as the setter function * \param context: The context (public, protected, private) that the macro should return to * \param setname: The name of the setter + * \param getname: The name of the getter function * \param varname: The name of the variable * \param vartype: The type of the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE(context,setname,varname,vartype) \ - TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,varname,vartype,setIterationData) +#define TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE(context,setname,getname,varname,vartype,uncall) \ + TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,getname,varname,vartype,setIterationData,uncall) /*! * \brief Declare a dataStorage variable that uses setIterationData as the setter function * \param context: The context (public, protected, private) that the macro should return to * \param varname: The name of the variable * \param vartype: The type of the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(context,varname,vartype) \ - TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setIterationData) +#define TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(context,varname,vartype,uncall) \ + TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setIterationData,uncall) /*! * \brief Declare a named dataStorage variable that uses setPreviousData as the setter function * \param context: The context (public, protected, private) that the macro should return to * \param setname: The name of the setter + * \param getname: The name of the getter function * \param varname: The name of the variable * \param vartype: The type of the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_NAMED_PREVIOUS_STORAGE(context,setname,varname,vartype) \ - TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,varname,vartype,setPreviousData) +#define TARDIGRADE_HYDRA_DECLARE_NAMED_PREVIOUS_STORAGE(context,setname,getname,varname,vartype,uncall) \ + TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,getname,varname,vartype,setPreviousData,uncall) /*! * \brief Declare a dataStorage variable that uses setPreviousData as the setter function * \param context: The context (public, protected, private) that the macro should return to * \param varname: The name of the variable * \param vartype: The type of the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE(context,varname,vartype) \ - TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setPreviousData) +#define TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE(context,varname,vartype,uncall) \ + TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setPreviousData,uncall) /*! * \brief Declare a named dataStorage variable that uses setConstantData as the setter function * \param context: The context (public, protected, private) that the macro should return to * \param setname: The name of the setter + * \param getname: The name of the getter function * \param varname: The name of the variable * \param vartype: The type of the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_NAMED_CONSTANT_STORAGE(context,setname,varname,vartype) \ - TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,varname,vartype,setConstantData) +#define TARDIGRADE_HYDRA_DECLARE_NAMED_CONSTANT_STORAGE(context,setname,getname,varname,vartype,uncall) \ + TARDIGRADE_HYDRA_DECLARE_NAMED_STORAGE(context,setname,getname,varname,vartype,setConstantData,uncall) /*! * \brief Declare a dataStorage variable that uses setContantData as the setter function * \param context: The context (public, protected, private) that the macro should return to * \param varname: The name of the variable * \param vartype: The type of the variable + * \param uncall: The function that is called if the variable is not set */ -#define TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE(context,varname,vartype) \ - TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setConstantData) +#define TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE(context,varname,vartype,uncall) \ + TARDIGRADE_HYDRA_DECLARE_STORAGE(context,varname,vartype,setConstantData,uncall) namespace tardigradeHydra{ @@ -403,22 +445,6 @@ namespace tardigradeHydra{ //! Get the number of equations the residual defined const unsigned int* getNumEquations( ){ return &_numEquations; } - const floatVector* getResidual( ); - - const floatMatrix* getJacobian( ); - - const floatMatrix* getdRdF( ); - - const floatVector* getdRdT( ); - - const floatMatrix* getAdditionalDerivatives( ); - - const floatVector* getStress( ); - - const floatVector* getPreviousStress( ); - - const floatVector* getCurrentAdditionalStateVariables( ); - void addIterationData( dataBase *data ); template @@ -468,25 +494,36 @@ namespace tardigradeHydra{ } - private: - - unsigned int _numEquations; //!< The number of residual equations - - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setResidual, residual, floatVector ) - - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setJacobian, jacobian, floatMatrix ) + protected: - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setdRdF, dRdF, floatMatrix ) + void unexpectedError( ){ + /*! + * Function to throw for an unexpected error. A user should never get here! + */ - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setdRdT, dRdT, floatVector ) + TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "You shouldn't have gotten here. If you aren't developing the code then contact a developer with the stack trace." ) ) - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setAdditionalDerivatives, additionalDerivatives, floatMatrix ) + } - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setStress, stress, floatVector ) + private: - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setPreviousStress, previousStress, floatVector ) + unsigned int _numEquations; //!< The number of residual equations - TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setCurrentAdditionalStateVariables, currentAdditionalStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setResidual, getResidual, residual, floatVector, setResidual ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setJacobian, getJacobian, jacobian, floatMatrix, setJacobian ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setdRdF, getdRdF, dRdF, floatMatrix, setdRdF ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setdRdT, getdRdT, dRdT, floatVector, setdRdT ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setAdditionalDerivatives, getAdditionalDerivatives, additionalDerivatives, floatMatrix, setAdditionalDerivatives ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setStress, getStress, stress, floatVector, setStress ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setPreviousStress, getPreviousStress, previousStress, floatVector, setPreviousStress ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, setCurrentAdditionalStateVariables, getCurrentAdditionalStateVariables, currentAdditionalStateVariables, floatVector, setCurrentAdditionalStateVariables ) }; @@ -567,30 +604,6 @@ namespace tardigradeHydra{ //! Get a reference to the line-search alpha const floatType* getLSAlpha( ){ return &_lsAlpha; } - //! Get a reference to the configurations - const floatMatrix* getConfigurations( ){ return &_configurations.second; } - - //! Get a reference to the previous configurations - const floatMatrix* getPreviousConfigurations( ){ return &_previousConfigurations.second; } - - //! Get a reference to the inverse configurations - const floatMatrix* getInverseConfigurations( ){ return &_inverseConfigurations.second; } - - //! Get a reference to the previous inverse configurations - const floatMatrix* getPreviousInverseConfigurations( ){ return &_previousInverseConfigurations.second; } - - //! Get a reference to the state variables used in the unknown vector of the non-linear solve - const floatVector* getNonLinearSolveStateVariables( ){ return &_nonLinearSolveStateVariables.second; } - - //! Get a reference to the previous values of the state variables used in the unknown vector of the non-linear solve - const floatVector* getPreviousNonLinearSolveStateVariables( ){ return &_previousNonLinearSolveStateVariables.second; } - - //! Get a reference to the state variables not used in the unknown vector for the non-linear solve - const floatVector* getAdditionalStateVariables( ){ return &_additionalStateVariables.second; } - - //! Get a reference to the previous values of the state variables not used in the unknown vector for the non-linear solve - const floatVector* getPreviousAdditionalStateVariables( ){ return &_previousAdditionalStateVariables.second; } - floatVector getSubConfiguration( const floatMatrix &configurations, const unsigned int &lowerIndex, const unsigned int &upperIndex ); floatMatrix getSubConfigurationJacobian( const floatMatrix &configurations, const unsigned int &lowerIndex, const unsigned int &upperIndex ); @@ -625,14 +638,6 @@ namespace tardigradeHydra{ const floatType* getLSResidualNorm( ); - const floatMatrix* getdF1dF( ); - - const floatMatrix* getdF1dFn( ); - - const floatMatrix* getPreviousdF1dF( ); - - const floatMatrix* getPreviousdF1dFn( ); - virtual void setResidualClasses( ); void setResidualClasses( std::vector< residualBase* > &residualClasses ); @@ -750,6 +755,18 @@ namespace tardigradeHydra{ } + void unexpectedError( ){ + /*! + * Function to throw for an unexpected error. A user should never get here! + */ + + TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "You shouldn't have gotten here. If you aren't developing the code then contact a developer with the stack trace." ) ) + + } + + //!A pass through function that does nothing + void passThrough( ){ } + private: // Friend classes @@ -789,30 +806,6 @@ namespace tardigradeHydra{ floatType _lsAlpha; //!< The line-search alpha value i.e., the term by which it is judged that the line-search is converging - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, configurations, floatMatrix ) - - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousConfigurations, floatMatrix ) - - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, inverseConfigurations, floatMatrix ) - - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousInverseConfigurations, floatMatrix ) - - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, nonLinearSolveStateVariables, floatVector ) - - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousNonLinearSolveStateVariables, floatVector ) - - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, additionalStateVariables, floatVector ) - - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousAdditionalStateVariables, floatVector ) - - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dF1dF, floatMatrix ) - - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dF1dFn, floatMatrix ) - - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdF1dF, floatMatrix ) - - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdF1dFn, floatMatrix ) - std::vector< dataBase* > _iterationData; //!< A vector of pointers to data which should be cleared at each iteration dataStorage< std::vector< residualBase* > > _residualClasses; //!< A vector of classes which compute the terms in the residual equation @@ -867,6 +860,30 @@ namespace tardigradeHydra{ void resetIterationData( ); + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, configurations, floatMatrix, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousConfigurations, floatMatrix, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, inverseConfigurations, floatMatrix, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousInverseConfigurations, floatMatrix, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, nonLinearSolveStateVariables, floatVector, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousNonLinearSolveStateVariables, floatVector, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, additionalStateVariables, floatVector, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousAdditionalStateVariables, floatVector, passThrough ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, set_dF1dF, get_dF1dF, dF1dF, floatMatrix, setFirstConfigurationJacobians ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_ITERATION_STORAGE( private, set_dF1dFn, get_dF1dFn, dF1dFn, floatMatrix, setFirstConfigurationJacobians ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_PREVIOUS_STORAGE( private, set_previousdF1dF, get_previousdF1dF, previousdF1dF, floatMatrix, setPreviousFirstConfigurationJacobians ) + + TARDIGRADE_HYDRA_DECLARE_NAMED_PREVIOUS_STORAGE( private, set_previousdF1dFn, get_previousdF1dFn, previousdF1dFn, floatMatrix, setPreviousFirstConfigurationJacobians ) + }; /// Say hello diff --git a/src/cpp/tardigrade_hydraLinearElasticity.cpp b/src/cpp/tardigrade_hydraLinearElasticity.cpp index dd956ecd..1b8ddc3d 100644 --- a/src/cpp/tardigrade_hydraLinearElasticity.cpp +++ b/src/cpp/tardigrade_hydraLinearElasticity.cpp @@ -38,7 +38,7 @@ namespace tardigradeHydra{ * Set the current value of the elastic Green-Lagrange strain */ - floatVector Fe = ( *hydra->getConfigurations( ) )[ 0 ]; + floatVector Fe = ( *hydra->get_configurations( ) )[ 0 ]; floatVector Ee; @@ -52,21 +52,6 @@ namespace tardigradeHydra{ } - const floatVector* residual::getEe( ){ - /*! - * Get the elastic Green-Lagrange strain - */ - - if ( !_Ee.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setEe( ) ); - - } - - return &_Ee.second; - - } - void residual::setdEedFe( ){ /*! * Set the gradient of the elastic Green-Lagrange strain w.r.t. the elastic deformation gradient @@ -74,22 +59,7 @@ namespace tardigradeHydra{ * Default assumption is that this happens when the Green-Lagrange strain is computed; */ - TARDIGRADE_ERROR_TOOLS_CATCH( getEe( ) ); - - } - - const floatMatrix* residual::getdEedFe( ){ - /*! - * Get the elastic Green-Lagrange strain - */ - - if ( !_dEedFe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdEedFe( ) ); - - } - - return &_dEedFe.second; + TARDIGRADE_ERROR_TOOLS_CATCH( get_Ee( ) ); } @@ -98,39 +68,24 @@ namespace tardigradeHydra{ * Compute the Second Piola-Kirchhoff stress */ - floatVector eye( getEe( )->size( ), 0 ); + floatVector eye( get_Ee( )->size( ), 0 ); tardigradeVectorTools::eye( eye ); - floatVector PK2Stress = ( *getLambda( ) ) * tardigradeVectorTools::trace( *getEe( ) ) * eye + 2 * ( *getMu( ) ) * ( *getEe( ) ); + floatVector PK2Stress = ( *getLambda( ) ) * tardigradeVectorTools::trace( *get_Ee( ) ) * eye + 2 * ( *getMu( ) ) * ( *get_Ee( ) ); set_PK2Stress( PK2Stress ); } - const floatVector* residual::getPK2Stress( ){ - /*! - * Get the Second Piola-Kirchhoff stress - */ - - if ( !_PK2Stress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPK2Stress( ) ); - - } - - return &_PK2Stress.second; - - } - void residual::setdPK2StressdEe( ){ /*! * Compute the gradient of the PK2 stress w.r.t. the elastic Green-Lagrange strain */ - floatVector eye( getEe( )->size( ), 0 ); + floatVector eye( get_Ee( )->size( ), 0 ); tardigradeVectorTools::eye( eye ); - floatMatrix EYE = tardigradeVectorTools::eye< floatType >( getEe( )->size( ) ); + floatMatrix EYE = tardigradeVectorTools::eye< floatType >( get_Ee( )->size( ) ); floatMatrix dPK2StressdEe = ( *getLambda( ) ) * tardigradeVectorTools::dyadic( eye, eye ) + 2 * ( *getMu( ) ) * EYE; @@ -138,74 +93,43 @@ namespace tardigradeHydra{ } - const floatMatrix* residual::getdPK2StressdEe( ){ - /*! - * Get the gradient of the Second Piola-Kirchhoff stress w.r.t. the elastic Green-Lagrange strain - */ - - if ( !_dPK2StressdEe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2StressdEe( ) ); - - } - - return &_dPK2StressdEe.second; - - } - void residual::setdPK2StressdFe( ){ /*! * Set the derivative of the second Piola-Kirchhoff stress w.r.t. the elastic * deformation gradient */ - floatMatrix dPK2StressdFe = tardigradeVectorTools::dot( *getdPK2StressdEe( ), *getdEedFe( ) ); + floatMatrix dPK2StressdFe = tardigradeVectorTools::dot( *get_dPK2StressdEe( ), *get_dEedFe( ) ); set_dPK2StressdFe( dPK2StressdFe ); } - const floatMatrix* residual::getdPK2StressdFe( ){ - /*! - * Get the derivative of the second Piola-Kirchhoff stress w.r.t. the elastic - * deformation gradient - */ - - if ( !_dPK2StressdFe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2StressdFe( ) ) - - } - - return &_dPK2StressdFe.second; - - } - void residual::setStress( ){ /*! * Set the Cauchy stress */ - floatVector Fe = ( *hydra->getConfigurations( ) )[ 0 ]; + floatVector Fe = ( *hydra->get_configurations( ) )[ 0 ]; - floatMatrix dFedF = ( *hydra->getdF1dF( ) ); + floatMatrix dFedF = ( *hydra->get_dF1dF( ) ); - floatMatrix dFedFn = ( *hydra->getdF1dFn( ) ); + floatMatrix dFedFn = ( *hydra->get_dF1dFn( ) ); // Compute the gradient of the PK2 stress w.r.t. the elastic deformation gradient - floatMatrix dPK2StressdFe = *getdPK2StressdFe( ); + floatMatrix dPK2StressdFe = *get_dPK2StressdFe( ); // Compute the Second Piola-Kirchhoff stress and it's gradients - floatMatrix dPK2StressdF = tardigradeVectorTools::dot( *getdPK2StressdFe( ), dFedF ); + floatMatrix dPK2StressdF = tardigradeVectorTools::dot( *get_dPK2StressdFe( ), dFedF ); - floatMatrix dPK2StressdFn = tardigradeVectorTools::dot( *getdPK2StressdFe( ), dFedFn ); + floatMatrix dPK2StressdFn = tardigradeVectorTools::dot( *get_dPK2StressdFe( ), dFedFn ); // Map the PK2 stress to the current configuration floatVector cauchyStress; floatMatrix dCauchyStressdPK2Stress; floatMatrix dCauchyStressdFe; - TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::pushForwardPK2Stress( *getPK2Stress( ), Fe, cauchyStress, dCauchyStressdPK2Stress, dCauchyStressdFe ) ); + TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::pushForwardPK2Stress( *get_PK2Stress( ), Fe, cauchyStress, dCauchyStressdPK2Stress, dCauchyStressdFe ) ); setStress( cauchyStress ); @@ -241,36 +165,6 @@ namespace tardigradeHydra{ } - const floatMatrix* residual::getdCauchyStressdPK2Stress( ){ - /*! - * Get the derivative of the Cauchy stress w.r.t. the second Piola-Kirchhoff stress - */ - - if ( !_dCauchyStressdPK2Stress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdCauchyStressdPK2Stress( ) ); - - } - - return &_dCauchyStressdPK2Stress.second; - - } - - const floatMatrix* residual::getdCauchyStressdF( ){ - /*! - * Get the derivative of the Cauchy stress w.r.t. the deformation gradient - */ - - if ( !_dCauchyStressdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdCauchyStressdF( ) ); - - } - - return &_dCauchyStressdF.second; - - } - void residual::setdCauchyStressdFn( ){ /*! * Set the derivative of the computed Cauchy stress w.r.t. the configurations solved for in the non-linear solve @@ -281,21 +175,6 @@ namespace tardigradeHydra{ } - const floatMatrix* residual::getdCauchyStressdFn( ){ - /*! - * Get the derivative of the Cauchy stress w.r.t. the configurations solve for in the non-linear solve - */ - - if ( !_dCauchyStressdFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdCauchyStressdFn( ) ); - - } - - return &_dCauchyStressdFn.second; - - } - void residual::setResidual( ){ /*! * Set the residual value @@ -325,7 +204,7 @@ namespace tardigradeHydra{ for ( unsigned int I = 0; I < ( ( *hydra->getNumConfigurations( ) ) - 1 ) * ( *dim ) * ( *dim ); I++ ){ - jacobian[ ( *dim ) * i + j ][ getStress( )->size( ) + I ] = ( *getdCauchyStressdFn( ) )[ ( *dim ) * i + j ][ I ]; + jacobian[ ( *dim ) * i + j ][ getStress( )->size( ) + I ] = ( *get_dCauchyStressdFn( ) )[ ( *dim ) * i + j ][ I ]; } @@ -351,7 +230,7 @@ namespace tardigradeHydra{ * Set the derivative of the residual w.r.t. the deformation gradient */ - setdRdF( *getdCauchyStressdF( ) ); + setdRdF( *get_dCauchyStressdF( ) ); } diff --git a/src/cpp/tardigrade_hydraLinearElasticity.h b/src/cpp/tardigrade_hydraLinearElasticity.h index 9af3aae7..4568fbb9 100644 --- a/src/cpp/tardigrade_hydraLinearElasticity.h +++ b/src/cpp/tardigrade_hydraLinearElasticity.h @@ -88,22 +88,6 @@ namespace tardigradeHydra{ //! Get a pointer to the value of the mu Lame parameter const floatType* getMu( ){ return &_mu; } - const floatVector* getEe( ); - - const floatMatrix* getdEedFe( ); - - const floatVector* getPK2Stress( ); - - const floatMatrix* getdPK2StressdEe( ); - - const floatMatrix* getdPK2StressdFe( ); - - const floatMatrix* getdCauchyStressdPK2Stress( ); - - const floatMatrix* getdCauchyStressdF( ); - - const floatMatrix* getdCauchyStressdFn( ); - /*! * Set the value of the lambda Lame parameter * @@ -141,21 +125,21 @@ namespace tardigradeHydra{ floatType _mu; - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, Ee, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, Ee, floatVector, setEe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dEedFe, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dEedFe, floatMatrix, setdEedFe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2Stress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2Stress, floatVector, setPK2Stress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2StressdEe, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2StressdEe, floatMatrix, setdPK2StressdEe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2StressdFe, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2StressdFe, floatMatrix, setdPK2StressdFe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdPK2Stress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdPK2Stress, floatMatrix, setdCauchyStressdPK2Stress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdF, floatMatrix, setdCauchyStressdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdFn, floatMatrix, setdCauchyStressdFn ) virtual void setEe( ); diff --git a/src/cpp/tardigrade_hydraLinearViscoelasticity.cpp b/src/cpp/tardigrade_hydraLinearViscoelasticity.cpp index e563f20d..1516c787 100644 --- a/src/cpp/tardigrade_hydraLinearViscoelasticity.cpp +++ b/src/cpp/tardigrade_hydraLinearViscoelasticity.cpp @@ -200,7 +200,7 @@ namespace tardigradeHydra{ floatVector Fehat; - TARDIGRADE_ERROR_TOOLS_CATCH( decomposeDeformation( ( *hydra->getConfigurations( ) )[ 0 ], Je, Fehat ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( decomposeDeformation( ( *hydra->get_configurations( ) )[ 0 ], Je, Fehat ) ); set_Je( Je ); @@ -217,7 +217,7 @@ namespace tardigradeHydra{ floatVector previousFehat; - TARDIGRADE_ERROR_TOOLS_CATCH( decomposeDeformation( ( *hydra->getPreviousConfigurations( ) )[ 0 ], previousJe, previousFehat ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( decomposeDeformation( ( *hydra->get_previousConfigurations( ) )[ 0 ], previousJe, previousFehat ) ); set_previousJe( previousJe ); @@ -244,66 +244,6 @@ namespace tardigradeHydra{ } - const floatType* residual::getJe( ){ - /*! - * Get the elastic Jacobian of deformation - */ - - if ( !_Je.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( decomposeElasticDeformation( ) ); - - } - - return &_Je.second; - - } - - const floatVector* residual::getFehat( ){ - /*! - * Get the isochoric part of the elastic deformation gradient - */ - - if ( !_Fehat.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( decomposeElasticDeformation( ) ); - - } - - return &_Fehat.second; - - } - - const floatType* residual::getPreviousJe( ){ - /*! - * Get the previous elastic Jacobian of deformation - */ - - if ( !_previousJe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( decomposePreviousElasticDeformation( ) ); - - } - - return &_previousJe.second; - - } - - const floatVector* residual::getPreviousFehat( ){ - /*! - * Get the previous isochoric part of the elastic deformation gradient - */ - - if ( !_previousFehat.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( decomposePreviousElasticDeformation( ) ); - - } - - return &_previousFehat.second; - - } - void residual::setdJedFe( ){ /*! * Set the derivative of the elastic Jacobian of deformation w.r.t. @@ -312,23 +252,7 @@ namespace tardigradeHydra{ const unsigned int* dim = hydra->getDimension( ); - set_dJedFe( tardigradeVectorTools::computeDDetADA( ( *hydra->getConfigurations( ) )[ 0 ], ( *dim ), ( *dim ) ) ); - - } - - const floatVector* residual::getdJedFe( ){ - /*! - * Get the derivative of the elastic Jacobian of deformation w.r.t. - * the elastic deformation gradient - */ - - if ( !_dJedFe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdJedFe( ) ); - - } - - return &_dJedFe.second; + set_dJedFe( tardigradeVectorTools::computeDDetADA( ( *hydra->get_configurations( ) )[ 0 ], ( *dim ), ( *dim ) ) ); } @@ -340,30 +264,14 @@ namespace tardigradeHydra{ const unsigned int* dim = hydra->getDimension( ); - floatMatrix dFehatdFe = tardigradeVectorTools::eye< floatType >( ( *dim ) * ( *dim ) ) * std::pow( ( *getJe( ) ), -1. / 3 ); + floatMatrix dFehatdFe = tardigradeVectorTools::eye< floatType >( ( *dim ) * ( *dim ) ) * std::pow( ( *get_Je( ) ), -1. / 3 ); - dFehatdFe -= tardigradeVectorTools::dyadic( ( *hydra->getConfigurations( ) )[ 0 ], *getdJedFe( ) ) * std::pow( ( *getJe( ) ), -4. / 3 ) / 3.; + dFehatdFe -= tardigradeVectorTools::dyadic( ( *hydra->get_configurations( ) )[ 0 ], *get_dJedFe( ) ) * std::pow( ( *get_Je( ) ), -4. / 3 ) / 3.; set_dFehatdFe( dFehatdFe ); } - const floatMatrix* residual::getdFehatdFe( ){ - /*! - * Get the derivative of the isochoric part of the elastic deformation gradient - * w.r.t. the elastic deformation gradient - */ - - if ( !_dFehatdFe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdFehatdFe( ) ); - - } - - return &_dFehatdFe.second; - - } - void residual::decomposeStateVariableVector( floatVector &volumetricStateVariables, floatVector &isochoricStateVariables ){ /*! @@ -376,15 +284,15 @@ namespace tardigradeHydra{ unsigned int lb = *getViscoelasticISVLowerIndex( ); unsigned int ub = lb + *getNumVolumetricViscousTerms( ); - volumetricStateVariables = floatVector( hydra->getAdditionalStateVariables( )->begin( ) + lb, - hydra->getAdditionalStateVariables( )->begin( ) + ub ); + volumetricStateVariables = floatVector( hydra->get_additionalStateVariables( )->begin( ) + lb, + hydra->get_additionalStateVariables( )->begin( ) + ub ); lb = ub; ub = lb + ( *dim ) * ( *dim ) * *getNumIsochoricViscousTerms( ); - isochoricStateVariables = floatVector( hydra->getAdditionalStateVariables( )->begin( ) + lb, - hydra->getAdditionalStateVariables( )->begin( ) + ub ); + isochoricStateVariables = floatVector( hydra->get_additionalStateVariables( )->begin( ) + lb, + hydra->get_additionalStateVariables( )->begin( ) + ub ); } @@ -566,129 +474,6 @@ namespace tardigradeHydra{ } - const floatType* residual::getVolumetricRateMultiplier( ){ - /*! - * Get the current value of the volumetric rate multiplier - */ - - if ( !_volumetricRateMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setVolumetricRateMultiplier( ) ); - - } - - return &_volumetricRateMultiplier.second; - - } - - const floatType* residual::getPreviousVolumetricRateMultiplier( ){ - /*! - * Get the current value of the previous volumetric rate multiplier - */ - - if ( !_previousVolumetricRateMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousVolumetricRateMultiplier( ) ); - - } - - return &_previousVolumetricRateMultiplier.second; - - } - - const floatType* residual::getIsochoricRateMultiplier( ){ - /*! - * Get the current value of the isochoric rate multiplier - */ - - if ( !_isochoricRateMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setIsochoricRateMultiplier( ) ); - - } - - return &_isochoricRateMultiplier.second; - - } - - const floatType* residual::getPreviousIsochoricRateMultiplier( ){ - /*! - * Get the current value of the previous isochoric rate multiplier - */ - - if ( !_previousIsochoricRateMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousIsochoricRateMultiplier( ) ); - - } - - return &_previousIsochoricRateMultiplier.second; - - } - - const floatType* residual::getdVolumetricRateMultiplierdT( ){ - /*! - * Get the current value of the derivative of the - * volumetric rate multiplier w.r.t. temperature - */ - - if ( !_dVolumetricRateMultiplierdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdVolumetricRateMultiplierdT( ) ); - - } - - return &_dVolumetricRateMultiplierdT.second; - - } - - const floatType* residual::getdPreviousVolumetricRateMultiplierdPreviousT( ){ - /*! - * Get the current value of the derivative of the previous volumetric - * rate multiplier w.r.t. the previous temperature - */ - - if ( !_dPreviousVolumetricRateMultiplierdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousVolumetricRateMultiplierdPreviousT( ) ); - - } - - return &_dPreviousVolumetricRateMultiplierdPreviousT.second; - - } - - const floatType* residual::getdIsochoricRateMultiplierdT( ){ - /*! - * Get the current value of the derivative of the isochoric rate multiplier - * w.r.t. the temperature - */ - - if ( !_dIsochoricRateMultiplierdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdIsochoricRateMultiplierdT( ) ); - - } - - return &_dIsochoricRateMultiplierdT.second; - - } - - const floatType* residual::getdPreviousIsochoricRateMultiplierdPreviousT( ){ - /*! - * Get the current value of the previous isochoric rate multiplier - */ - - if ( !_dPreviousIsochoricRateMultiplierdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousIsochoricRateMultiplierdPreviousT( ) ); - - } - - return &_dPreviousIsochoricRateMultiplierdPreviousT.second; - - } - void residual::setVolumetricTemperatureParameters( const floatVector ¶meters ){ /*! * Set the volumetric temperature parameters @@ -758,9 +543,9 @@ namespace tardigradeHydra{ // Compute the strain measures - floatVector volumetricStrain = { ( *getJe( ) - 1 ) }; + floatVector volumetricStrain = { ( *get_Je( ) - 1 ) }; - floatVector previousVolumetricStrain = { ( *getPreviousJe( ) - 1 ) }; + floatVector previousVolumetricStrain = { ( *get_previousJe( ) - 1 ) }; // Get the previous state variable values @@ -785,8 +570,8 @@ namespace tardigradeHydra{ TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeStressTools::linearViscoelasticity( *hydra->getTime( ), volumetricStrain, *hydra->getTime( ) - *hydra->getDeltaTime( ), previousVolumetricStrain, - *getVolumetricRateMultiplier( ), - *getPreviousVolumetricRateMultiplier( ), + *get_volumetricRateMultiplier( ), + *get_previousVolumetricRateMultiplier( ), previousVolumetricStateVariables, getVolumetricViscoelasticParameters( ), *getIntegrationAlpha( ), deltaPK2MeanStress, @@ -796,9 +581,9 @@ namespace tardigradeHydra{ set_volumetricViscoelasticStateVariables( currentVolumetricStateVariables ); - set_dPK2MeanStressdFe( dPK2MeanStressdJe[ 0 ][ 0 ] * ( *getdJedFe( ) ) ); + set_dPK2MeanStressdFe( dPK2MeanStressdJe[ 0 ][ 0 ] * ( *get_dJedFe( ) ) ); - set_dPK2MeanStressdT( dPK2MeanStressdRateModifier[ 0 ] * ( *getdVolumetricRateMultiplierdT( ) ) ); + set_dPK2MeanStressdT( dPK2MeanStressdRateModifier[ 0 ] * ( *get_dVolumetricRateMultiplierdT( ) ) ); } @@ -807,7 +592,7 @@ namespace tardigradeHydra{ * Set the derivative of the PK2 mean stress w.r.t. the temperature */ - getPK2MeanStress( ); + get_PK2MeanStress( ); } @@ -816,53 +601,7 @@ namespace tardigradeHydra{ * Set the derivative of the PK2 mean stress w.r.t. the elastic deformation gradient */ - getPK2MeanStress( ); - - } - - const floatType* residual::getPK2MeanStress( ){ - /*! - * Get the PK2 mean stress - */ - - if ( !_PK2MeanStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPK2MeanStress( ) ); - - } - - return &_PK2MeanStress.second; - - } - - const floatType* residual::getdPK2MeanStressdT( ){ - /*! - * Get the derivative of the PK2 mean stress w.r.t. the temperature - */ - - if ( !_dPK2MeanStressdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2MeanStressdT( ) ); - - } - - return &_dPK2MeanStressdT.second; - - } - - const floatVector* residual::getdPK2MeanStressdFe( ){ - /*! - * Get the derivative of the PK2 mean stress w.r.t. the elastic - * deformation gradient - */ - - if ( !_dPK2MeanStressdFe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2MeanStressdFe( ) ); - - } - - return &_dPK2MeanStressdFe.second; + get_PK2MeanStress( ); } @@ -875,11 +614,11 @@ namespace tardigradeHydra{ floatVector isochoricStrain, previousIsochoricStrain; floatMatrix dEehatdFehat; - TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::computeGreenLagrangeStrain( *getFehat( ), isochoricStrain, dEehatdFehat ) ); + TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::computeGreenLagrangeStrain( *get_Fehat( ), isochoricStrain, dEehatdFehat ) ); - TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::computeGreenLagrangeStrain( *getPreviousFehat( ), previousIsochoricStrain ) ); + TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::computeGreenLagrangeStrain( *get_previousFehat( ), previousIsochoricStrain ) ); - floatMatrix dEehatdFe = tardigradeVectorTools::dot( dEehatdFehat, *getdFehatdFe( ) ); + floatMatrix dEehatdFe = tardigradeVectorTools::dot( dEehatdFehat, *get_dFehatdFe( ) ); // Get the previous state variable values @@ -903,8 +642,8 @@ namespace tardigradeHydra{ // Compute the viscous isochoric stress TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeStressTools::linearViscoelasticity( *hydra->getTime( ), isochoricStrain, *hydra->getTime( ) - *hydra->getDeltaTime( ), previousIsochoricStrain, - *getIsochoricRateMultiplier( ), - *getPreviousIsochoricRateMultiplier( ), + *get_isochoricRateMultiplier( ), + *get_previousIsochoricRateMultiplier( ), previousIsochoricStateVariables, getIsochoricViscoelasticParameters( ), *getIntegrationAlpha( ), deltaPK2IsochoricStress, @@ -916,7 +655,7 @@ namespace tardigradeHydra{ set_dPK2IsochoricStressdFe( tardigradeVectorTools::dot( dPK2IsochoricStressdEe, dEehatdFe ) ); - set_dPK2IsochoricStressdT( dPK2IsochoricStressdRateMultiplier * ( *getdIsochoricRateMultiplierdT( ) ) ); + set_dPK2IsochoricStressdT( dPK2IsochoricStressdRateMultiplier * ( *get_dIsochoricRateMultiplierdT( ) ) ); } @@ -926,7 +665,7 @@ namespace tardigradeHydra{ * deformation gradient */ - getPK2IsochoricStress( ); + get_PK2IsochoricStress( ); } @@ -935,38 +674,7 @@ namespace tardigradeHydra{ * Set the derivative of the isochoric PK2 stress w.r.t. the temperature */ - getPK2IsochoricStress( ); - - } - - const floatMatrix* residual::getdPK2IsochoricStressdFe( ){ - /*! - * Get the derivative of the isochoric PK2 stress w.r.t. the elastic - * deformation gradient - */ - - if ( !_dPK2IsochoricStressdFe.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2IsochoricStressdFe( ) ); - - } - - return &_dPK2IsochoricStressdFe.second; - - } - - const floatVector* residual::getdPK2IsochoricStressdT( ){ - /*! - * Get the derivative of the isochoric PK2 stress w.r.t. the temperature - */ - - if ( !_dPK2IsochoricStressdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2IsochoricStressdT( ) ); - - } - - return &_dPK2IsochoricStressdT.second; + get_PK2IsochoricStress( ); } @@ -975,22 +683,7 @@ namespace tardigradeHydra{ * Set the updated values of the volumetric viscoelastic state variables */ - getPK2MeanStress( ); - - } - - const floatVector* residual::getUpdatedVolumetricViscoelasticStateVariables( ){ - /*! - * Get the updated values of the volumetric viscoelastic state variables - */ - - if ( !_volumetricViscoelasticStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setUpdatedVolumetricViscoelasticStateVariables( ) ); - - } - - return &_volumetricViscoelasticStateVariables.second; + get_PK2MeanStress( ); } @@ -999,7 +692,7 @@ namespace tardigradeHydra{ * Set the updated values of the isochoric viscoelastic state variables */ - getPK2IsochoricStress( ); + get_PK2IsochoricStress( ); } @@ -1010,43 +703,13 @@ namespace tardigradeHydra{ floatVector viscoelasticStateVariables; - TARDIGRADE_ERROR_TOOLS_CATCH( viscoelasticStateVariables = tardigradeVectorTools::appendVectors( { *getUpdatedVolumetricViscoelasticStateVariables( ), - *getUpdatedIsochoricViscoelasticStateVariables( ) } ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( viscoelasticStateVariables = tardigradeVectorTools::appendVectors( { *get_volumetricViscoelasticStateVariables( ), + *get_isochoricViscoelasticStateVariables( ) } ) ); tardigradeHydra::residualBase::setCurrentAdditionalStateVariables( viscoelasticStateVariables ); } - const floatVector* residual::getUpdatedIsochoricViscoelasticStateVariables( ){ - /*! - * Get the updated values of the isochoric viscoelastic state variables - */ - - if ( !_isochoricViscoelasticStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setUpdatedIsochoricViscoelasticStateVariables( ) ); - - } - - return &_isochoricViscoelasticStateVariables.second; - - } - - const floatVector* residual::getPK2IsochoricStress( ){ - /*! - * Get the PK2 isochoric stress - */ - - if ( !_PK2IsochoricStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPK2IsochoricStress( ) ); - - } - - return &_PK2IsochoricStress.second; - - } - void residual::setPK2Stress( ){ /*! * Set the PK2 stress @@ -1057,7 +720,7 @@ namespace tardigradeHydra{ floatVector eye( ( *dim ) * ( *dim ), 0 ); tardigradeVectorTools::eye( eye ); - floatVector PK2Stress = ( *getPK2IsochoricStress( ) ) + ( *getPK2MeanStress( ) ) * eye; + floatVector PK2Stress = ( *get_PK2IsochoricStress( ) ) + ( *get_PK2MeanStress( ) ) * eye; set_PK2Stress( PK2Stress ); @@ -1073,7 +736,7 @@ namespace tardigradeHydra{ floatVector eye( ( *dim ) * ( *dim ), 0 ); tardigradeVectorTools::eye( eye ); - floatMatrix dPK2StressdFe = *getdPK2IsochoricStressdFe( ) + tardigradeVectorTools::dyadic( eye, *getdPK2MeanStressdFe( ) ); + floatMatrix dPK2StressdFe = *get_dPK2IsochoricStressdFe( ) + tardigradeVectorTools::dyadic( eye, *get_dPK2MeanStressdFe( ) ); set_dPK2StressdFe( dPK2StressdFe ); @@ -1089,61 +752,29 @@ namespace tardigradeHydra{ floatVector eye( ( *dim ) * ( *dim ), 0 ); tardigradeVectorTools::eye( eye ); - floatVector dPK2StressdT = *getdPK2IsochoricStressdT( ) + *getdPK2MeanStressdT( ) * eye; + floatVector dPK2StressdT = *get_dPK2IsochoricStressdT( ) + *get_dPK2MeanStressdT( ) * eye; set_dPK2StressdT( dPK2StressdT ); } - const floatVector* residual::getdPK2StressdT( ){ - /*! - * Get the derivative of the second Piola-Kirchhoff stress w.r.t. - * the temperature. - */ - - if ( !_dPK2StressdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2StressdT( ) ); - - } - - return &_dPK2StressdT.second; - - } - void residual::setdCauchyStressdT( ){ /*! * Set the derivative of the Cauchy stress w.r.t. the temperature */ - floatVector dCauchyStressdT = tardigradeVectorTools::dot( *getdCauchyStressdPK2Stress( ), *getdPK2StressdT( ) ); + floatVector dCauchyStressdT = tardigradeVectorTools::dot( *get_dCauchyStressdPK2Stress( ), *get_dPK2StressdT( ) ); set_dCauchyStressdT( dCauchyStressdT ); } - const floatVector* residual::getdCauchyStressdT( ){ - /*! - * Get the derivative of the Cauchy stress w.r.t. - * the temperature. - */ - - if ( !_dCauchyStressdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdCauchyStressdT( ) ); - - } - - return &_dCauchyStressdT.second; - - } - void residual::setdRdT( ){ /*! * Set the derivative of the residual w.r.t. the temperature. */ - setdRdT( *getdCauchyStressdT( ) ); + setdRdT( *get_dCauchyStressdT( ) ); } diff --git a/src/cpp/tardigrade_hydraLinearViscoelasticity.h b/src/cpp/tardigrade_hydraLinearViscoelasticity.h index 74c9a03b..d438a561 100644 --- a/src/cpp/tardigrade_hydraLinearViscoelasticity.h +++ b/src/cpp/tardigrade_hydraLinearViscoelasticity.h @@ -135,22 +135,10 @@ namespace tardigradeHydra{ virtual void decomposePreviousElasticDeformation( ); - const floatType* getJe( ); - - const floatVector* getFehat( ); - - const floatType* getPreviousJe( ); - - const floatVector* getPreviousFehat( ); - virtual void setdJedFe( ); - const floatVector *getdJedFe( ); - virtual void setdFehatdFe( ); - const floatMatrix *getdFehatdFe( ); - void setNumStateVariables( const unsigned int numStateVariables ); //! Get a pointer to the number of state variables @@ -162,22 +150,6 @@ namespace tardigradeHydra{ virtual floatVector computedRateMultiplierdVariables( const floatVector &variables, const floatVector ¶meters ); - const floatType* getVolumetricRateMultiplier( ); - - const floatType* getPreviousVolumetricRateMultiplier( ); - - const floatType* getdVolumetricRateMultiplierdT( ); - - const floatType* getdPreviousVolumetricRateMultiplierdPreviousT( ); - - const floatType* getIsochoricRateMultiplier( ); - - const floatType* getPreviousIsochoricRateMultiplier( ); - - const floatType* getdIsochoricRateMultiplierdT( ); - - const floatType* getdPreviousIsochoricRateMultiplierdPreviousT( ); - void setVolumetricTemperatureParameters( const floatVector ¶meters ); void setIsochoricTemperatureParameters( const floatVector ¶meters ); @@ -188,26 +160,6 @@ namespace tardigradeHydra{ void setdRdT( const floatVector &dRdT ); - const floatType* getPK2MeanStress( ); - - const floatVector* getPK2IsochoricStress( ); - - const floatVector* getdPK2MeanStressdFe( ); - - const floatMatrix* getdPK2IsochoricStressdFe( ); - - const floatType* getdPK2MeanStressdT( ); - - const floatVector* getdPK2IsochoricStressdT( ); - - const floatVector* getdPK2StressdT( ); - - const floatVector* getdCauchyStressdT( ); - - const floatVector* getUpdatedVolumetricViscoelasticStateVariables( ); - - const floatVector* getUpdatedIsochoricViscoelasticStateVariables( ); - protected: virtual void setNumVolumetricViscousTerms( const unsigned int &num ); @@ -307,53 +259,53 @@ namespace tardigradeHydra{ // Friend classes friend class tardigradeHydra::linearViscoelasticity::unit_test::residualTester; //!< Friend class which allows modification of private variables. ONLY TO BE USED FOR TESTING! - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, Je, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, Je, floatType, decomposeElasticDeformation ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, Fehat, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, Fehat, floatVector, decomposeElasticDeformation ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousJe, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousJe, floatType, decomposePreviousElasticDeformation ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousFehat, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousFehat, floatVector, decomposePreviousElasticDeformation ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dJedFe, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dJedFe, floatVector, setdJedFe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFehatdFe, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFehatdFe, floatMatrix, setdFehatdFe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, volumetricRateMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, volumetricRateMultiplier, floatType, setVolumetricRateMultiplier ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousVolumetricRateMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousVolumetricRateMultiplier, floatType, setPreviousVolumetricRateMultiplier ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, isochoricRateMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, isochoricRateMultiplier, floatType, setIsochoricRateMultiplier ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousIsochoricRateMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousIsochoricRateMultiplier, floatType, setPreviousIsochoricRateMultiplier ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVolumetricRateMultiplierdT, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVolumetricRateMultiplierdT, floatType, setdVolumetricRateMultiplierdT ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVolumetricRateMultiplierdPreviousT, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVolumetricRateMultiplierdPreviousT, floatType, setdPreviousVolumetricRateMultiplierdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dIsochoricRateMultiplierdT, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dIsochoricRateMultiplierdT, floatType, setdIsochoricRateMultiplierdT ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousIsochoricRateMultiplierdPreviousT, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousIsochoricRateMultiplierdPreviousT, floatType, setdPreviousIsochoricRateMultiplierdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, volumetricViscoelasticStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, volumetricViscoelasticStateVariables, floatVector, setUpdatedVolumetricViscoelasticStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, isochoricViscoelasticStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, isochoricViscoelasticStateVariables, floatVector, setUpdatedIsochoricViscoelasticStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2MeanStress, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2MeanStress, floatType, setPK2MeanStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2IsochoricStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2IsochoricStress, floatVector, setPK2IsochoricStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2MeanStressdT, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2MeanStressdT, floatType, setdPK2MeanStressdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2MeanStressdFe, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2MeanStressdFe, floatVector, setdPK2MeanStressdFe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2IsochoricStressdT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2IsochoricStressdT, floatVector, setdPK2IsochoricStressdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2IsochoricStressdFe, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2IsochoricStressdFe, floatMatrix, setdPK2IsochoricStressdFe ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2StressdT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2StressdT, floatVector, setdPK2StressdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dCauchyStressdT, floatVector, setdCauchyStressdT ) }; diff --git a/src/cpp/tardigrade_hydraMicromorphic.cpp b/src/cpp/tardigrade_hydraMicromorphic.cpp index 4711a61a..cdc870fb 100644 --- a/src/cpp/tardigrade_hydraMicromorphic.cpp +++ b/src/cpp/tardigrade_hydraMicromorphic.cpp @@ -145,10 +145,10 @@ namespace tardigradeHydra{ start_index += ( ( *getNumConfigurations( ) ) - 1 ) * ( *getDimension( ) ) * ( *getDimension( ) ); - computeGradientMicroConfigurations( getPreviousStateVariables( ), start_index, *getConfigurations( ), microConfigurations, + computeGradientMicroConfigurations( getPreviousStateVariables( ), start_index, *get_configurations( ), microConfigurations, *getGradientMicroDeformation( ), gradientMicroConfigurations ); - computeGradientMicroConfigurations( getPreviousStateVariables( ), start_index, *getPreviousConfigurations( ), previousMicroConfigurations, + computeGradientMicroConfigurations( getPreviousStateVariables( ), start_index, *get_previousConfigurations( ), previousMicroConfigurations, *getPreviousGradientMicroDeformation( ), previousGradientMicroConfigurations ); // Set the configurations @@ -177,7 +177,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfiguration( *getMicroConfigurations( ), lowerIndex, upperIndex ); + return getSubConfiguration( *get_microConfigurations( ), lowerIndex, upperIndex ); } @@ -224,7 +224,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfiguration( *getPreviousMicroConfigurations( ), lowerIndex, upperIndex ); + return getSubConfiguration( *get_previousMicroConfigurations( ), lowerIndex, upperIndex ); } @@ -274,7 +274,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfigurationJacobian( *getMicroConfigurations( ), lowerIndex, upperIndex ); + return getSubConfigurationJacobian( *get_microConfigurations( ), lowerIndex, upperIndex ); } @@ -313,7 +313,7 @@ namespace tardigradeHydra{ * Note, the configuration indicated by the index is NOT included in the sub-configuration */ - return getSubConfigurationJacobian( *getPreviousMicroConfigurations( ), lowerIndex, upperIndex ); + return getSubConfigurationJacobian( *get_previousMicroConfigurations( ), lowerIndex, upperIndex ); } @@ -348,7 +348,7 @@ namespace tardigradeHydra{ floatMatrix dChi1dChin; - calculateFirstConfigurationJacobians( *getMicroConfigurations( ), dChi1dChi, dChi1dChin ); + calculateFirstConfigurationJacobians( *get_microConfigurations( ), dChi1dChi, dChi1dChin ); set_dChi1dChi( dChi1dChi ); @@ -365,7 +365,7 @@ namespace tardigradeHydra{ floatMatrix previousdChi1dChin; - calculateFirstConfigurationJacobians( *getPreviousMicroConfigurations( ), previousdChi1dChi, previousdChi1dChin ); + calculateFirstConfigurationJacobians( *get_previousMicroConfigurations( ), previousdChi1dChi, previousdChi1dChin ); set_previousdChi1dChi( previousdChi1dChi ); @@ -388,9 +388,9 @@ namespace tardigradeHydra{ floatMatrix dGradChi1dGradChin; - calculateFirstConfigurationGradChiJacobian( *getConfigurations( ), *getMicroConfigurations( ), - *getGradientMicroDeformation( ), *getGradientMicroConfigurations( ), - *getdChi1dChi( ), *getdChi1dChin( ), + calculateFirstConfigurationGradChiJacobian( *get_configurations( ), *get_microConfigurations( ), + *getGradientMicroDeformation( ), *get_gradientMicroConfigurations( ), + *get_dChi1dChi( ), *get_dChi1dChin( ), dGradChi1dCn, dGradChi1dChi, dGradChi1dChin, dGradChi1dGradChi, dGradChi1dGradChin ); set_dGradChi1dFn( dGradChi1dCn ); @@ -420,9 +420,9 @@ namespace tardigradeHydra{ floatMatrix previousdGradChi1dGradChin; - calculateFirstConfigurationGradChiJacobian( *getPreviousConfigurations( ), *getPreviousMicroConfigurations( ), - *getPreviousGradientMicroDeformation( ), *getPreviousGradientMicroConfigurations( ), - *getPreviousdChi1dChi( ), *getPreviousdChi1dChin( ), + calculateFirstConfigurationGradChiJacobian( *get_previousConfigurations( ), *get_previousMicroConfigurations( ), + *getPreviousGradientMicroDeformation( ), *get_previousGradientMicroConfigurations( ), + *get_previousdChi1dChi( ), *get_previousdChi1dChin( ), previousdGradChi1dCn, previousdGradChi1dChi, previousdGradChi1dChin, previousdGradChi1dGradChi, previousdGradChi1dGradChin ); set_previousdGradChi1dFn( previousdGradChi1dCn ); @@ -437,216 +437,6 @@ namespace tardigradeHydra{ } - const floatMatrix *hydraBaseMicromorphic::getdChi1dChi( ){ - /*! - * Get the derivative of the first micro-configuration w.r.t. the total micro-configuration - */ - - if ( !_dChi1dChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstMicroConfigurationJacobians( ) ); - - } - - return &_dChi1dChi.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getdChi1dChin( ){ - /*! - * Get the derivative of the first micro-configuration w.r.t. the remaining micro-configurations - */ - - if ( !_dChi1dChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstMicroConfigurationJacobians( ) ); - - } - - return &_dChi1dChin.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getPreviousdChi1dChi( ){ - /*! - * Get the derivative of the previous first micro-configuration w.r.t. the total micro-configuration - */ - - if ( !_previousdChi1dChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstMicroConfigurationJacobians( ) ); - - } - - return &_previousdChi1dChi.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getPreviousdChi1dChin( ){ - /*! - * Get the derivative of the previous first micro-configuration w.r.t. the remaining micro-configurations - */ - - if ( !_previousdChi1dChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstMicroConfigurationJacobians( ) ); - - } - - return &_previousdChi1dChin.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getdGradChi1dFn( ){ - /*! - * Get the Jacobian of the spatial gradient of the first micro-configuration w.r.t. the sub configurations - */ - - if ( !_dGradChi1dFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_dGradChi1dFn.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getdGradChi1dChi( ){ - /*! - * Get the Jacobian of the spatial gradient of the first micro-configuration w.r.t. the micro-configuration - */ - - if ( !_dGradChi1dChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_dGradChi1dChi.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getdGradChi1dChin( ){ - /*! - * Get the Jacobian of the spatial gradient of the first micro-configuration w.r.t. the sub micro-configuration - */ - - if ( !_dGradChi1dChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_dGradChi1dChin.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getdGradChi1dGradChi( ){ - /*! - * Get the Jacobian of the spatial gradient of the first micro-configuration w.r.t. the spatial gradient of the micro-configuration - */ - - if ( !_dGradChi1dGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_dGradChi1dGradChi.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getdGradChi1dGradChin( ){ - /*! - * Get the Jacobian of the spatial gradient of the first micro-configuration w.r.t. the spatial gradient of the sub micro-configurations - */ - - if ( !_dGradChi1dGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_dGradChi1dGradChin.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getPreviousdGradChi1dFn( ){ - /*! - * Get the Jacobian of the previous spatial gradient of the first micro-configuration w.r.t. the sub configurations - */ - - if ( !_previousdGradChi1dFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_previousdGradChi1dFn.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getPreviousdGradChi1dChi( ){ - /*! - * Get the Jacobian of the previous spatial gradient of the first micro-configuration w.r.t. the micro-configuration - */ - - if ( !_previousdGradChi1dChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_previousdGradChi1dChi.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getPreviousdGradChi1dChin( ){ - /*! - * Get the Jacobian of the previous spatial gradient of the first micro-configuration w.r.t. the sub micro-configuration - */ - - if ( !_previousdGradChi1dChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_previousdGradChi1dChin.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getPreviousdGradChi1dGradChi( ){ - /*! - * Get the Jacobian of the previous spatial gradient of the first micro-configuration w.r.t. the spatial gradient of the micro-configuration - */ - - if ( !_previousdGradChi1dGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_previousdGradChi1dGradChi.second; - - } - - const floatMatrix *hydraBaseMicromorphic::getPreviousdGradChi1dGradChin( ){ - /*! - * Get the Jacobian of the previous spatial gradient of the first micro-configuration w.r.t. the spatial gradient of the sub micro-configurations - */ - - if ( !_previousdGradChi1dGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFirstGradientMicroConfigurationJacobians( ) ); - - } - - return &_previousdGradChi1dGradChin.second; - - } - void hydraBaseMicromorphic::calculateFirstConfigurationGradChi( const floatMatrix &configurations, const floatMatrix µConfigurations, const floatVector &gradientMicroConfiguration, floatMatrix &gradientMicroConfigurations ){ /*! * Calculate the value of the gradient of the first micro-configuration given all of the configurations, the micro-configurations, diff --git a/src/cpp/tardigrade_hydraMicromorphic.h b/src/cpp/tardigrade_hydraMicromorphic.h index c449318a..54c2bd3a 100644 --- a/src/cpp/tardigrade_hydraMicromorphic.h +++ b/src/cpp/tardigrade_hydraMicromorphic.h @@ -44,24 +44,6 @@ namespace tardigradeHydra{ //! Get the previous spatial gradient w.r.t. the reference configuration of the micro-deformation tensor const floatVector *getPreviousGradientMicroDeformation( ){ return &_previousGradientMicroDeformation; } - //! Get a reference to the micro configurations - const floatMatrix* getMicroConfigurations( ){ return &_microConfigurations.second; } - - //! Get a reference to the inverse micro configurations - const floatMatrix* getInverseMicroConfigurations( ){ return &_inverseMicroConfigurations.second; } - - //! Get a reference to the gradient of the micro configurations - const floatMatrix* getGradientMicroConfigurations( ){ return &_gradientMicroConfigurations.second; } - - //! Get a reference to the previous micro configurations - const floatMatrix* getPreviousMicroConfigurations( ){ return &_previousMicroConfigurations.second; } - - //! Get a reference to the previous inverse micro configurations - const floatMatrix* getPreviousInverseMicroConfigurations( ){ return &_previousInverseMicroConfigurations.second; } - - //! Get a reference to the gradient of the previous micro configurations - const floatMatrix* getPreviousGradientMicroConfigurations( ){ return &_previousGradientMicroConfigurations.second; } - floatVector getSubMicroConfiguration( const unsigned int &lowerIndex, const unsigned int &upperIndex ); floatVector getPrecedingMicroConfiguration( const unsigned int &index ); @@ -90,34 +72,6 @@ namespace tardigradeHydra{ floatMatrix getPreviousFollowingMicroConfigurationJacobian( const unsigned int &index ); - const floatMatrix *getdChi1dChi( ); - - const floatMatrix *getdChi1dChin( ); - - const floatMatrix *getPreviousdChi1dChi( ); - - const floatMatrix *getPreviousdChi1dChin( ); - - const floatMatrix *getdGradChi1dFn( ); - - const floatMatrix *getdGradChi1dChi( ); - - const floatMatrix *getdGradChi1dChin( ); - - const floatMatrix *getdGradChi1dGradChi( ); - - const floatMatrix *getdGradChi1dGradChin( ); - - const floatMatrix *getPreviousdGradChi1dFn( ); - - const floatMatrix *getPreviousdGradChi1dChi( ); - - const floatMatrix *getPreviousdGradChi1dChin( ); - - const floatMatrix *getPreviousdGradChi1dGradChi( ); - - const floatMatrix *getPreviousdGradChi1dGradChin( ); - protected: //Utility functions @@ -135,67 +89,67 @@ namespace tardigradeHydra{ floatVector _previousGradientMicroDeformation; //!< The previous spatial gradient of the micro-deformation w.r.t. the reference coordinates - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, microConfigurations, floatMatrix ) + void setFirstMicroConfigurationJacobians( ); - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, inverseMicroConfigurations, floatMatrix ) + void setPreviousFirstMicroConfigurationJacobians( ); - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, gradientMicroConfigurations, floatMatrix ) + void setFirstGradientMicroConfigurationJacobians( ); - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousMicroConfigurations, floatMatrix ) + void setPreviousFirstGradientMicroConfigurationJacobians( ); - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousInverseMicroConfigurations, floatMatrix ) + void computeGradientMicroConfigurations( const floatVector *data_vector, unsigned int start_index, + const floatMatrix &configurations, const floatMatrix µConfigurations, + const floatVector &gradientMicroConfiguration, floatMatrix &gradientMicroConfigurations ); - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousGradientMicroConfigurations, floatMatrix ) + void calculateFirstConfigurationGradChi( const floatMatrix &configurations, const floatMatrix µConfigurations, + const floatVector &gradientMicroConfiguration, floatMatrix &gradientMicroConfigurations ); - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dChi1dChi, floatMatrix ) + void calculateFirstConfigurationGradChiJacobian( const floatMatrix &configurations, const floatMatrix µConfigurations, + const floatVector &gradientMicroConfiguration, const floatMatrix &gradientMicroConfigurations, + const floatMatrix &dChi1dChi, const floatMatrix &dChi1dChin, + floatMatrix &dGradChi1dCn, + floatMatrix &dGradChi1dChi, floatMatrix &dGradChi1dChin, + floatMatrix &dGradChi1dGradChi, floatMatrix &dGradChi1dGradChin ); - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dChi1dChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, microConfigurations, floatMatrix, unexpectedError ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdChi1dChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, inverseMicroConfigurations, floatMatrix, unexpectedError ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdChi1dChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, gradientMicroConfigurations, floatMatrix, unexpectedError ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousMicroConfigurations, floatMatrix, unexpectedError ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousInverseMicroConfigurations, floatMatrix, unexpectedError ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousGradientMicroConfigurations, floatMatrix, unexpectedError ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dChi1dChi, floatMatrix, setFirstMicroConfigurationJacobians ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dChi1dChin, floatMatrix, setFirstMicroConfigurationJacobians ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdChi1dChi, floatMatrix, setPreviousFirstMicroConfigurationJacobians ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdChi1dChin, floatMatrix, setPreviousFirstMicroConfigurationJacobians ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dFn, floatMatrix, setFirstGradientMicroConfigurationJacobians ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dChi, floatMatrix, setFirstGradientMicroConfigurationJacobians ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dChin, floatMatrix, setFirstGradientMicroConfigurationJacobians ) - void setFirstMicroConfigurationJacobians( ); + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dGradChi, floatMatrix, setFirstGradientMicroConfigurationJacobians ) - void setPreviousFirstMicroConfigurationJacobians( ); + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGradChi1dGradChin, floatMatrix, setFirstGradientMicroConfigurationJacobians ) - void setFirstGradientMicroConfigurationJacobians( ); + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dFn, floatMatrix, setPreviousFirstGradientMicroConfigurationJacobians ) - void setPreviousFirstGradientMicroConfigurationJacobians( ); + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dChi, floatMatrix, setPreviousFirstGradientMicroConfigurationJacobians ) - void computeGradientMicroConfigurations( const floatVector *data_vector, unsigned int start_index, - const floatMatrix &configurations, const floatMatrix µConfigurations, - const floatVector &gradientMicroConfiguration, floatMatrix &gradientMicroConfigurations ); + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dChin, floatMatrix, setPreviousFirstGradientMicroConfigurationJacobians ) - void calculateFirstConfigurationGradChi( const floatMatrix &configurations, const floatMatrix µConfigurations, - const floatVector &gradientMicroConfiguration, floatMatrix &gradientMicroConfigurations ); + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dGradChi, floatMatrix, setPreviousFirstGradientMicroConfigurationJacobians ) - void calculateFirstConfigurationGradChiJacobian( const floatMatrix &configurations, const floatMatrix µConfigurations, - const floatVector &gradientMicroConfiguration, const floatMatrix &gradientMicroConfigurations, - const floatMatrix &dChi1dChi, const floatMatrix &dChi1dChin, - floatMatrix &dGradChi1dCn, - floatMatrix &dGradChi1dChi, floatMatrix &dGradChi1dChin, - floatMatrix &dGradChi1dGradChi, floatMatrix &dGradChi1dGradChin ); + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGradChi1dGradChin, floatMatrix, setPreviousFirstGradientMicroConfigurationJacobians ) }; diff --git a/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.cpp b/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.cpp index 7e1988f6..d0497280 100644 --- a/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.cpp +++ b/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.cpp @@ -1871,7 +1871,7 @@ namespace tardigradeHydra{ /*! * Evaluate the derived deformation measures * - * We assume that the first configuration in hydra.getConfigurations is the elastic one + * We assume that the first configuration in hydra.get_configurations is the elastic one * * \param isPrevious: Flag for whether the measures to be calculated are in the current or previous configuration */ @@ -1884,20 +1884,20 @@ namespace tardigradeHydra{ if ( isPrevious ){ - deformationGradient1 = ( *hydra->getPreviousConfigurations( ) )[ 0 ]; + deformationGradient1 = ( *hydra->get_previousConfigurations( ) )[ 0 ]; - microDeformation1 = ( *hydra->getPreviousMicroConfigurations( ) )[ 0 ]; + microDeformation1 = ( *hydra->get_previousMicroConfigurations( ) )[ 0 ]; - gradientMicroDeformation1 = ( *hydra->getPreviousGradientMicroConfigurations( ) )[ 0 ]; + gradientMicroDeformation1 = ( *hydra->get_previousGradientMicroConfigurations( ) )[ 0 ]; } else{ - deformationGradient1 = ( *hydra->getConfigurations( ) )[ 0 ]; + deformationGradient1 = ( *hydra->get_configurations( ) )[ 0 ]; - microDeformation1 = ( *hydra->getMicroConfigurations( ) )[ 0 ]; + microDeformation1 = ( *hydra->get_microConfigurations( ) )[ 0 ]; - gradientMicroDeformation1 = ( *hydra->getGradientMicroConfigurations( ) )[ 0 ]; + gradientMicroDeformation1 = ( *hydra->get_gradientMicroConfigurations( ) )[ 0 ]; } @@ -2201,1083 +2201,93 @@ namespace tardigradeHydra{ } - const variableVector *residual::getPK2Stress( ){ - /*! - * Get the value of the second Piola-Kirchhoff stress - */ - - if ( !_PK2Stress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPK2Stress( ) ); - - } - - return &_PK2Stress.second; - - } - - const variableVector *residual::getReferenceSymmetricMicroStress( ){ - /*! - * Get the value of the reference symmetric micro stress - */ - - if ( !_referenceSymmetricMicroStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setReferenceSymmetricMicroStress( ) ); - - } - - return &_referenceSymmetricMicroStress.second; - - } - - const variableVector *residual::getReferenceHigherOrderStress( ){ - /*! - * Get the value of the reference higher order stress - */ - - if ( !_referenceHigherOrderStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setReferenceHigherOrderStress( ) ); - - } - - return &_referenceHigherOrderStress.second; - - } - - const variableVector *residual::getPreviousPK2Stress( ){ - /*! - * Get the value of the previous second Piola-Kirchhoff stress - */ - - if ( !_previousPK2Stress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousPK2Stress( ) ); - - } - - return &_previousPK2Stress.second; - - } - - const variableVector *residual::getPreviousReferenceSymmetricMicroStress( ){ - /*! - * Get the value of the previous reference symmetric micro stress - */ - - if ( !_previousReferenceSymmetricMicroStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousReferenceSymmetricMicroStress( ) ); - - } - - return &_previousReferenceSymmetricMicroStress.second; - - } - - const variableVector *residual::getPreviousReferenceHigherOrderStress( ){ - /*! - * Get the value of the previous reference higher order stress - */ - - if ( !_previousReferenceHigherOrderStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousReferenceHigherOrderStress( ) ); - - } - - return &_previousReferenceHigherOrderStress.second; - - } - - void residual::setReferenceStresses( const bool isPrevious ){ - /*! - * Set the values of the reference stresses - * - * \param isPrevious: Flag for if the stresses to be calculated are the current (false) or previous (true) - */ - - const variableVector *C; - - const variableVector *Psi; - - const variableVector *Gamma; - - variableVector followingConfiguration; - - variableVector followingMicroConfiguration; - - if ( isPrevious ){ - - C = getPreviousRightCauchyGreen( ); - - Psi = getPreviousPsi( ); - - Gamma = getPreviousGamma( ); - - followingConfiguration = hydra->getPreviousFollowingConfiguration( 0 ); - - followingMicroConfiguration = hydra->getPreviousFollowingMicroConfiguration( 0 ); - - } - else{ - - C = getRightCauchyGreen( ); - - Psi = getPsi( ); - - Gamma = getGamma( ); - - followingConfiguration = hydra->getFollowingConfiguration( 0 ); - - followingMicroConfiguration = hydra->getFollowingMicroConfiguration( 0 ); - - } - - floatVector localPK2Stress; - - floatVector localReferenceSymmetricMicroStress; - - floatVector localReferenceHigherOrderStress; - - // Compute the stresses in the local configuration - TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( linearElasticityReferenceDerivedMeasures( *C, *Psi, *Gamma, *getAMatrix( ), *getBMatrix( ), *getCMatrix( ), *getDMatrix( ), - localPK2Stress, localReferenceSymmetricMicroStress, localReferenceHigherOrderStress ) ); - - floatVector PK2Stress; - - floatVector referenceSymmetricMicroStress; - - floatVector referenceHigherOrderStress; - - // Pull the stresses back to the true reference configuration - TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeMicromorphicTools::pullBackCauchyStress( localPK2Stress, followingConfiguration, PK2Stress ) ); - - TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeMicromorphicTools::pullBackMicroStress( localReferenceSymmetricMicroStress, followingConfiguration, referenceSymmetricMicroStress ) ); - - TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeMicromorphicTools::pullBackHigherOrderStress( localReferenceHigherOrderStress, followingConfiguration, followingMicroConfiguration, - referenceHigherOrderStress ) ); - - if ( isPrevious ){ - - set_previousPK2Stress( PK2Stress ); - - set_previousReferenceSymmetricMicroStress( referenceSymmetricMicroStress ); - - set_previousReferenceHigherOrderStress( referenceHigherOrderStress ); - - } - else{ - - set_PK2Stress( PK2Stress ); - - set_referenceSymmetricMicroStress( referenceSymmetricMicroStress ); - - set_referenceHigherOrderStress( referenceHigherOrderStress ); - - } - - } - - const variableMatrix *residual::getdRightCauchyGreendF( ){ - /*! - * Get the jacobian of the right Cauchy-Green deformation tensor w.r.t. the total deformation gradient - */ - - if ( !_dRightCauchyGreendF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdRightCauchyGreendF( ) ); - - } - - return &_dRightCauchyGreendF.second; - - } - - const variableMatrix *residual::getdRightCauchyGreendFn( ){ - /*! - * Get the jacobian of the right Cauchy-Green deformation tensor w.r.t. the remaining sub-deformation gradients - */ - - if ( !_dRightCauchyGreendFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdRightCauchyGreendFn( ) ); - - } - - return &_dRightCauchyGreendFn.second; - - } - - const variableMatrix *residual::getdPsidF( ){ - /*! - * Get the jacobian of the micro deformation measure psi w.r.t. the total deformation gradient - */ - - if ( !_dPsidF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPsidF( ) ); - - } - - return &_dPsidF.second; - - } - - const variableMatrix *residual::getdPsidFn( ){ - /*! - * Get the jacobian of the micro deformation tensor psi w.r.t. the remaining sub-deformation gradients - */ - - if ( !_dPsidFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPsidFn( ) ); - - } - - return &_dPsidFn.second; - - } - - const variableMatrix *residual::getdPsidChi( ){ - /*! - * Get the jacobian of the micro deformation measure psi w.r.t. the total micro-deformation - */ - - if ( !_dPsidChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPsidChi( ) ); - - } - - return &_dPsidChi.second; - - } - - const variableMatrix *residual::getdPsidChin( ){ - /*! - * Get the jacobian of the micro deformation tensor psi w.r.t. the remaining sub-micro deformations - */ - - if ( !_dPsidChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPsidChin( ) ); - - } - - return &_dPsidChin.second; - - } - - const variableMatrix *residual::getdGammadF( ){ - /*! - * Get the jacobian of the micro deformation measure gamma w.r.t. the total deformation gradient - */ - - if ( !_dGammadF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdGammadF( ) ); - - } - - return &_dGammadF.second; - - } - - const variableMatrix *residual::getdGammadFn( ){ - /*! - * Get the jacobian of the micro deformation tensor gamma w.r.t. the remaining sub-deformation gradients - */ - - if ( !_dGammadFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdGammadFn( ) ); - - } - - return &_dGammadFn.second; - - } - - const variableMatrix *residual::getdGammadChi( ){ - /*! - * Get the jacobian of the micro deformation measure gamma w.r.t. the total micro-deformation - */ - - if ( !_dGammadChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdGammadChi( ) ); - - } - - return &_dGammadChi.second; - - } - - const variableMatrix *residual::getdGammadChin( ){ - /*! - * Get the jacobian of the micro deformation tensor gamma w.r.t. the remaining sub-micro deformations - */ - - if ( !_dGammadChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdGammadChin( ) ); - - } - - return &_dGammadChin.second; - - } - - const variableMatrix *residual::getdGammadGradChi( ){ - /*! - * Get the jacobian of the micro deformation measure gamma w.r.t. the reference spatial gradient of the total micro-deformation - */ - - if ( !_dGammadGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdGammadGradChi( ) ); - - } - - return &_dGammadGradChi.second; - - } - - const variableMatrix *residual::getdGammadGradChin( ){ - /*! - * Get the jacobian of the micro deformation tensor gamma w.r.t. the local reference spatial gradient of the remaining sub-micro deformations - */ - - if ( !_dGammadGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdGammadGradChin( ) ); - - } - - return &_dGammadGradChin.second; - - } - - const variableMatrix *residual::getPreviousdRightCauchyGreendF( ){ - /*! - * Get the jacobian of the previous right Cauchy-Green deformation tensor w.r.t. the total deformation gradient - */ - - if ( !_previousdRightCauchyGreendF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdRightCauchyGreendF( ) ); - - } - - return &_previousdRightCauchyGreendF.second; - - } - - const variableMatrix *residual::getPreviousdRightCauchyGreendFn( ){ - /*! - * Get the jacobian of the previous right Cauchy-Green deformation tensor w.r.t. the remaining sub-deformation gradients - */ - - if ( !_previousdRightCauchyGreendFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdRightCauchyGreendFn( ) ); - - } - - return &_previousdRightCauchyGreendFn.second; - - } - - const variableMatrix *residual::getPreviousdPsidF( ){ - /*! - * Get the jacobian of the previous micro deformation measure psi w.r.t. the total deformation gradient - */ - - if ( !_previousdPsidF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPsidF( ) ); - - } - - return &_previousdPsidF.second; - - } - - const variableMatrix *residual::getPreviousdPsidFn( ){ - /*! - * Get the jacobian of the previous micro deformation tensor psi w.r.t. the remaining sub-deformation gradients - */ - - if ( !_previousdPsidFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPsidFn( ) ); - - } - - return &_previousdPsidFn.second; - - } - - const variableMatrix *residual::getPreviousdPsidChi( ){ - /*! - * Get the jacobian of the previous micro deformation measure psi w.r.t. the total micro-deformation - */ - - if ( !_previousdPsidChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPsidChi( ) ); - - } - - return &_previousdPsidChi.second; - - } - - const variableMatrix *residual::getPreviousdPsidChin( ){ - /*! - * Get the jacobian of the previous micro deformation tensor psi w.r.t. the remaining sub-micro deformations - */ - - if ( !_previousdPsidChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPsidChin( ) ); - - } - - return &_previousdPsidChin.second; - - } - - const variableMatrix *residual::getPreviousdGammadF( ){ - /*! - * Get the jacobian of the previous micro deformation measure gamma w.r.t. the total deformation gradient - */ - - if ( !_previousdGammadF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdGammadF( ) ); - - } - - return &_previousdGammadF.second; - - } - - const variableMatrix *residual::getPreviousdGammadFn( ){ - /*! - * Get the jacobian of the previous micro deformation tensor gamma w.r.t. the remaining sub-deformation gradients - */ - - if ( !_previousdGammadFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdGammadFn( ) ); - - } - - return &_previousdGammadFn.second; - - } - - const variableMatrix *residual::getPreviousdGammadChi( ){ - /*! - * Get the jacobian of the previous micro deformation measure gamma w.r.t. the total micro-deformation - */ - - if ( !_previousdGammadChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdGammadChi( ) ); - - } - - return &_previousdGammadChi.second; - - } - - const variableMatrix *residual::getPreviousdGammadChin( ){ - /*! - * Get the jacobian of the previous micro deformation tensor gamma w.r.t. the remaining sub-micro deformations - */ - - if ( !_previousdGammadChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdGammadChin( ) ); - - } - - return &_previousdGammadChin.second; - - } - - const variableMatrix *residual::getPreviousdGammadGradChi( ){ - /*! - * Get the jacobian of the previous micro deformation measure gamma w.r.t. the reference spatial gradient of the total micro-deformation - */ - - if ( !_previousdGammadGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdGammadGradChi( ) ); - - } - - return &_previousdGammadGradChi.second; - - } - - const variableMatrix *residual::getPreviousdGammadGradChin( ){ - /*! - * Get the jacobian of the previous micro deformation tensor gamma w.r.t. the local reference spatial gradient of the remaining sub-micro deformations - */ - - if ( !_previousdGammadGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdGammadGradChin( ) ); - - } - - return &_previousdGammadGradChin.second; - - } - - const variableMatrix *residual::getdPK2dF( ){ - /*! - * Get the value of the derivative second Piola-Kirchhoff stress w.r.t. the deformation gradient - */ - - if ( !_dPK2dF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2dF( ) ); - - } - - return &_dPK2dF.second; - - } - - const variableMatrix *residual::getdPK2dFn( ){ - /*! - * Get the value of the derivative second Piola-Kirchhoff stress w.r.t. the sub-deformation gradients - */ - - if ( !_dPK2dFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2dFn( ) ); - - } - - return &_dPK2dFn.second; - - } - - const variableMatrix *residual::getdPK2dChi( ){ - /*! - * Get the value of the derivative second Piola-Kirchhoff stress w.r.t. the micro-deformation - */ - - if ( !_dPK2dChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2dChi( ) ); - - } - - return &_dPK2dChi.second; - - } - - const variableMatrix *residual::getdPK2dChin( ){ - /*! - * Get the value of the derivative second Piola-Kirchhoff stress w.r.t. the sub-micro deformations - */ - - if ( !_dPK2dChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2dChin( ) ); - - } - - return &_dPK2dChin.second; - - } - - const variableMatrix *residual::getdPK2dGradChi( ){ - /*! - * Get the value of the derivative second Piola-Kirchhoff stress w.r.t. the spatial gradient of the micro-deformation - */ - - if ( !_dPK2dGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2dGradChi( ) ); - - } - - return &_dPK2dGradChi.second; - - } - - const variableMatrix *residual::getdPK2dGradChin( ){ - /*! - * Get the value of the derivative second Piola-Kirchhoff stress w.r.t. the local spatial gradients of the sub-micro deformations - */ - - if ( !_dPK2dGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPK2dGradChin( ) ); - - } - - return &_dPK2dGradChin.second; - - } - - const variableMatrix *residual::getdSIGMAdF( ){ - /*! - * Get the value of the derivative of the reference symmetric micro stress w.r.t. the deformation gradient - */ - - if ( !_dSIGMAdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdSIGMAdF( ) ); - - } - - return &_dSIGMAdF.second; - - } - - const variableMatrix *residual::getdSIGMAdFn( ){ - /*! - * Get the value of the reference symmetric micro stress w.r.t. the sub-deformation gradients - */ - - if ( !_dSIGMAdFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdSIGMAdFn( ) ); - - } - - return &_dSIGMAdFn.second; - - } - - const variableMatrix *residual::getdSIGMAdChi( ){ - /*! - * Get the value of the derivative of the reference symmetric micro stress w.r.t. the micro-deformation - */ - - if ( !_dSIGMAdChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdSIGMAdChi( ) ); - - } - - return &_dSIGMAdChi.second; - - } - - const variableMatrix *residual::getdSIGMAdChin( ){ - /*! - * Get the value of the derivative of the reference symmetric micro stress w.r.t. the sub-micro deformations - */ - - if ( !_dSIGMAdChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdSIGMAdChin( ) ); - - } - - return &_dSIGMAdChin.second; - - } - - const variableMatrix *residual::getdSIGMAdGradChi( ){ - /*! - * Get the value of the derivative of the reference symmetric micro stress w.r.t. the spatial gradient of the micro-deformation - */ - - if ( !_dSIGMAdGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdSIGMAdGradChi( ) ); - - } - - return &_dSIGMAdGradChi.second; - - } - - const variableMatrix *residual::getdSIGMAdGradChin( ){ - /*! - * Get the value of the derivative of the reference symmetric micro stress w.r.t. the local spatial gradients of the sub-micro deformations - */ - - if ( !_dSIGMAdGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdSIGMAdGradChin( ) ); - - } - - return &_dSIGMAdGradChin.second; - - } - - const variableMatrix *residual::getdMdF( ){ - /*! - * Get the value of the derivative of the higher order stress w.r.t. the deformation gradient - */ - - if ( !_dMdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdMdF( ) ); - - } - - return &_dMdF.second; - - } - - const variableMatrix *residual::getdMdFn( ){ - /*! - * Get the value of the derivative of the higher order stress w.r.t. the sub-deformation gradients - */ - - if ( !_dMdFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdMdFn( ) ); - - } - - return &_dMdFn.second; - - } - - const variableMatrix *residual::getdMdChi( ){ - /*! - * Get the value of the derivative of the reference higher order stress w.r.t. the micro-deformation - */ - - if ( !_dMdChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdMdChi( ) ); - - } - - return &_dMdChi.second; - - } - - const variableMatrix *residual::getdMdChin( ){ - /*! - * Get the value of the derivative of the higher order stress w.r.t. the sub-micro deformations - */ - - if ( !_dMdChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdMdChin( ) ); - - } - - return &_dMdChin.second; - - } - - const variableMatrix *residual::getdMdGradChi( ){ - /*! - * Get the value of the derivative of the reference higher order stress w.r.t. the spatial gradient of the micro-deformation - */ - - if ( !_dMdGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdMdGradChi( ) ); - - } - - return &_dMdGradChi.second; - - } - - const variableMatrix *residual::getdMdGradChin( ){ - /*! - * Get the value of the derivative of the reference higher order stress w.r.t. the local spatial gradients of the sub-micro deformations - */ - - if ( !_dMdGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdMdGradChin( ) ); - - } - - return &_dMdGradChin.second; - - } - - const variableMatrix *residual::getPreviousdPK2dF( ){ - /*! - * Get the value of the previous derivative second Piola-Kirchhoff stress w.r.t. the deformation gradient - */ - - if ( !_previousdPK2dF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPK2dF( ) ); - - } - - return &_previousdPK2dF.second; - - } - - const variableMatrix *residual::getPreviousdPK2dFn( ){ - /*! - * Get the previous value of the derivative second Piola-Kirchhoff stress w.r.t. the sub-deformation gradients - */ - - if ( !_previousdPK2dFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPK2dFn( ) ); - - } - - return &_previousdPK2dFn.second; - - } - - const variableMatrix *residual::getPreviousdPK2dChi( ){ - /*! - * Get the previous value of the derivative second Piola-Kirchhoff stress w.r.t. the micro-deformation - */ - - if ( !_previousdPK2dChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPK2dChi( ) ); - - } - - return &_previousdPK2dChi.second; - - } - - const variableMatrix *residual::getPreviousdPK2dChin( ){ - /*! - * Get the previous value of the derivative second Piola-Kirchhoff stress w.r.t. the sub-micro deformations - */ - - if ( !_previousdPK2dChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPK2dChin( ) ); - - } - - return &_previousdPK2dChin.second; - - } - - const variableMatrix *residual::getPreviousdPK2dGradChi( ){ - /*! - * Get the previous value of the derivative second Piola-Kirchhoff stress w.r.t. the spatial gradient of the micro-deformation - */ - - if ( !_previousdPK2dGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPK2dGradChi( ) ); - - } - - return &_previousdPK2dGradChi.second; - - } - - const variableMatrix *residual::getPreviousdPK2dGradChin( ){ - /*! - * Get the previous value of the derivative second Piola-Kirchhoff stress w.r.t. the local spatial gradients of the sub-micro deformations - */ - - if ( !_previousdPK2dGradChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdPK2dGradChin( ) ); - - } - - return &_previousdPK2dGradChin.second; - - } - - const variableMatrix *residual::getPreviousdSIGMAdF( ){ - /*! - * Get the previous value of the derivative of the reference symmetric micro stress w.r.t. the deformation gradient - */ - - if ( !_previousdSIGMAdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdSIGMAdF( ) ); - - } - - return &_previousdSIGMAdF.second; - - } - - const variableMatrix *residual::getPreviousdSIGMAdFn( ){ - /*! - * Get the previous value of the reference symmetric micro stress w.r.t. the sub-deformation gradients - */ - - if ( !_previousdSIGMAdFn.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdSIGMAdFn( ) ); - - } - - return &_previousdSIGMAdFn.second; - - } - - const variableMatrix *residual::getPreviousdSIGMAdChi( ){ - /*! - * Get the previous value of the derivative of the reference symmetric micro stress w.r.t. the micro-deformation - */ - - if ( !_previousdSIGMAdChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdSIGMAdChi( ) ); - - } - - return &_previousdSIGMAdChi.second; - - } - - const variableMatrix *residual::getPreviousdSIGMAdChin( ){ - /*! - * Get the previous value of the derivative of the reference symmetric micro stress w.r.t. the sub-micro deformations - */ - - if ( !_previousdSIGMAdChin.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdSIGMAdChin( ) ); - - } - - return &_previousdSIGMAdChin.second; - - } - - const variableMatrix *residual::getPreviousdSIGMAdGradChi( ){ + void residual::setReferenceStresses( const bool isPrevious ){ /*! - * Get the previous value of the derivative of the reference symmetric micro stress w.r.t. the spatial gradient of the micro-deformation + * Set the values of the reference stresses + * + * \param isPrevious: Flag for if the stresses to be calculated are the current (false) or previous (true) */ - if ( !_previousdSIGMAdGradChi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdSIGMAdGradChi( ) ); - - } - - return &_previousdSIGMAdGradChi.second; + const variableVector *C; - } + const variableVector *Psi; - const variableMatrix *residual::getPreviousdSIGMAdGradChin( ){ - /*! - * Get the previous value of the derivative of the reference symmetric micro stress w.r.t. the local spatial gradients of the sub-micro deformations - */ + const variableVector *Gamma; - if ( !_previousdSIGMAdGradChin.first ){ + variableVector followingConfiguration; - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdSIGMAdGradChin( ) ); + variableVector followingMicroConfiguration; - } + if ( isPrevious ){ - return &_previousdSIGMAdGradChin.second; + C = get_previousRightCauchyGreen( ); - } + Psi = get_previousPsi( ); - const variableMatrix *residual::getPreviousdMdF( ){ - /*! - * Get the previous value of the derivative of the higher order stress w.r.t. the deformation gradient - */ + Gamma = get_previousGamma( ); - if ( !_previousdMdF.first ){ + followingConfiguration = hydra->getPreviousFollowingConfiguration( 0 ); - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdMdF( ) ); + followingMicroConfiguration = hydra->getPreviousFollowingMicroConfiguration( 0 ); } + else{ - return &_previousdMdF.second; - - } + C = get_rightCauchyGreen( ); - const variableMatrix *residual::getPreviousdMdFn( ){ - /*! - * Get the previous value of the derivative of the higher order stress w.r.t. the sub-deformation gradients - */ + Psi = get_psi( ); - if ( !_previousdMdFn.first ){ + Gamma = get_gamma( ); - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdMdFn( ) ); + followingConfiguration = hydra->getFollowingConfiguration( 0 ); + + followingMicroConfiguration = hydra->getFollowingMicroConfiguration( 0 ); } - return &_previousdMdFn.second; - - } - - const variableMatrix *residual::getPreviousdMdChi( ){ - /*! - * Get the previous value of the derivative of the reference higher order stress w.r.t. the micro-deformation - */ - - if ( !_previousdMdChi.first ){ + floatVector localPK2Stress; - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdMdChi( ) ); + floatVector localReferenceSymmetricMicroStress; - } + floatVector localReferenceHigherOrderStress; - return &_previousdMdChi.second; + // Compute the stresses in the local configuration + TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( linearElasticityReferenceDerivedMeasures( *C, *Psi, *Gamma, *getAMatrix( ), *getBMatrix( ), *getCMatrix( ), *getDMatrix( ), + localPK2Stress, localReferenceSymmetricMicroStress, localReferenceHigherOrderStress ) ); - } + floatVector PK2Stress; - const variableMatrix *residual::getPreviousdMdChin( ){ - /*! - * Get the previous value of the derivative of the higher order stress w.r.t. the sub-micro deformations - */ + floatVector referenceSymmetricMicroStress; - if ( !_previousdMdChin.first ){ + floatVector referenceHigherOrderStress; - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdMdChin( ) ); + // Pull the stresses back to the true reference configuration + TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeMicromorphicTools::pullBackCauchyStress( localPK2Stress, followingConfiguration, PK2Stress ) ); - } + TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeMicromorphicTools::pullBackMicroStress( localReferenceSymmetricMicroStress, followingConfiguration, referenceSymmetricMicroStress ) ); - return &_previousdMdChin.second; + TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeMicromorphicTools::pullBackHigherOrderStress( localReferenceHigherOrderStress, followingConfiguration, followingMicroConfiguration, + referenceHigherOrderStress ) ); - } + if ( isPrevious ){ - const variableMatrix *residual::getPreviousdMdGradChi( ){ - /*! - * Get the previous value of the derivative of the reference higher order stress w.r.t. the spatial gradient of the micro-deformation - */ + set_previousPK2Stress( PK2Stress ); - if ( !_previousdMdGradChi.first ){ + set_previousReferenceSymmetricMicroStress( referenceSymmetricMicroStress ); - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdMdGradChi( ) ); + set_previousReferenceHigherOrderStress( referenceHigherOrderStress ); } + else{ - return &_previousdMdGradChi.second; - - } - - const variableMatrix *residual::getPreviousdMdGradChin( ){ - /*! - * Get the previous value of the derivative of the reference higher order stress w.r.t. the local spatial gradients of the sub-micro deformations - */ + set_PK2Stress( PK2Stress ); - if ( !_previousdMdGradChin.first ){ + set_referenceSymmetricMicroStress( referenceSymmetricMicroStress ); - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousdMdGradChin( ) ); + set_referenceHigherOrderStress( referenceHigherOrderStress ); } - return &_previousdMdGradChin.second; - } void residual::setdPK2dF( ){ @@ -3653,35 +2663,35 @@ namespace tardigradeHydra{ if ( isPrevious ){ - dCdF = getPreviousdRightCauchyGreendF( ); + dCdF = get_previousdRightCauchyGreendF( ); - dCdFn = getPreviousdRightCauchyGreendFn( ); + dCdFn = get_previousdRightCauchyGreendFn( ); - C = getPreviousRightCauchyGreen( ); + C = get_previousRightCauchyGreen( ); - dPsidF = getPreviousdPsidF( ); + dPsidF = get_previousdPsidF( ); - dPsidFn = getPreviousdPsidFn( ); + dPsidFn = get_previousdPsidFn( ); - dPsidChi = getPreviousdPsidChi( ); + dPsidChi = get_previousdPsidChi( ); - dPsidChin = getPreviousdPsidChin( ); + dPsidChin = get_previousdPsidChin( ); - Psi = getPreviousPsi( ); + Psi = get_previousPsi( ); - dGammadF = getPreviousdGammadF( ); + dGammadF = get_previousdGammadF( ); - dGammadFn = getPreviousdGammadFn( ); + dGammadFn = get_previousdGammadFn( ); - dGammadChi = getPreviousdGammadChi( ); + dGammadChi = get_previousdGammadChi( ); - dGammadChin = getPreviousdGammadChin( ); + dGammadChin = get_previousdGammadChin( ); - dGammadGradChi = getPreviousdGammadGradChi( ); + dGammadGradChi = get_previousdGammadGradChi( ); - dGammadGradChin = getPreviousdGammadGradChin( ); + dGammadGradChin = get_previousdGammadGradChin( ); - Gamma = getPreviousGamma( ); + Gamma = get_previousGamma( ); dFFollowdFs = hydra->getPreviousFollowingConfigurationJacobian( 0 ); @@ -3694,35 +2704,35 @@ namespace tardigradeHydra{ } else{ - dCdF = getdRightCauchyGreendF( ); + dCdF = get_dRightCauchyGreendF( ); - dCdFn = getdRightCauchyGreendFn( ); + dCdFn = get_dRightCauchyGreendFn( ); - C = getRightCauchyGreen( ); + C = get_rightCauchyGreen( ); - dPsidF = getdPsidF( ); + dPsidF = get_dPsidF( ); - dPsidFn = getdPsidFn( ); + dPsidFn = get_dPsidFn( ); - dPsidChi = getdPsidChi( ); + dPsidChi = get_dPsidChi( ); - dPsidChin = getdPsidChin( ); + dPsidChin = get_dPsidChin( ); - Psi = getPsi( ); + Psi = get_psi( ); - dGammadF = getdGammadF( ); + dGammadF = get_dGammadF( ); - dGammadFn = getdGammadFn( ); + dGammadFn = get_dGammadFn( ); - dGammadChi = getdGammadChi( ); + dGammadChi = get_dGammadChi( ); - dGammadChin = getdGammadChin( ); + dGammadChin = get_dGammadChin( ); - dGammadGradChi = getdGammadGradChi( ); + dGammadGradChi = get_dGammadGradChi( ); - dGammadGradChin = getdGammadGradChin( ); + dGammadGradChin = get_dGammadGradChin( ); - Gamma = getGamma( ); + Gamma = get_gamma( ); dFFollowdFs = hydra->getFollowingConfigurationJacobian( 0 ); @@ -3958,7 +2968,7 @@ namespace tardigradeHydra{ /*! * Evaluate the derived deformation Jacobians * - * We assume that the first configuration in hydra.getConfigurations is the elastic one + * We assume that the first configuration in hydra.get_configurations is the elastic one * * \param isPrevious: Flag for whether the measures to be calculated are in the current or previous configuration */ @@ -3989,56 +2999,56 @@ namespace tardigradeHydra{ if ( isPrevious ){ - deformationGradient1 = ( *hydra->getPreviousConfigurations( ) )[ 0 ]; + deformationGradient1 = ( *hydra->get_previousConfigurations( ) )[ 0 ]; - microDeformation1 = ( *hydra->getPreviousMicroConfigurations( ) )[ 0 ]; + microDeformation1 = ( *hydra->get_previousMicroConfigurations( ) )[ 0 ]; - gradientMicroDeformation1 = ( *hydra->getPreviousGradientMicroConfigurations( ) )[ 0 ]; + gradientMicroDeformation1 = ( *hydra->get_previousGradientMicroConfigurations( ) )[ 0 ]; - dF1dF = hydra->getPreviousdF1dF( ); + dF1dF = hydra->get_previousdF1dF( ); - dF1dFn = hydra->getPreviousdF1dFn( ); + dF1dFn = hydra->get_previousdF1dFn( ); - dChi1dChi = hydra->getPreviousdChi1dChi( ); + dChi1dChi = hydra->get_previousdChi1dChi( ); - dChi1dChin = hydra->getPreviousdChi1dChin( ); + dChi1dChin = hydra->get_previousdChi1dChin( ); - dGradChi1dFn = hydra->getPreviousdGradChi1dFn( ); + dGradChi1dFn = hydra->get_previousdGradChi1dFn( ); - dGradChi1dChi = hydra->getPreviousdGradChi1dChi( ); + dGradChi1dChi = hydra->get_previousdGradChi1dChi( ); - dGradChi1dChin = hydra->getPreviousdGradChi1dChin( ); + dGradChi1dChin = hydra->get_previousdGradChi1dChin( ); - dGradChi1dGradChi = hydra->getPreviousdGradChi1dGradChi( ); + dGradChi1dGradChi = hydra->get_previousdGradChi1dGradChi( ); - dGradChi1dGradChin = hydra->getPreviousdGradChi1dGradChin( ); + dGradChi1dGradChin = hydra->get_previousdGradChi1dGradChin( ); } else{ - deformationGradient1 = ( *hydra->getConfigurations( ) )[ 0 ]; + deformationGradient1 = ( *hydra->get_configurations( ) )[ 0 ]; - microDeformation1 = ( *hydra->getMicroConfigurations( ) )[ 0 ]; + microDeformation1 = ( *hydra->get_microConfigurations( ) )[ 0 ]; - gradientMicroDeformation1 = ( *hydra->getGradientMicroConfigurations( ) )[ 0 ]; + gradientMicroDeformation1 = ( *hydra->get_gradientMicroConfigurations( ) )[ 0 ]; - dF1dF = hydra->getdF1dF( ); + dF1dF = hydra->get_dF1dF( ); - dF1dFn = hydra->getdF1dFn( ); + dF1dFn = hydra->get_dF1dFn( ); - dChi1dChi = hydra->getdChi1dChi( ); + dChi1dChi = hydra->get_dChi1dChi( ); - dChi1dChin = hydra->getdChi1dChin( ); + dChi1dChin = hydra->get_dChi1dChin( ); - dGradChi1dFn = hydra->getdGradChi1dFn( ); + dGradChi1dFn = hydra->get_dGradChi1dFn( ); - dGradChi1dChi = hydra->getdGradChi1dChi( ); + dGradChi1dChi = hydra->get_dGradChi1dChi( ); - dGradChi1dChin = hydra->getdGradChi1dChin( ); + dGradChi1dChin = hydra->get_dGradChi1dChin( ); - dGradChi1dGradChi = hydra->getdGradChi1dGradChi( ); + dGradChi1dGradChi = hydra->get_dGradChi1dGradChi( ); - dGradChi1dGradChin = hydra->getdGradChi1dGradChin( ); + dGradChi1dGradChin = hydra->get_dGradChi1dGradChin( ); } @@ -4131,98 +3141,6 @@ namespace tardigradeHydra{ } - const variableVector *residual::getRightCauchyGreen( ){ - /*! - * Set the value of the right Cauchy-Green deformation tensor - */ - - if ( !_rightCauchyGreen.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDeformation( false ) ); - - } - - return &_rightCauchyGreen.second; - - } - - const variableVector *residual::getPsi( ){ - /*! - * Set the value of the micro deformation measure Psi - */ - - if ( !_psi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDeformation( false ) ); - - } - - return &_psi.second; - - } - - - const variableVector *residual::getGamma( ){ - /*! - * Set the value of the micro deformation measure Gamma - */ - - if ( !_gamma.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDeformation( false ) ); - - } - - return &_gamma.second; - - } - - const variableVector *residual::getPreviousRightCauchyGreen( ){ - /*! - * Set the previous value of the right Cauchy-Green deformation tensor - */ - - if ( !_previousRightCauchyGreen.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDeformation( true ) ); - - } - - return &_previousRightCauchyGreen.second; - - } - - const variableVector *residual::getPreviousPsi( ){ - /*! - * Set the value of the previous micro deformation measure Psi - */ - - if ( !_previousPsi.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDeformation( true ) ); - - } - - return &_previousPsi.second; - - } - - - const variableVector *residual::getPreviousGamma( ){ - /*! - * Set the value of the previous micro deformation measure Gamma - */ - - if ( !_previousGamma.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDeformation( true ) ); - - } - - return &_previousGamma.second; - - } - } } diff --git a/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.h b/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.h index c38a1051..f6456d33 100644 --- a/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.h +++ b/src/cpp/tardigrade_hydraMicromorphicLinearElasticity.h @@ -252,151 +252,13 @@ namespace tardigradeHydra{ //! Return a reference to the D stiffness matrix const parameterVector *getDMatrix( ){ return &_Dmatrix; } - const variableVector *getRightCauchyGreen( ); - - const variableVector *getPsi( ); - - const variableVector *getGamma( ); - - const variableVector *getPreviousRightCauchyGreen( ); - - const variableVector *getPreviousPsi( ); - - const variableVector *getPreviousGamma( ); - - const variableVector *getPK2Stress( ); - - const variableVector *getReferenceSymmetricMicroStress( ); - - const variableVector *getReferenceHigherOrderStress( ); - - const variableVector *getPreviousPK2Stress( ); - - const variableVector *getPreviousReferenceSymmetricMicroStress( ); - - const variableVector *getPreviousReferenceHigherOrderStress( ); - - const variableMatrix *getdRightCauchyGreendF( ); - - const variableMatrix *getdRightCauchyGreendFn( ); - - const variableMatrix *getdPsidF( ); - - const variableMatrix *getdPsidFn( ); - - const variableMatrix *getdPsidChi( ); - - const variableMatrix *getdPsidChin( ); - - const variableMatrix *getdGammadF( ); - - const variableMatrix *getdGammadFn( ); - - const variableMatrix *getdGammadChi( ); - - const variableMatrix *getdGammadChin( ); - - const variableMatrix *getdGammadGradChi( ); - - const variableMatrix *getdGammadGradChin( ); - - const variableMatrix *getPreviousdRightCauchyGreendF( ); - - const variableMatrix *getPreviousdRightCauchyGreendFn( ); - - const variableMatrix *getPreviousdPsidF( ); - - const variableMatrix *getPreviousdPsidFn( ); - - const variableMatrix *getPreviousdPsidChi( ); - - const variableMatrix *getPreviousdPsidChin( ); - - const variableMatrix *getPreviousdGammadF( ); - - const variableMatrix *getPreviousdGammadFn( ); - - const variableMatrix *getPreviousdGammadChi( ); - - const variableMatrix *getPreviousdGammadChin( ); - - const variableMatrix *getPreviousdGammadGradChi( ); - - const variableMatrix *getPreviousdGammadGradChin( ); - - const variableMatrix *getdPK2dF( ); - - const variableMatrix *getdPK2dFn( ); - - const variableMatrix *getdPK2dChi( ); - - const variableMatrix *getdPK2dChin( ); - - const variableMatrix *getdPK2dGradChi( ); - - const variableMatrix *getdPK2dGradChin( ); - - const variableMatrix *getdSIGMAdF( ); - - const variableMatrix *getdSIGMAdFn( ); - - const variableMatrix *getdSIGMAdChi( ); - - const variableMatrix *getdSIGMAdChin( ); - - const variableMatrix *getdSIGMAdGradChi( ); - - const variableMatrix *getdSIGMAdGradChin( ); - - const variableMatrix *getdMdF( ); - - const variableMatrix *getdMdFn( ); - - const variableMatrix *getdMdChi( ); - - const variableMatrix *getdMdChin( ); - - const variableMatrix *getdMdGradChi( ); - - const variableMatrix *getdMdGradChin( ); - - const variableMatrix *getPreviousdPK2dF( ); - - const variableMatrix *getPreviousdPK2dFn( ); - - const variableMatrix *getPreviousdPK2dChi( ); - - const variableMatrix *getPreviousdPK2dChin( ); - - const variableMatrix *getPreviousdPK2dGradChi( ); - - const variableMatrix *getPreviousdPK2dGradChin( ); - - const variableMatrix *getPreviousdSIGMAdF( ); - - const variableMatrix *getPreviousdSIGMAdFn( ); - - const variableMatrix *getPreviousdSIGMAdChi( ); - - const variableMatrix *getPreviousdSIGMAdChin( ); - - const variableMatrix *getPreviousdSIGMAdGradChi( ); - - const variableMatrix *getPreviousdSIGMAdGradChin( ); - - const variableMatrix *getPreviousdMdF( ); - - const variableMatrix *getPreviousdMdFn( ); - - const variableMatrix *getPreviousdMdChi( ); - - const variableMatrix *getPreviousdMdChin( ); - - const variableMatrix *getPreviousdMdGradChi( ); + protected: - const variableMatrix *getPreviousdMdGradChin( ); + //! Set the current values of the deformation + virtual void setDeformation( ){ setDeformation( false ); } - protected: + //! Set the previous values of the deformation + virtual void setPreviousDeformation( ){ setDeformation( true ); } virtual void setDeformation( const bool isPrevious ); @@ -560,149 +422,149 @@ namespace tardigradeHydra{ parameterVector _Dmatrix; //!< The D stiffness matrix - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, rightCauchyGreen, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, rightCauchyGreen, floatVector, setDeformation ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dRightCauchyGreendF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dRightCauchyGreendF, floatMatrix, setdRightCauchyGreendF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dRightCauchyGreendFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dRightCauchyGreendFn, floatMatrix, setdRightCauchyGreendFn ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, psi, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, psi, floatVector, setDeformation ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidF, floatMatrix, setdPsidF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidFn, floatMatrix, setdPsidFn ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidChi, floatMatrix, setdPsidChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPsidChin, floatMatrix, setdPsidChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, gamma, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, gamma, floatVector, setDeformation ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadF, floatMatrix, setdGammadF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadChi, floatMatrix, setdGammadChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadGradChi, floatMatrix, setdGammadGradChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadFn, floatMatrix, setdGammadFn ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadChin, floatMatrix, setdGammadChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dGammadGradChin, floatMatrix, setdGammadGradChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousRightCauchyGreen, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousRightCauchyGreen, floatVector, setPreviousDeformation ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdRightCauchyGreendF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdRightCauchyGreendF, floatMatrix, setPreviousdRightCauchyGreendF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdRightCauchyGreendFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdRightCauchyGreendFn, floatMatrix, setPreviousdRightCauchyGreendFn ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPsi, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPsi, floatVector, setPreviousDeformation ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidF, floatMatrix, setPreviousdPsidF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidFn, floatMatrix, setPreviousdPsidFn ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidChi, floatMatrix, setPreviousdPsidChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPsidChin, floatMatrix, setPreviousdPsidChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousGamma, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousGamma, floatVector, setPreviousDeformation ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadF, floatMatrix, setPreviousdGammadF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadChi, floatMatrix, setPreviousdGammadChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadGradChi, floatMatrix, setPreviousdGammadGradChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadFn, floatMatrix, setPreviousdGammadFn ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadChin, floatMatrix, setPreviousdGammadChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdGammadGradChin, floatMatrix, setPreviousdGammadGradChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2Stress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, PK2Stress, floatVector, setPK2Stress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dF, floatMatrix, setdPK2dF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dFn, floatMatrix, setdPK2dFn ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dChi, floatMatrix, setdPK2dChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dChin, floatMatrix, setdPK2dChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dGradChi, floatMatrix, setdPK2dGradChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPK2dGradChin, floatMatrix, setdPK2dGradChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, referenceSymmetricMicroStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, referenceSymmetricMicroStress, floatVector, setReferenceSymmetricMicroStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdF, floatMatrix, setdSIGMAdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdFn, floatMatrix, setdSIGMAdFn ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdChi, floatMatrix, setdSIGMAdChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdChin, floatMatrix, setdSIGMAdChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdGradChi, floatMatrix, setdSIGMAdGradChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dSIGMAdGradChin, floatMatrix, setdSIGMAdGradChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, referenceHigherOrderStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, referenceHigherOrderStress, floatVector, setReferenceHigherOrderStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdF, floatMatrix, setdMdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdFn, floatMatrix, setdMdFn ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdChi, floatMatrix, setdMdChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdChin, floatMatrix, setdMdChin ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdGradChi, floatMatrix, setdMdGradChi ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dMdGradChin, floatMatrix, setdMdGradChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPK2Stress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPK2Stress, floatVector, setPreviousPK2Stress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dF, floatMatrix, setPreviousdPK2dF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dFn, floatMatrix, setPreviousdPK2dFn ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dChi, floatMatrix, setPreviousdPK2dChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dChin, floatMatrix, setPreviousdPK2dChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dGradChi, floatMatrix, setPreviousdPK2dGradChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdPK2dGradChin, floatMatrix, setPreviousdPK2dGradChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousReferenceSymmetricMicroStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousReferenceSymmetricMicroStress, floatVector, setPreviousReferenceSymmetricMicroStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdF, floatMatrix, setPreviousdSIGMAdF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdFn, floatMatrix, setPreviousdSIGMAdFn ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdChi, floatMatrix, setPreviousdSIGMAdChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdChin, floatMatrix, setPreviousdSIGMAdChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdGradChi, floatMatrix, setPreviousdSIGMAdGradChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdSIGMAdGradChin, floatMatrix, setPreviousdSIGMAdGradChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousReferenceHigherOrderStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousReferenceHigherOrderStress, floatVector, setPreviousReferenceHigherOrderStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdF, floatMatrix, setPreviousdMdF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdFn, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdFn, floatMatrix, setPreviousdMdFn ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdChi, floatMatrix, setPreviousdMdChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdChin, floatMatrix, setPreviousdMdChin ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdGradChi, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdGradChi, floatMatrix, setPreviousdMdGradChi ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdGradChin, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousdMdGradChin, floatMatrix, setPreviousdMdGradChin ) }; diff --git a/src/cpp/tardigrade_hydraPeryznaViscoplasticity.cpp b/src/cpp/tardigrade_hydraPeryznaViscoplasticity.cpp index f824734c..8f6fbc96 100644 --- a/src/cpp/tardigrade_hydraPeryznaViscoplasticity.cpp +++ b/src/cpp/tardigrade_hydraPeryznaViscoplasticity.cpp @@ -171,9 +171,9 @@ namespace tardigradeHydra{ TARDIGRADE_ERROR_TOOLS_CATCH( cauchyStress = hydra->getPreviousStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dF1dF = hydra->getPreviousdF1dF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dF1dF = hydra->get_previousdF1dF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dF1dSubFs = hydra->getPreviousdF1dFn( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dF1dSubFs = hydra->get_previousdF1dFn( ) ); } else{ @@ -184,9 +184,9 @@ namespace tardigradeHydra{ TARDIGRADE_ERROR_TOOLS_CATCH( cauchyStress = hydra->getStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dF1dF = hydra->getdF1dF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dF1dF = hydra->get_dF1dF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dF1dSubFs = hydra->getdF1dFn( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dF1dSubFs = hydra->get_dF1dFn( ) ); } @@ -552,16 +552,16 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getPreviousDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_previousDrivingStress( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_drivingStress( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( flowParameters = getFlowParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( flowParameters = get_flowParameters( ) ); floatVector dgdDrivingStress( drivingStress->size( ), 0 ); @@ -615,28 +615,28 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = getdPreviousDrivingStressdPreviousCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = get_dPreviousDrivingStressdPreviousCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = getdPreviousDrivingStressdPreviousF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = get_dPreviousDrivingStressdPreviousF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = getdPreviousDrivingStressdPreviousSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = get_dPreviousDrivingStressdPreviousSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getPreviousDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_previousDrivingStress( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = getdDrivingStressdCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = get_dDrivingStressdCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = getdDrivingStressdF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = get_dDrivingStressdF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = getdDrivingStressdSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = get_dDrivingStressdSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_drivingStress( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( flowParameters = getFlowParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( flowParameters = get_flowParameters( ) ); floatVector dgdDrivingStress( drivingStress->size( ), 0 ); @@ -797,16 +797,16 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getPreviousDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_previousDrivingStress( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_drivingStress( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( yieldParameters = getYieldParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( yieldParameters = get_yieldParameters( ) ); TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeStressTools::druckerPragerSurface( *drivingStress, ( *yieldParameters )[ 1 ], ( *yieldParameters )[ 0 ], yieldFunction ) ); @@ -844,28 +844,28 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = getdPreviousDrivingStressdPreviousCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = get_dPreviousDrivingStressdPreviousCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = getdPreviousDrivingStressdPreviousF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = get_dPreviousDrivingStressdPreviousF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = getdPreviousDrivingStressdPreviousSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = get_dPreviousDrivingStressdPreviousSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getPreviousDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_previousDrivingStress( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = getdDrivingStressdCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdCauchyStress = get_dDrivingStressdCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = getdDrivingStressdF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdF = get_dDrivingStressdF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = getdDrivingStressdSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDrivingStressdSubFs = get_dDrivingStressdSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = getDrivingStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( drivingStress = get_drivingStress( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( yieldParameters = getYieldParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( yieldParameters = get_yieldParameters( ) ); floatVector dYieldFunctiondDrivingStress( drivingStress->size( ), 0 ); @@ -973,7 +973,7 @@ namespace tardigradeHydra{ } - TARDIGRADE_ERROR_TOOLS_CATCH( temperatureParameters = getThermalParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( temperatureParameters = get_thermalParameters( ) ); TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::WLF( *temperature, { ( *temperatureParameters )[ 2 ], ( *temperatureParameters )[ 0 ], ( *temperatureParameters )[ 1 ] }, plasticThermalMultiplier ) ); @@ -1016,7 +1016,7 @@ namespace tardigradeHydra{ } - TARDIGRADE_ERROR_TOOLS_CATCH( temperatureParameters = getThermalParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( temperatureParameters = get_thermalParameters( ) ); TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::WLF( *temperature, { ( *temperatureParameters )[ 2 ], ( *temperatureParameters )[ 0 ], ( *temperatureParameters )[ 1 ] }, plasticThermalMultiplier, dPlasticThermalMultiplierdT ) ); @@ -1098,16 +1098,16 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_previousStateVariables( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_stateVariables( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( dragStressParameters = getDragStressParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dragStressParameters = get_dragStressParameters( ) ); floatType dragStress; @@ -1140,16 +1140,16 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_previousStateVariables( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_stateVariables( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( dragStressParameters = getDragStressParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dragStressParameters = get_dragStressParameters( ) ); floatType dragStress; @@ -1235,16 +1235,16 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_previousStateVariables( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_stateVariables( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( hardeningParameters = getHardeningParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( hardeningParameters = get_hardeningParameters( ) ); floatType hardeningFunction; @@ -1277,16 +1277,16 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_previousStateVariables( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = getStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariables = get_stateVariables( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( hardeningParameters = getHardeningParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( hardeningParameters = get_hardeningParameters( ) ); floatType hardeningFunction; @@ -1512,24 +1512,24 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = getPreviousYieldFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = get_previousYieldFunction( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = getPreviousDragStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = get_previousDragStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = getPreviousPlasticThermalMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = get_previousPlasticThermalMultiplier( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = getYieldFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = get_yieldFunction( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = getDragStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = get_dragStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = getPlasticThermalMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = get_plasticThermalMultiplier( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( peryznaParameters = getPeryznaParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( peryznaParameters = get_peryznaParameters( ) ); TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeStressTools::peryznaModel( *yieldFunction, *dragStress, *plasticThermalMultiplier, ( *peryznaParameters )[ 0 ], plasticMultiplier ) ); @@ -1577,44 +1577,44 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondCauchyStress = getdPreviousYieldFunctiondPreviousCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondCauchyStress = get_dPreviousYieldFunctiondPreviousCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondF = getdPreviousYieldFunctiondPreviousF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondF = get_dPreviousYieldFunctiondPreviousF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondSubFs = getdPreviousYieldFunctiondPreviousSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondSubFs = get_dPreviousYieldFunctiondPreviousSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDragStressdStateVariables = getdPreviousDragStressdPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDragStressdStateVariables = get_dPreviousDragStressdPreviousStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticThermalMultiplierdT = getdPreviousPlasticThermalMultiplierdPreviousT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticThermalMultiplierdT = get_dPreviousPlasticThermalMultiplierdPreviousT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = getPreviousYieldFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = get_previousYieldFunction( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = getPreviousDragStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = get_previousDragStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = getPreviousPlasticThermalMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = get_previousPlasticThermalMultiplier( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondCauchyStress = getdYieldFunctiondCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondCauchyStress = get_dYieldFunctiondCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondF = getdYieldFunctiondF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondF = get_dYieldFunctiondF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondSubFs = getdYieldFunctiondSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dYieldFunctiondSubFs = get_dYieldFunctiondSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dDragStressdStateVariables = getdDragStressdStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dDragStressdStateVariables = get_dDragStressdStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticThermalMultiplierdT = getdPlasticThermalMultiplierdT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticThermalMultiplierdT = get_dPlasticThermalMultiplierdT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = getYieldFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( yieldFunction = get_yieldFunction( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = getDragStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dragStress = get_dragStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = getPlasticThermalMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticThermalMultiplier = get_plasticThermalMultiplier( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( peryznaParameters = getPeryznaParameters( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( peryznaParameters = get_peryznaParameters( ) ); floatType dPlasticMultiplierdYieldFunction; @@ -1862,18 +1862,18 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPreviousPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_previousPlasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = getPreviousFlowDirection( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = get_previousFlowDirection( ) ); set_previousVelocityGradient( ( *plasticMultiplier ) * ( *flowDirection ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_plasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = getFlowDirection( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = get_flowDirection( ) ); set_velocityGradient( ( *plasticMultiplier ) * ( *flowDirection ) ); @@ -1912,25 +1912,25 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = getdPreviousPlasticMultiplierdPreviousCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = get_dPreviousPlasticMultiplierdPreviousCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = getdPreviousPlasticMultiplierdPreviousF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = get_dPreviousPlasticMultiplierdPreviousF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = getdPreviousPlasticMultiplierdPreviousSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = get_dPreviousPlasticMultiplierdPreviousSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = getdPreviousPlasticMultiplierdPreviousT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = get_dPreviousPlasticMultiplierdPreviousT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = getdPreviousPlasticMultiplierdPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = get_dPreviousPlasticMultiplierdPreviousStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondCauchyStress = getdPreviousFlowDirectiondPreviousCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondCauchyStress = get_dPreviousFlowDirectiondPreviousCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondF = getdPreviousFlowDirectiondPreviousF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondF = get_dPreviousFlowDirectiondPreviousF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondSubFs = getdPreviousFlowDirectiondPreviousSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondSubFs = get_dPreviousFlowDirectiondPreviousSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPreviousPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_previousPlasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = getPreviousFlowDirection( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = get_previousFlowDirection( ) ); set_previousVelocityGradient( ( *plasticMultiplier ) * ( *flowDirection ) ); @@ -1947,25 +1947,25 @@ namespace tardigradeHydra{ } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = getdPlasticMultiplierdCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = get_dPlasticMultiplierdCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = getdPlasticMultiplierdF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = get_dPlasticMultiplierdF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = getdPlasticMultiplierdSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = get_dPlasticMultiplierdSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = getdPlasticMultiplierdT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = get_dPlasticMultiplierdT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = getdPlasticMultiplierdStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = get_dPlasticMultiplierdStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondCauchyStress = getdFlowDirectiondCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondCauchyStress = get_dFlowDirectiondCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondF = getdFlowDirectiondF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondF = get_dFlowDirectiondF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondSubFs = getdFlowDirectiondSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dFlowDirectiondSubFs = get_dFlowDirectiondSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_plasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = getFlowDirection( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( flowDirection = get_flowDirection( ) ); set_velocityGradient( ( *plasticMultiplier ) * ( *flowDirection ) ); @@ -2160,16 +2160,16 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPreviousPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_previousPlasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = getPreviousHardeningFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = get_previousHardeningFunction( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_plasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = getHardeningFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = get_hardeningFunction( ) ); } @@ -2214,40 +2214,40 @@ namespace tardigradeHydra{ if ( isPrevious ){ - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = getdPreviousPlasticMultiplierdPreviousCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = get_dPreviousPlasticMultiplierdPreviousCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = getdPreviousPlasticMultiplierdPreviousF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = get_dPreviousPlasticMultiplierdPreviousF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = getdPreviousPlasticMultiplierdPreviousSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = get_dPreviousPlasticMultiplierdPreviousSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = getdPreviousPlasticMultiplierdPreviousT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = get_dPreviousPlasticMultiplierdPreviousT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = getdPreviousPlasticMultiplierdPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = get_dPreviousPlasticMultiplierdPreviousStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dHardeningFunctiondStateVariables = getdPreviousHardeningFunctiondPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dHardeningFunctiondStateVariables = get_dPreviousHardeningFunctiondPreviousStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPreviousPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_previousPlasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = getPreviousHardeningFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = get_previousHardeningFunction( ) ); } else{ - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = getdPlasticMultiplierdCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdCauchyStress = get_dPlasticMultiplierdCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = getdPlasticMultiplierdF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdF = get_dPlasticMultiplierdF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = getdPlasticMultiplierdSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdSubFs = get_dPlasticMultiplierdSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = getdPlasticMultiplierdT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdT = get_dPlasticMultiplierdT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = getdPlasticMultiplierdStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPlasticMultiplierdStateVariables = get_dPlasticMultiplierdStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dHardeningFunctiondStateVariables = getdHardeningFunctiondStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dHardeningFunctiondStateVariables = get_dHardeningFunctiondStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = getPlasticMultiplier( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( plasticMultiplier = get_plasticMultiplier( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = getHardeningFunction( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( hardeningFunction = get_hardeningFunction( ) ); } @@ -2311,9 +2311,9 @@ namespace tardigradeHydra{ floatVector plasticDeformationGradient; - TARDIGRADE_ERROR_TOOLS_CATCH( velocityGradient = getVelocityGradient( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( velocityGradient = get_velocityGradient( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( previousVelocityGradient = getPreviousVelocityGradient( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( previousVelocityGradient = get_previousVelocityGradient( ) ); TARDIGRADE_ERROR_TOOLS_CATCH( previousPlasticDeformationGradient = hydra->getPreviousConfiguration( *getPlasticConfigurationIndex( ) ) ); @@ -2432,9 +2432,9 @@ namespace tardigradeHydra{ floatMatrix dFdL; - TARDIGRADE_ERROR_TOOLS_CATCH( velocityGradient = getVelocityGradient( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( velocityGradient = get_velocityGradient( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( previousVelocityGradient = getPreviousVelocityGradient( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( previousVelocityGradient = get_previousVelocityGradient( ) ); TARDIGRADE_ERROR_TOOLS_CATCH( previousPlasticDeformationGradient = hydra->getPreviousConfiguration( *getPlasticConfigurationIndex( ) ) ); @@ -2448,11 +2448,11 @@ namespace tardigradeHydra{ TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::evolveF( *hydra->getDeltaTime( ), previousPlasticDeformationGradient, *previousVelocityGradient, *velocityGradient, dFp, plasticDeformationGradient, dFdL, ddFdPreviousF, dFdPreviousF, dFdPreviousL, 1 - ( *getIntegrationParameter( ) ), 1 ) ); - set_dPlasticDeformationGradientdPreviousCauchyStress( tardigradeVectorTools::dot( dFdPreviousL, *getdPreviousVelocityGradientdPreviousCauchyStress( ) ) ); + set_dPlasticDeformationGradientdPreviousCauchyStress( tardigradeVectorTools::dot( dFdPreviousL, *get_dPreviousVelocityGradientdPreviousCauchyStress( ) ) ); - set_dPlasticDeformationGradientdPreviousF( tardigradeVectorTools::dot( dFdPreviousL, *getdPreviousVelocityGradientdPreviousF( ) ) ); + set_dPlasticDeformationGradientdPreviousF( tardigradeVectorTools::dot( dFdPreviousL, *get_dPreviousVelocityGradientdPreviousF( ) ) ); - floatMatrix dPlasticDeformationGradientdPreviousSubFs = tardigradeVectorTools::dot( dFdPreviousL, *getdPreviousVelocityGradientdPreviousSubFs( ) ); + floatMatrix dPlasticDeformationGradientdPreviousSubFs = tardigradeVectorTools::dot( dFdPreviousL, *get_dPreviousVelocityGradientdPreviousSubFs( ) ); for ( unsigned int i = 0; i < dFdPreviousF.size( ); i++ ){ @@ -2466,9 +2466,9 @@ namespace tardigradeHydra{ set_dPlasticDeformationGradientdPreviousSubFs( dPlasticDeformationGradientdPreviousSubFs ); - set_dPlasticDeformationGradientdPreviousT( tardigradeVectorTools::dot( dFdPreviousL, *getdPreviousVelocityGradientdPreviousT( ) ) ); + set_dPlasticDeformationGradientdPreviousT( tardigradeVectorTools::dot( dFdPreviousL, *get_dPreviousVelocityGradientdPreviousT( ) ) ); - set_dPlasticDeformationGradientdPreviousStateVariables( tardigradeVectorTools::dot( dFdPreviousL, *getdPreviousVelocityGradientdPreviousStateVariables( ) ) ); + set_dPlasticDeformationGradientdPreviousStateVariables( tardigradeVectorTools::dot( dFdPreviousL, *get_dPreviousVelocityGradientdPreviousStateVariables( ) ) ); } else{ @@ -2478,15 +2478,15 @@ namespace tardigradeHydra{ set_plasticDeformationGradient( plasticDeformationGradient ); - set_dPlasticDeformationGradientdCauchyStress( tardigradeVectorTools::dot( dFdL, *getdVelocityGradientdCauchyStress( ) ) ); + set_dPlasticDeformationGradientdCauchyStress( tardigradeVectorTools::dot( dFdL, *get_dVelocityGradientdCauchyStress( ) ) ); - set_dPlasticDeformationGradientdF( tardigradeVectorTools::dot( dFdL, *getdVelocityGradientdF( ) ) ); + set_dPlasticDeformationGradientdF( tardigradeVectorTools::dot( dFdL, *get_dVelocityGradientdF( ) ) ); - set_dPlasticDeformationGradientdSubFs( tardigradeVectorTools::dot( dFdL, *getdVelocityGradientdSubFs( ) ) ); + set_dPlasticDeformationGradientdSubFs( tardigradeVectorTools::dot( dFdL, *get_dVelocityGradientdSubFs( ) ) ); - set_dPlasticDeformationGradientdT( tardigradeVectorTools::dot( dFdL, *getdVelocityGradientdT( ) ) ); + set_dPlasticDeformationGradientdT( tardigradeVectorTools::dot( dFdL, *get_dVelocityGradientdT( ) ) ); - set_dPlasticDeformationGradientdStateVariables( tardigradeVectorTools::dot( dFdL, *getdVelocityGradientdStateVariables( ) ) ); + set_dPlasticDeformationGradientdStateVariables( tardigradeVectorTools::dot( dFdL, *get_dVelocityGradientdStateVariables( ) ) ); } @@ -2505,11 +2505,11 @@ namespace tardigradeHydra{ floatVector plasticStateVariables; - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariableEvolutionRates = getStateVariableEvolutionRates( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariableEvolutionRates = get_stateVariableEvolutionRates( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariableEvolutionRates = getPreviousStateVariableEvolutionRates( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariableEvolutionRates = get_previousStateVariableEvolutionRates( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariables = getPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariables = get_previousStateVariables( ) ); TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::midpointEvolution( *hydra->getDeltaTime( ), *previousStateVariables, *previousStateVariableEvolutionRates, *stateVariableEvolutionRates, deltaPlasticStateVariables, plasticStateVariables, ( 1 - *getIntegrationParameter( ) ) ) ); @@ -2644,33 +2644,33 @@ namespace tardigradeHydra{ if ( setPreviousDerivatives ){ - TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousCauchyStress = getdPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousCauchyStress = get_dPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousF = getdPreviousStateVariableEvolutionRatesdPreviousF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousF = get_dPreviousStateVariableEvolutionRatesdPreviousF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousSubFs = getdPreviousStateVariableEvolutionRatesdPreviousSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousSubFs = get_dPreviousStateVariableEvolutionRatesdPreviousSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousT = getdPreviousStateVariableEvolutionRatesdPreviousT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousT = get_dPreviousStateVariableEvolutionRatesdPreviousT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousStateVariables = getdPreviousStateVariableEvolutionRatesdPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dPreviousStateVariableEvolutionRatesdPreviousStateVariables = get_dPreviousStateVariableEvolutionRatesdPreviousStateVariables( ) ); } - TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdCauchyStress = getdStateVariableEvolutionRatesdCauchyStress( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdCauchyStress = get_dStateVariableEvolutionRatesdCauchyStress( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdF = getdStateVariableEvolutionRatesdF( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdF = get_dStateVariableEvolutionRatesdF( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdSubFs = getdStateVariableEvolutionRatesdSubFs( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdSubFs = get_dStateVariableEvolutionRatesdSubFs( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdT = getdStateVariableEvolutionRatesdT( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdT = get_dStateVariableEvolutionRatesdT( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdStateVariables = getdStateVariableEvolutionRatesdStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( dStateVariableEvolutionRatesdStateVariables = get_dStateVariableEvolutionRatesdStateVariables( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( stateVariableEvolutionRates = getStateVariableEvolutionRates( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( stateVariableEvolutionRates = get_stateVariableEvolutionRates( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariableEvolutionRates = getPreviousStateVariableEvolutionRates( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariableEvolutionRates = get_previousStateVariableEvolutionRates( ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariables = getPreviousStateVariables( ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( previousStateVariables = get_previousStateVariables( ) ); floatMatrix dXidXidot; @@ -2740,12 +2740,12 @@ namespace tardigradeHydra{ if ( isPrevious ){ - allStateVariables = hydra->getPreviousNonLinearSolveStateVariables( ); + allStateVariables = hydra->get_previousNonLinearSolveStateVariables( ); } else{ - allStateVariables = hydra->getNonLinearSolveStateVariables( ); + allStateVariables = hydra->get_nonLinearSolveStateVariables( ); } @@ -2792,16 +2792,16 @@ namespace tardigradeHydra{ floatVector residual( *getNumEquations( ), 0 ); // Set the residual for the plastic deformation gradient - for ( unsigned int i = 0; i < getPlasticDeformationGradient( )->size( ); i++ ){ + for ( unsigned int i = 0; i < get_plasticDeformationGradient( )->size( ); i++ ){ - residual[ i ] = ( *getPlasticDeformationGradient( ) )[ i ] - hydra->getConfiguration( *getPlasticConfigurationIndex( ) )[ i ]; + residual[ i ] = ( *get_plasticDeformationGradient( ) )[ i ] - hydra->getConfiguration( *getPlasticConfigurationIndex( ) )[ i ]; } // Set the residual for the plastic state variables - for ( unsigned int i = 0; i < getStateVariables( )->size( ); i++ ){ + for ( unsigned int i = 0; i < get_stateVariables( )->size( ); i++ ){ - residual[ i + getPlasticDeformationGradient( )->size( ) ] = ( *getPlasticStateVariables( ) )[ i ] - ( *getStateVariables( ) )[ i ]; + residual[ i + get_plasticDeformationGradient( )->size( ) ] = ( *get_plasticStateVariables( ) )[ i ] - ( *get_stateVariables( ) )[ i ]; } @@ -2817,67 +2817,67 @@ namespace tardigradeHydra{ floatMatrix jacobian( *getNumEquations( ), floatVector( hydra->getUnknownVector( )->size( ), 0 ) ); // Set the derivatives - getdPlasticDeformationGradientdCauchyStress( ); + get_dPlasticDeformationGradientdCauchyStress( ); - getdPlasticStateVariablesdCauchyStress( ); + get_dPlasticStateVariablesdCauchyStress( ); // Get the Jacobians of the plastic deformation gradient - for ( unsigned int i = 0; i < getPlasticDeformationGradient( )->size( ); i++ ){ + for ( unsigned int i = 0; i < get_plasticDeformationGradient( )->size( ); i++ ){ unsigned int row = i; // Set the Jacobian with respect to the Cauchy stress - for ( unsigned int j = 0; j < ( *getdPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ); j++ ){ + for ( unsigned int j = 0; j < ( *get_dPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ); j++ ){ unsigned int col = j; - jacobian[ row ][ col ] += ( *getdPlasticDeformationGradientdCauchyStress( ) )[ i ][ j ]; + jacobian[ row ][ col ] += ( *get_dPlasticDeformationGradientdCauchyStress( ) )[ i ][ j ]; } // Set the Jacobian with respect to the sub-configurations - jacobian[ i ][ ( *getdPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + i ] -= 1; - for ( unsigned int j = 0; j < ( *getdPlasticDeformationGradientdSubFs( ) )[ i ].size( ); j++ ){ - unsigned int col = ( *getdPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + j; + jacobian[ i ][ ( *get_dPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + i ] -= 1; + for ( unsigned int j = 0; j < ( *get_dPlasticDeformationGradientdSubFs( ) )[ i ].size( ); j++ ){ + unsigned int col = ( *get_dPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + j; - jacobian[ row ][ col ] += ( *getdPlasticDeformationGradientdSubFs( ) )[ i ][ j ]; + jacobian[ row ][ col ] += ( *get_dPlasticDeformationGradientdSubFs( ) )[ i ][ j ]; } // Set the Jacobian with respect to the state variables for ( auto ind = getStateVariableIndices( )->begin( ); ind != getStateVariableIndices( )->end( ); ind++ ){ - unsigned int col = ( *getdPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + ( *getdPlasticDeformationGradientdSubFs( ) )[ i ].size( ) + *ind; + unsigned int col = ( *get_dPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + ( *get_dPlasticDeformationGradientdSubFs( ) )[ i ].size( ) + *ind; - jacobian[ row ][ col ] += ( *getdPlasticDeformationGradientdStateVariables( ) )[ i ][ ( unsigned int )( ind - getStateVariableIndices( )->begin( ) ) ]; + jacobian[ row ][ col ] += ( *get_dPlasticDeformationGradientdStateVariables( ) )[ i ][ ( unsigned int )( ind - getStateVariableIndices( )->begin( ) ) ]; } } // Get the Jacobians of the plastic state variables - for ( unsigned int i = 0; i < getPlasticStateVariables( )->size( ); i++ ){ - unsigned int row = getPlasticDeformationGradient( )->size( ) + i; + for ( unsigned int i = 0; i < get_plasticStateVariables( )->size( ); i++ ){ + unsigned int row = get_plasticDeformationGradient( )->size( ) + i; // Set the Jacobian with respect to the Cauchy stress - for ( unsigned int j = 0; j < ( *getdPlasticStateVariablesdCauchyStress( ) )[ i ].size( ); j++ ){ + for ( unsigned int j = 0; j < ( *get_dPlasticStateVariablesdCauchyStress( ) )[ i ].size( ); j++ ){ unsigned int col = j; - jacobian[ row ][ col ] += ( *getdPlasticStateVariablesdCauchyStress( ) )[ i ][ j ]; + jacobian[ row ][ col ] += ( *get_dPlasticStateVariablesdCauchyStress( ) )[ i ][ j ]; } // Set the Jacobian with respect to the other configurations - for ( unsigned int j = 0; j < ( *getdPlasticStateVariablesdSubFs( ) )[ i ].size( ); j++ ){ - unsigned int col = ( *getdPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + j; + for ( unsigned int j = 0; j < ( *get_dPlasticStateVariablesdSubFs( ) )[ i ].size( ); j++ ){ + unsigned int col = ( *get_dPlasticDeformationGradientdCauchyStress( ) )[ i ].size( ) + j; - jacobian[ row ][ col ] += ( *getdPlasticStateVariablesdSubFs( ) )[ i ][ j ]; + jacobian[ row ][ col ] += ( *get_dPlasticStateVariablesdSubFs( ) )[ i ][ j ]; } // Set the Jacobian with respect to the state variables - jacobian[ row ][ ( *getdPlasticStateVariablesdCauchyStress( ) )[ i ].size( ) + ( *getdPlasticStateVariablesdSubFs( ) )[ i ].size( ) + ( *getStateVariableIndices( ) )[ i ] ] -= 1; + jacobian[ row ][ ( *get_dPlasticStateVariablesdCauchyStress( ) )[ i ].size( ) + ( *get_dPlasticStateVariablesdSubFs( ) )[ i ].size( ) + ( *getStateVariableIndices( ) )[ i ] ] -= 1; for ( auto ind = getStateVariableIndices( )->begin( ); ind != getStateVariableIndices( )->end( ); ind++ ){ - unsigned int col = ( *getdPlasticStateVariablesdCauchyStress( ) )[ i ].size( ) + ( *getdPlasticStateVariablesdSubFs( ) )[ i ].size( ) + *ind; + unsigned int col = ( *get_dPlasticStateVariablesdCauchyStress( ) )[ i ].size( ) + ( *get_dPlasticStateVariablesdSubFs( ) )[ i ].size( ) + *ind; - jacobian[ row ][ col ] += ( *getdPlasticStateVariablesdStateVariables( ) )[ i ][ ( unsigned int )( ind - getStateVariableIndices( )->begin( ) ) ]; + jacobian[ row ][ col ] += ( *get_dPlasticStateVariablesdStateVariables( ) )[ i ][ ( unsigned int )( ind - getStateVariableIndices( )->begin( ) ) ]; } @@ -2895,21 +2895,21 @@ namespace tardigradeHydra{ floatVector dRdT( *getNumEquations( ), 0 ); // Set the derivatives - getdPlasticDeformationGradientdT( ); + get_dPlasticDeformationGradientdT( ); - getdPlasticStateVariablesdT( ); + get_dPlasticStateVariablesdT( ); // Get the Jacobians of the plastic deformation gradient - for ( unsigned int i = 0; i < getPlasticDeformationGradient( )->size( ); i++ ){ + for ( unsigned int i = 0; i < get_plasticDeformationGradient( )->size( ); i++ ){ - dRdT[ i ] = ( *getdPlasticDeformationGradientdT( ) )[ i ]; + dRdT[ i ] = ( *get_dPlasticDeformationGradientdT( ) )[ i ]; } // Get the Jacobians of the plastic state variables - for ( unsigned int i = 0; i < getPlasticStateVariables( )->size( ); i++ ){ + for ( unsigned int i = 0; i < get_plasticStateVariables( )->size( ); i++ ){ - dRdT[ i + getPlasticDeformationGradient( )->size( ) ] += ( *getdPlasticStateVariablesdT( ) )[ i ]; + dRdT[ i + get_plasticDeformationGradient( )->size( ) ] += ( *get_dPlasticStateVariablesdT( ) )[ i ]; } @@ -2925,27 +2925,27 @@ namespace tardigradeHydra{ floatMatrix dRdF( *getNumEquations( ), floatVector( hydra->getDeformationGradient( )->size( ), 0 ) ); // Set the derivatives - getdPlasticDeformationGradientdF( ); + get_dPlasticDeformationGradientdF( ); - getdPlasticStateVariablesdF( ); + get_dPlasticStateVariablesdF( ); // Get the Jacobians of the plastic deformation gradient - for ( unsigned int i = 0; i < getPlasticDeformationGradient( )->size( ); i++ ){ + for ( unsigned int i = 0; i < get_plasticDeformationGradient( )->size( ); i++ ){ - for ( unsigned int j = 0; j < ( *getdPlasticDeformationGradientdF( ) )[ i ].size( ); j++ ){ + for ( unsigned int j = 0; j < ( *get_dPlasticDeformationGradientdF( ) )[ i ].size( ); j++ ){ - dRdF[ i ][ j ] = ( *getdPlasticDeformationGradientdF( ) )[ i ][ j ]; + dRdF[ i ][ j ] = ( *get_dPlasticDeformationGradientdF( ) )[ i ][ j ]; } } // Get the Jacobians of the plastic state variables - for ( unsigned int i = 0; i < getPlasticStateVariables( )->size( ); i++ ){ + for ( unsigned int i = 0; i < get_plasticStateVariables( )->size( ); i++ ){ - for ( unsigned int j = 0; j < ( *getdPlasticStateVariablesdF( ) )[ i ].size( ); j++ ){ + for ( unsigned int j = 0; j < ( *get_dPlasticStateVariablesdF( ) )[ i ].size( ); j++ ){ - dRdF[ i + getPlasticDeformationGradient( )->size( ) ][ j ] += ( *getdPlasticStateVariablesdF( ) )[ i ][ j ]; + dRdF[ i + get_plasticDeformationGradient( )->size( ) ][ j ] += ( *get_dPlasticStateVariablesdF( ) )[ i ][ j ]; } @@ -2973,1541 +2973,6 @@ namespace tardigradeHydra{ } - const floatVector* residual::getDrivingStress( ){ - /*! - * Get the driving stress - */ - - if ( !_drivingStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDrivingStress( ) ); - - } - - return &_drivingStress.second; - - } - - const floatMatrix* residual::getdDrivingStressdCauchyStress( ){ - /*! - * Get the derivative of the driving stress w.r.t. the Cauchy stress - */ - - if ( !_dDrivingStressdCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdDrivingStressdCauchyStress( ) ); - - } - - return &_dDrivingStressdCauchyStress.second; - - } - - const floatMatrix* residual::getdDrivingStressdF( ){ - /*! - * Get the derivative of the driving stress w.r.t. the deformation gradient - */ - - if ( !_dDrivingStressdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdDrivingStressdF( ) ); - - } - - return &_dDrivingStressdF.second; - - } - - const floatMatrix* residual::getdDrivingStressdSubFs( ){ - /*! - * Get the derivative of the driving stress w.r.t. the sub-deformation gradients - */ - - if ( !_dDrivingStressdSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdDrivingStressdSubFs( ) ); - - } - - return &_dDrivingStressdSubFs.second; - - } - - const floatVector* residual::getFlowDirection( ){ - /*! - * Get the flow direction - */ - - if ( !_flowDirection.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setFlowDirection( ) ); - - } - - return &_flowDirection.second; - - } - - const floatMatrix* residual::getdFlowDirectiondCauchyStress( ){ - /*! - * Get the derivative of the flow direction w.r.t. the Cauchy stress - */ - - if ( !_dFlowDirectiondCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdFlowDirectiondCauchyStress( ) ); - - } - - return &_dFlowDirectiondCauchyStress.second; - - } - - const floatMatrix* residual::getdFlowDirectiondF( ){ - /*! - * Get the derivative of the flow direction w.r.t. the deformation gradient - */ - - if ( !_dFlowDirectiondF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdFlowDirectiondF( ) ); - - } - - return &_dFlowDirectiondF.second; - - } - - const floatMatrix* residual::getdFlowDirectiondSubFs( ){ - /*! - * Get the derivative of the flow direction w.r.t. the sub-deformation gradients - */ - - if ( !_dFlowDirectiondSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdFlowDirectiondSubFs( ) ); - - } - - return &_dFlowDirectiondSubFs.second; - - } - - const floatType* residual::getYieldFunction( ){ - /*! - * Get the value of the yield function - */ - - if ( !_yieldFunction.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setYieldFunction( ) ); - - } - - return &_yieldFunction.second; - - } - - const floatVector* residual::getdYieldFunctiondCauchyStress( ){ - /*! - * Get the value of the derivative of the yield function w.r.t. the Cauchy stress - */ - - if ( !_dYieldFunctiondCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdYieldFunctiondCauchyStress( ) ); - - } - - return &_dYieldFunctiondCauchyStress.second; - - } - - const floatVector* residual::getdYieldFunctiondF( ){ - /*! - * Get the value of the derivative of the yield function w.r.t. the deformation gradient - */ - - if ( !_dYieldFunctiondF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdYieldFunctiondF( ) ); - - } - - return &_dYieldFunctiondF.second; - - } - - const floatVector* residual::getdYieldFunctiondSubFs( ){ - /*! - * Get the value of the derivative of the yield function w.r.t. the sub-deformation gradients - */ - - if ( !_dYieldFunctiondSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdYieldFunctiondSubFs( ) ); - - } - - return &_dYieldFunctiondSubFs.second; - - } - - const floatVector* residual::getdPreviousYieldFunctiondPreviousCauchyStress( ){ - /*! - * Get the value of the derivative of the previous yield function w.r.t. the previous Cauchy stress - */ - - if ( !_dPreviousYieldFunctiondPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousYieldFunctiondPreviousCauchyStress( ) ); - - } - - return &_dPreviousYieldFunctiondPreviousCauchyStress.second; - - } - - const floatVector* residual::getdPreviousYieldFunctiondPreviousF( ){ - /*! - * Get the value of the derivative of the previous yield function w.r.t. the previous deformation gradient - */ - - if ( !_dPreviousYieldFunctiondPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousYieldFunctiondPreviousF( ) ); - - } - - return &_dPreviousYieldFunctiondPreviousF.second; - - } - - const floatVector* residual::getdPreviousYieldFunctiondPreviousSubFs( ){ - /*! - * Get the value of the derivative of the previous yield function w.r.t. the previous sub-deformation gradients - */ - - if ( !_dPreviousYieldFunctiondPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousYieldFunctiondPreviousSubFs( ) ); - - } - - return &_dPreviousYieldFunctiondPreviousSubFs.second; - - } - - const floatType* residual::getPlasticThermalMultiplier( ){ - /*! - * Get the value of the plastic thermal multiplier - */ - - if ( !_plasticThermalMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPlasticThermalMultiplier( ) ); - - } - - return &_plasticThermalMultiplier.second; - - } - - const floatType* residual::getdPlasticThermalMultiplierdT( ){ - /*! - * Get the value of the derivative of the plastic thermal multiplier w.r.t. the temperature - */ - - if ( !_dPlasticThermalMultiplierdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticThermalMultiplierdT( ) ); - - } - - return &_dPlasticThermalMultiplierdT.second; - - } - - const floatType* residual::getDragStress( ){ - /*! - * Get the drag stress - */ - - if ( !_dragStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setDragStress( ) ); - - } - - return &_dragStress.second; - - } - - const floatVector* residual::getdDragStressdStateVariables( ){ - /*! - * Get the derivative drag stress w.r.t. the state variables - */ - - if ( !_dDragStressdStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdDragStressdStateVariables( ) ); - - } - - return &_dDragStressdStateVariables.second; - - } - - const floatType* residual::getHardeningFunction( ){ - /*! - * Get the value of the hardening function - */ - - if ( !_hardeningFunction.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setHardeningFunction( ) ); - - } - - return &_hardeningFunction.second; - - } - - const floatVector* residual::getdHardeningFunctiondStateVariables( ){ - /*! - * Get the value of the derivative of the hardening function w.r.t. the state variables - */ - - if ( !_dHardeningFunctiondStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdHardeningFunctiondStateVariables( ) ); - - } - - return &_dHardeningFunctiondStateVariables.second; - - } - - const floatType* residual::getPlasticMultiplier( ){ - /*! - * Get the plastic multiplier - */ - - if ( !_plasticMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPlasticMultiplier( ) ); - - } - - return &_plasticMultiplier.second; - - } - - const floatVector* residual::getdPlasticMultiplierdCauchyStress( ){ - /*! - * Get the derivative of the plastic multiplier w.r.t. the Cauchy stress - */ - - if ( !_dPlasticMultiplierdCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticMultiplierdCauchyStress( ) ); - - } - - return &_dPlasticMultiplierdCauchyStress.second; - - } - - const floatVector* residual::getdPlasticMultiplierdF( ){ - /*! - * Get the derivative of the plastic multiplier w.r.t. the deformation gradient - */ - - if ( !_dPlasticMultiplierdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticMultiplierdF( ) ); - - } - - return &_dPlasticMultiplierdF.second; - - } - - const floatVector* residual::getdPlasticMultiplierdSubFs( ){ - /*! - * Get the derivative of the plastic multiplier w.r.t. the sub-deformation gradients - */ - - if ( !_dPlasticMultiplierdSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticMultiplierdSubFs( ) ); - - } - - return &_dPlasticMultiplierdSubFs.second; - - } - - const floatType* residual::getdPlasticMultiplierdT( ){ - /*! - * Get the derivative of the plastic multiplier w.r.t. the temperature - */ - - if ( !_dPlasticMultiplierdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticMultiplierdT( ) ); - - } - - return &_dPlasticMultiplierdT.second; - - } - - const floatVector* residual::getdPlasticMultiplierdStateVariables( ){ - /*! - * Get the derivative of the plastic multiplier w.r.t. the state variables - */ - - if ( !_dPlasticMultiplierdStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticMultiplierdStateVariables( ) ); - - } - - return &_dPlasticMultiplierdStateVariables.second; - - } - - const floatVector* residual::getVelocityGradient( ){ - /*! - * Get the velocity gradient - */ - - if ( !_velocityGradient.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setVelocityGradient( ) ); - - } - - return &_velocityGradient.second; - - } - - const floatMatrix* residual::getdVelocityGradientdCauchyStress( ){ - /*! - * Get the derivative of the velocity gradient w.r.t. the Cauchy stress - */ - - if ( !_dVelocityGradientdCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdVelocityGradientdCauchyStress( ) ); - - } - - return &_dVelocityGradientdCauchyStress.second; - - } - - const floatMatrix* residual::getdVelocityGradientdF( ){ - /*! - * Get the derivative of the velocity gradient w.r.t. the deformation gradient - */ - - if ( !_dVelocityGradientdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdVelocityGradientdF( ) ); - - } - - return &_dVelocityGradientdF.second; - - } - - const floatMatrix* residual::getdVelocityGradientdSubFs( ){ - /*! - * Get the derivative of the velocity gradient w.r.t. the sub-deformation gradients - */ - - if ( !_dVelocityGradientdSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdVelocityGradientdSubFs( ) ); - - } - - return &_dVelocityGradientdSubFs.second; - - } - - const floatVector* residual::getdVelocityGradientdT( ){ - /*! - * Get the derivative of the velocity gradient w.r.t. the temperature - */ - - if ( !_dVelocityGradientdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdVelocityGradientdT( ) ); - - } - - return &_dVelocityGradientdT.second; - - } - - const floatMatrix* residual::getdVelocityGradientdStateVariables( ){ - /*! - * Get the derivative of the velocity gradient w.r.t. the state variables - */ - - if ( !_dVelocityGradientdStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdVelocityGradientdStateVariables( ) ); - - } - - return &_dVelocityGradientdStateVariables.second; - - } - - const floatVector* residual::getStateVariableEvolutionRates( ){ - /*! - * Get the state variable evolution rate - */ - - if ( !_stateVariableEvolutionRates.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setStateVariableEvolutionRates( ) ); - - } - - return &_stateVariableEvolutionRates.second; - - } - - const floatMatrix* residual::getdStateVariableEvolutionRatesdCauchyStress( ){ - /*! - * Get the derivative of the state variable evolution rate w.r.t. the Cauchy stress - */ - - if ( !_dStateVariableEvolutionRatesdCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdStateVariableEvolutionRatesdCauchyStress( ) ); - - } - - return &_dStateVariableEvolutionRatesdCauchyStress.second; - - } - - const floatMatrix* residual::getdStateVariableEvolutionRatesdF( ){ - /*! - * Get the derivative of the state variable evolution rate w.r.t. the deformation gradient - */ - - if ( !_dStateVariableEvolutionRatesdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdStateVariableEvolutionRatesdF( ) ); - - } - - return &_dStateVariableEvolutionRatesdF.second; - - } - - const floatMatrix* residual::getdStateVariableEvolutionRatesdSubFs( ){ - /*! - * Get the derivative of the state variable evolution rate w.r.t. the sub-deformation gradients - */ - - if ( !_dStateVariableEvolutionRatesdSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdStateVariableEvolutionRatesdSubFs( ) ); - - } - - return &_dStateVariableEvolutionRatesdSubFs.second; - - } - - const floatVector* residual::getdStateVariableEvolutionRatesdT( ){ - /*! - * Get the derivative of the state variable evolution rate w.r.t. the sub-deformation gradients - */ - - if ( !_dStateVariableEvolutionRatesdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdStateVariableEvolutionRatesdT( ) ); - - } - - return &_dStateVariableEvolutionRatesdT.second; - - } - - const floatMatrix* residual::getdStateVariableEvolutionRatesdStateVariables( ){ - /*! - * Get the derivative of the state variable evolution rate w.r.t. the state variables - */ - - if ( !_dStateVariableEvolutionRatesdStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdStateVariableEvolutionRatesdStateVariables( ) ); - - } - - return &_dStateVariableEvolutionRatesdStateVariables.second; - - } - - const floatVector* residual::getPlasticDeformationGradient( ){ - /*! - * Get the plastic deformation gradient - */ - - if ( !_plasticDeformationGradient.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPlasticDeformationGradient( ) ); - - } - - return &_plasticDeformationGradient.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdCauchyStress( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the Cauchy stress - */ - - if ( !_dPlasticDeformationGradientdCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdCauchyStress( ) ); - - } - - return &_dPlasticDeformationGradientdCauchyStress.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdF( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the deformation gradient - */ - - if ( !_dPlasticDeformationGradientdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdF( ) ); - - } - - return &_dPlasticDeformationGradientdF.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdSubFs( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the sub-deformation gradients - */ - - if ( !_dPlasticDeformationGradientdSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdSubFs( ) ); - - } - - return &_dPlasticDeformationGradientdSubFs.second; - - } - - const floatVector* residual::getdPlasticDeformationGradientdT( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the sub-deformation gradients - */ - - if ( !_dPlasticDeformationGradientdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdT( ) ); - - } - - return &_dPlasticDeformationGradientdT.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdStateVariables( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the state variables - */ - - if ( !_dPlasticDeformationGradientdStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdStateVariables( ) ); - - } - - return &_dPlasticDeformationGradientdStateVariables.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdPreviousCauchyStress( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the previous Cauchy stress - */ - - if ( !_dPlasticDeformationGradientdPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdPreviousCauchyStress( ) ); - - } - - return &_dPlasticDeformationGradientdPreviousCauchyStress.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdPreviousF( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the previous deformation gradient - */ - - if ( !_dPlasticDeformationGradientdPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdPreviousF( ) ); - - } - - return &_dPlasticDeformationGradientdPreviousF.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdPreviousSubFs( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the previous sub-deformation gradients - */ - - if ( !_dPlasticDeformationGradientdPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdPreviousSubFs( ) ); - - } - - return &_dPlasticDeformationGradientdPreviousSubFs.second; - - } - - const floatVector* residual::getdPlasticDeformationGradientdPreviousT( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the previous sub-deformation gradients - */ - - if ( !_dPlasticDeformationGradientdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdPreviousT( ) ); - - } - - return &_dPlasticDeformationGradientdPreviousT.second; - - } - - const floatMatrix* residual::getdPlasticDeformationGradientdPreviousStateVariables( ){ - /*! - * Get the derivative of the plastic deformation gradient w.r.t. the previous state variables - */ - - if ( !_dPlasticDeformationGradientdPreviousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticDeformationGradientdPreviousStateVariables( ) ); - - } - - return &_dPlasticDeformationGradientdPreviousStateVariables.second; - - } - - const floatVector* residual::getPlasticStateVariables( ){ - /*! - * Get the plastic state variables - */ - - if ( !_plasticStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPlasticStateVariables( ) ); - - } - - return &_plasticStateVariables.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdCauchyStress( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the Cauchy stress - */ - - if ( !_dPlasticStateVariablesdCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdCauchyStress( ) ); - - } - - return &_dPlasticStateVariablesdCauchyStress.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdF( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the deformation gradient - */ - - if ( !_dPlasticStateVariablesdF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdF( ) ); - - } - - return &_dPlasticStateVariablesdF.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdSubFs( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the sub-deformation gradients - */ - - if ( !_dPlasticStateVariablesdSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdSubFs( ) ); - - } - - return &_dPlasticStateVariablesdSubFs.second; - - } - - const floatVector* residual::getdPlasticStateVariablesdT( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the temperature - */ - - if ( !_dPlasticStateVariablesdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdT( ) ); - - } - - return &_dPlasticStateVariablesdT.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdStateVariables( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the state variables - */ - - if ( !_dPlasticStateVariablesdStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdStateVariables( ) ); - - } - - return &_dPlasticStateVariablesdStateVariables.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdPreviousCauchyStress( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the previous Cauchy stress - */ - - if ( !_dPlasticStateVariablesdPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdPreviousCauchyStress( ) ); - - } - - return &_dPlasticStateVariablesdPreviousCauchyStress.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdPreviousF( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the previous deformation gradient - */ - - if ( !_dPlasticStateVariablesdPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdPreviousF( ) ); - - } - - return &_dPlasticStateVariablesdPreviousF.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdPreviousSubFs( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the previous sub-deformation gradients - */ - - if ( !_dPlasticStateVariablesdPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdPreviousSubFs( ) ); - - } - - return &_dPlasticStateVariablesdPreviousSubFs.second; - - } - - const floatVector* residual::getdPlasticStateVariablesdPreviousT( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the previous temperature - */ - - if ( !_dPlasticStateVariablesdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdPreviousT( ) ); - - } - - return &_dPlasticStateVariablesdPreviousT.second; - - } - - const floatMatrix* residual::getdPlasticStateVariablesdPreviousStateVariables( ){ - /*! - * Get the derivative of the plastic state variables w.r.t. the previous state variables - */ - - if ( !_dPlasticStateVariablesdPreviousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPlasticStateVariablesdPreviousStateVariables( ) ); - - } - - return &_dPlasticStateVariablesdPreviousStateVariables.second; - - } - - const floatVector* residual::getStateVariables( ){ - /*! - * Get the state variables - */ - - if ( !_stateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setStateVariables( ) ); - - } - - return &_stateVariables.second; - - } - - const floatVector* residual::getPreviousDrivingStress( ){ - /*! - * Get the previous driving stress - */ - - if ( !_previousDrivingStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousDrivingStress( ) ); - - } - - return &_previousDrivingStress.second; - - } - - const floatMatrix* residual::getdPreviousDrivingStressdPreviousCauchyStress( ){ - /*! - * Get the derivative of the previous driving stress with respect to the previous Cauchy stress - */ - - if ( !_dPreviousDrivingStressdPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousDrivingStressdPreviousCauchyStress( ) ); - - } - - return &_dPreviousDrivingStressdPreviousCauchyStress.second; - - } - - const floatMatrix* residual::getdPreviousDrivingStressdPreviousF( ){ - /*! - * Get the derivative of the previous driving stress with respect to the previous deformation gradient - */ - - if ( !_dPreviousDrivingStressdPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousDrivingStressdPreviousF( ) ); - - } - - return &_dPreviousDrivingStressdPreviousF.second; - - } - - const floatMatrix* residual::getdPreviousDrivingStressdPreviousSubFs( ){ - /*! - * Get the derivative of the previous driving stress with respect to the previous sub-deformation gradients - */ - - if ( !_dPreviousDrivingStressdPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousDrivingStressdPreviousSubFs( ) ); - - } - - return &_dPreviousDrivingStressdPreviousSubFs.second; - - } - - const floatVector* residual::getPreviousFlowDirection( ){ - /*! - * Get the previous flow direction - */ - - if ( !_previousFlowDirection.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousFlowDirection( ) ); - - } - - return &_previousFlowDirection.second; - - } - - const floatMatrix* residual::getdPreviousFlowDirectiondPreviousCauchyStress( ){ - /*! - * Get the derivative of the previous flow direction w.r.t. the Cauchy stress - */ - - if ( !_dPreviousFlowDirectiondPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousFlowDirectiondPreviousCauchyStress( ) ); - - } - - return &_dPreviousFlowDirectiondPreviousCauchyStress.second; - - } - - const floatMatrix* residual::getdPreviousFlowDirectiondPreviousF( ){ - /*! - * Get the derivative of the previous flow direction w.r.t. the deformation gradient - */ - - if ( !_dPreviousFlowDirectiondPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousFlowDirectiondPreviousF( ) ); - - } - - return &_dPreviousFlowDirectiondPreviousF.second; - - } - - const floatMatrix* residual::getdPreviousFlowDirectiondPreviousSubFs( ){ - /*! - * Get the derivative of the previous flow direction w.r.t. the sub-deformation gradients - */ - - if ( !_dPreviousFlowDirectiondPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousFlowDirectiondPreviousSubFs( ) ); - - } - - return &_dPreviousFlowDirectiondPreviousSubFs.second; - - } - - const floatType* residual::getPreviousYieldFunction( ){ - /*! - * Get the previous value of the yield function - */ - - if ( !_previousYieldFunction.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousYieldFunction( ) ); - - } - - return &_previousYieldFunction.second; - - } - - const floatType* residual::getPreviousPlasticThermalMultiplier( ){ - /*! - * Get the previous value of the plastic thermal multiplier - */ - - if ( !_previousPlasticThermalMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousPlasticThermalMultiplier( ) ); - - } - - return &_previousPlasticThermalMultiplier.second; - - } - - const floatType* residual::getdPreviousPlasticThermalMultiplierdPreviousT( ){ - /*! - * Get the previous value of the derivative of the plastic thermal multiplier w.r.t. the previous temperature - */ - - if ( !_dPreviousPlasticThermalMultiplierdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousPlasticThermalMultiplierdPreviousT( ) ); - - } - - return &_dPreviousPlasticThermalMultiplierdPreviousT.second; - - } - - const floatType* residual::getPreviousDragStress( ){ - /*! - * Get the previous value of the drag stress - */ - - if ( !_previousDragStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousDragStress( ) ); - - } - - return &_previousDragStress.second; - - } - - const floatVector* residual::getdPreviousDragStressdPreviousStateVariables( ){ - /*! - * Get the derivative of the previous value of the drag stress w.r.t. the previous state variables - */ - - if ( !_dPreviousDragStressdPreviousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousDragStressdPreviousStateVariables( ) ); - - } - - return &_dPreviousDragStressdPreviousStateVariables.second; - - } - - const floatType* residual::getPreviousHardeningFunction( ){ - /*! - * Get the previous value of the hardening function - */ - - if ( !_previousHardeningFunction.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousHardeningFunction( ) ); - - } - - return &_previousHardeningFunction.second; - - } - - const floatVector* residual::getdPreviousHardeningFunctiondPreviousStateVariables( ){ - /*! - * Get the derivative of the previous value of the hardening function w.r.t. the previous state variables - */ - - if ( !_dPreviousHardeningFunctiondPreviousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousHardeningFunctiondPreviousStateVariables( ) ); - - } - - return &_dPreviousHardeningFunctiondPreviousStateVariables.second; - - } - - const floatType* residual::getPreviousPlasticMultiplier( ){ - /*! - * Get the previous plastic multiplier - */ - - if ( !_previousPlasticMultiplier.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousPlasticMultiplier( ) ); - - } - - return &_previousPlasticMultiplier.second; - - } - - const floatVector* residual::getdPreviousPlasticMultiplierdPreviousCauchyStress( ){ - /*! - * Get the derivative of the previous plastic multiplier w.r.t. the previous Cauchy stress - */ - - if ( !_dPreviousPlasticMultiplierdPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousPlasticMultiplierdPreviousCauchyStress( ) ); - - } - - return &_dPreviousPlasticMultiplierdPreviousCauchyStress.second; - - } - - const floatVector* residual::getdPreviousPlasticMultiplierdPreviousF( ){ - /*! - * Get the derivative of the previous plastic multiplier w.r.t. the previous deformation gradient - */ - - if ( !_dPreviousPlasticMultiplierdPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousPlasticMultiplierdPreviousF( ) ); - - } - - return &_dPreviousPlasticMultiplierdPreviousF.second; - - } - - const floatVector* residual::getdPreviousPlasticMultiplierdPreviousSubFs( ){ - /*! - * Get the derivative of the previous plastic multiplier w.r.t. the previous sub-deformation gradients - */ - - if ( !_dPreviousPlasticMultiplierdPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousPlasticMultiplierdPreviousSubFs( ) ); - - } - - return &_dPreviousPlasticMultiplierdPreviousSubFs.second; - - } - - const floatType* residual::getdPreviousPlasticMultiplierdPreviousT( ){ - /*! - * Get the derivative of the previous plastic multiplier w.r.t. the previous temperature - */ - - if ( !_dPreviousPlasticMultiplierdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousPlasticMultiplierdPreviousT( ) ); - - } - - return &_dPreviousPlasticMultiplierdPreviousT.second; - - } - - const floatVector* residual::getdPreviousPlasticMultiplierdPreviousStateVariables( ){ - /*! - * Get the derivative of the previous plastic multiplier w.r.t. the previous state variables - */ - - if ( !_dPreviousPlasticMultiplierdPreviousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousPlasticMultiplierdPreviousStateVariables( ) ); - - } - - return &_dPreviousPlasticMultiplierdPreviousStateVariables.second; - - } - - const floatVector* residual::getPreviousVelocityGradient( ){ - /*! - * Get the previous velocity gradient - */ - - if ( !_previousVelocityGradient.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousVelocityGradient( ) ); - - } - - return &_previousVelocityGradient.second; - - } - - const floatMatrix* residual::getdPreviousVelocityGradientdPreviousCauchyStress( ){ - /*! - * Get the derivative of the previous velocity gradient w.r.t. - * the previous Cauchy stress. - */ - - if ( !_dPreviousVelocityGradientdPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousVelocityGradientdPreviousCauchyStress( ) ); - - } - - return &_dPreviousVelocityGradientdPreviousCauchyStress.second; - - } - - const floatMatrix* residual::getdPreviousVelocityGradientdPreviousF( ){ - /*! - * Get the derivative of the previous velocity gradient w.r.t. - * the previous deformation gradient - */ - - if ( !_dPreviousVelocityGradientdPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousVelocityGradientdPreviousF( ) ); - - } - - return &_dPreviousVelocityGradientdPreviousF.second; - - } - - const floatMatrix* residual::getdPreviousVelocityGradientdPreviousSubFs( ){ - /*! - * Get the derivative of the previous velocity gradient w.r.t. - * the previous sub-deformation gradients - */ - - if ( !_dPreviousVelocityGradientdPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousVelocityGradientdPreviousSubFs( ) ); - - } - - return &_dPreviousVelocityGradientdPreviousSubFs.second; - - } - - const floatVector* residual::getdPreviousVelocityGradientdPreviousT( ){ - /*! - * Get the derivative of the previous velocity gradient w.r.t. - * the previous temperature - */ - - if ( !_dPreviousVelocityGradientdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousVelocityGradientdPreviousT( ) ); - - } - - return &_dPreviousVelocityGradientdPreviousT.second; - - } - - const floatMatrix* residual::getdPreviousVelocityGradientdPreviousStateVariables( ){ - /*! - * Get the derivative of the previous velocity gradient w.r.t. - * the previous state variables - */ - - if ( !_dPreviousVelocityGradientdPreviousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousVelocityGradientdPreviousStateVariables( ) ); - - } - - return &_dPreviousVelocityGradientdPreviousStateVariables.second; - - } - - const floatVector* residual::getPreviousStateVariableEvolutionRates( ){ - /*! - * Get the previous state variable evolution rate - */ - - if ( !_previousStateVariableEvolutionRates.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousStateVariableEvolutionRates( ) ); - - } - - return &_previousStateVariableEvolutionRates.second; - - } - - const floatMatrix* residual::getdPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ){ - /*! - * Get the derivative of the previous state variable evolution rate w.r.t. the previous Cauchy stress - */ - - if ( !_dPreviousStateVariableEvolutionRatesdPreviousCauchyStress.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ) ); - - } - - return &_dPreviousStateVariableEvolutionRatesdPreviousCauchyStress.second; - - } - - const floatMatrix* residual::getdPreviousStateVariableEvolutionRatesdPreviousF( ){ - /*! - * Get the derivative of the previous state variable evolution rate w.r.t. the previous deformation gradient - */ - - if ( !_dPreviousStateVariableEvolutionRatesdPreviousF.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousStateVariableEvolutionRatesdPreviousF( ) ); - - } - - return &_dPreviousStateVariableEvolutionRatesdPreviousF.second; - - } - - const floatMatrix* residual::getdPreviousStateVariableEvolutionRatesdPreviousSubFs( ){ - /*! - * Get the derivative of the previous state variable evolution rate w.r.t. the previous sub-deformation gradients - */ - - if ( !_dPreviousStateVariableEvolutionRatesdPreviousSubFs.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousStateVariableEvolutionRatesdPreviousSubFs( ) ); - - } - - return &_dPreviousStateVariableEvolutionRatesdPreviousSubFs.second; - - } - - const floatVector* residual::getdPreviousStateVariableEvolutionRatesdPreviousT( ){ - /*! - * Get the derivative of the previous state variable evolution rate w.r.t. the previous sub-deformation gradients - */ - - if ( !_dPreviousStateVariableEvolutionRatesdPreviousT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousStateVariableEvolutionRatesdPreviousT( ) ); - - } - - return &_dPreviousStateVariableEvolutionRatesdPreviousT.second; - - } - - const floatMatrix* residual::getdPreviousStateVariableEvolutionRatesdPreviousStateVariables( ){ - /*! - * Get the derivative of the previous state variable evolution rate w.r.t. the previous state variables - */ - - if ( !_dPreviousStateVariableEvolutionRatesdPreviousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdPreviousStateVariableEvolutionRatesdPreviousStateVariables( ) ); - - } - - return &_dPreviousStateVariableEvolutionRatesdPreviousStateVariables.second; - - } - - const floatVector* residual::getPreviousStateVariables( ){ - /*! - * Get the previous state variables - */ - - if ( !_previousStateVariables.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setPreviousStateVariables( ) ); - - } - - return &_previousStateVariables.second; - - } - - const floatVector* residual::getPeryznaParameters( ){ - /*! - * Get the Peryzna parameters - */ - - if ( !_peryznaParameters.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "Peryzna parameters not defined but required" ) ); - - } - - return &_peryznaParameters.second; - - } - - const floatVector* residual::getDragStressParameters( ){ - /*! - * Get the drag stress parameters - */ - - if ( !_dragStressParameters.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "Drag stress parameters not defined but required" ) ); - - } - - return &_dragStressParameters.second; - - } - - const floatVector* residual::getThermalParameters( ){ - /*! - * Get the thermal parameters - */ - - if ( !_thermalParameters.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "Thermal parameters not defined but required" ) ); - - } - - return &_thermalParameters.second; - - } - - const floatVector* residual::getYieldParameters( ){ - /*! - * Get the yield parameters - */ - - if ( !_yieldParameters.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "Yield parameters not defined but required" ) ); - - } - - return &_yieldParameters.second; - - } - - const floatVector* residual::getFlowParameters( ){ - /*! - * Get the flow parameters - */ - - if ( !_flowParameters.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "Flow parameters not defined but required" ) ); - - } - - return &_flowParameters.second; - - } - - const floatVector* residual::getHardeningParameters( ){ - /*! - * Get the hardening parameters - */ - - if ( !_hardeningParameters.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( throw std::runtime_error( "Hardening parameters not defined but required" ) ); - - } - - return &_hardeningParameters.second; - - } - const floatType* residual::getIntegrationParameter( ){ /*! * Get the integration parameter diff --git a/src/cpp/tardigrade_hydraPeryznaViscoplasticity.h b/src/cpp/tardigrade_hydraPeryznaViscoplasticity.h index 06eb763c..6b2ed9ae 100644 --- a/src/cpp/tardigrade_hydraPeryznaViscoplasticity.h +++ b/src/cpp/tardigrade_hydraPeryznaViscoplasticity.h @@ -114,210 +114,6 @@ namespace tardigradeHydra{ const std::vector< unsigned int >* getStateVariableIndices( ); - const floatVector* getDrivingStress( ); - - const floatMatrix* getdDrivingStressdCauchyStress( ); - - const floatMatrix* getdDrivingStressdF( ); - - const floatMatrix* getdDrivingStressdSubFs( ); - - const floatVector* getFlowDirection( ); - - const floatMatrix* getdFlowDirectiondCauchyStress( ); - - const floatMatrix* getdFlowDirectiondF( ); - - const floatMatrix* getdFlowDirectiondSubFs( ); - - const floatType* getYieldFunction( ); - - const floatVector* getdYieldFunctiondCauchyStress( ); - - const floatVector* getdYieldFunctiondF( ); - - const floatVector* getdYieldFunctiondSubFs( ); - - const floatType* getPlasticThermalMultiplier( ); - - const floatType* getdPlasticThermalMultiplierdT( ); - - const floatType* getDragStress( ); - - const floatVector* getdDragStressdStateVariables( ); - - const floatType* getHardeningFunction( ); - - const floatVector* getdHardeningFunctiondStateVariables( ); - - const floatType* getPlasticMultiplier( ); - - const floatVector* getdPlasticMultiplierdCauchyStress( ); - - const floatVector* getdPlasticMultiplierdF( ); - - const floatVector* getdPlasticMultiplierdSubFs( ); - - const floatType* getdPlasticMultiplierdT( ); - - const floatVector* getdPlasticMultiplierdStateVariables( ); - - const floatVector* getVelocityGradient( ); - - const floatMatrix* getdVelocityGradientdCauchyStress( ); - - const floatMatrix* getdVelocityGradientdF( ); - - const floatMatrix* getdVelocityGradientdSubFs( ); - - const floatVector* getdVelocityGradientdT( ); - - const floatMatrix* getdVelocityGradientdStateVariables( ); - - const floatVector* getStateVariableEvolutionRates( ); - - const floatMatrix* getdStateVariableEvolutionRatesdCauchyStress( ); - - const floatMatrix* getdStateVariableEvolutionRatesdF( ); - - const floatMatrix* getdStateVariableEvolutionRatesdSubFs( ); - - const floatVector* getdStateVariableEvolutionRatesdT( ); - - const floatMatrix* getdStateVariableEvolutionRatesdStateVariables( ); - - const floatVector* getPreviousDrivingStress( ); - - const floatMatrix* getdPreviousDrivingStressdPreviousCauchyStress( ); - - const floatMatrix* getdPreviousDrivingStressdPreviousF( ); - - const floatMatrix* getdPreviousDrivingStressdPreviousSubFs( ); - - const floatVector* getPreviousFlowDirection( ); - - const floatMatrix* getdPreviousFlowDirectiondPreviousCauchyStress( ); - - const floatMatrix* getdPreviousFlowDirectiondPreviousF( ); - - const floatMatrix* getdPreviousFlowDirectiondPreviousSubFs( ); - - const floatType* getPreviousYieldFunction( ); - - const floatVector* getdPreviousYieldFunctiondPreviousCauchyStress( ); - - const floatVector* getdPreviousYieldFunctiondPreviousF( ); - - const floatVector* getdPreviousYieldFunctiondPreviousSubFs( ); - - const floatType* getPreviousPlasticThermalMultiplier( ); - - const floatType* getdPreviousPlasticThermalMultiplierdPreviousT( ); - - const floatType* getPreviousDragStress( ); - - const floatVector* getdPreviousDragStressdPreviousStateVariables( ); - - const floatType* getPreviousHardeningFunction( ); - - const floatVector* getdPreviousHardeningFunctiondPreviousStateVariables( ); - - const floatType* getPreviousPlasticMultiplier( ); - - const floatVector* getdPreviousPlasticMultiplierdPreviousCauchyStress( ); - - const floatVector* getdPreviousPlasticMultiplierdPreviousF( ); - - const floatVector* getdPreviousPlasticMultiplierdPreviousSubFs( ); - - const floatType* getdPreviousPlasticMultiplierdPreviousT( ); - - const floatVector* getdPreviousPlasticMultiplierdPreviousStateVariables( ); - - const floatVector* getPreviousVelocityGradient( ); - - const floatMatrix* getdPreviousVelocityGradientdPreviousCauchyStress( ); - - const floatMatrix* getdPreviousVelocityGradientdPreviousF( ); - - const floatMatrix* getdPreviousVelocityGradientdPreviousSubFs( ); - - const floatVector* getdPreviousVelocityGradientdPreviousT( ); - - const floatMatrix* getdPreviousVelocityGradientdPreviousStateVariables( ); - - const floatVector* getPreviousStateVariableEvolutionRates( ); - - const floatMatrix* getdPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ); - - const floatMatrix* getdPreviousStateVariableEvolutionRatesdPreviousF( ); - - const floatMatrix* getdPreviousStateVariableEvolutionRatesdPreviousSubFs( ); - - const floatVector* getdPreviousStateVariableEvolutionRatesdPreviousT( ); - - const floatMatrix* getdPreviousStateVariableEvolutionRatesdPreviousStateVariables( ); - - const floatVector* getPlasticDeformationGradient( ); - - const floatMatrix* getdPlasticDeformationGradientdCauchyStress( ); - - const floatMatrix* getdPlasticDeformationGradientdF( ); - - const floatMatrix* getdPlasticDeformationGradientdSubFs( ); - - const floatVector* getdPlasticDeformationGradientdT( ); - - const floatMatrix* getdPlasticDeformationGradientdStateVariables( ); - - const floatMatrix* getdPlasticDeformationGradientdPreviousCauchyStress( ); - - const floatMatrix* getdPlasticDeformationGradientdPreviousF( ); - - const floatMatrix* getdPlasticDeformationGradientdPreviousSubFs( ); - - const floatVector* getdPlasticDeformationGradientdPreviousT( ); - - const floatMatrix* getdPlasticDeformationGradientdPreviousStateVariables( ); - - const floatVector* getPlasticStateVariables( ); - - const floatMatrix* getdPlasticStateVariablesdCauchyStress( ); - - const floatMatrix* getdPlasticStateVariablesdF( ); - - const floatMatrix* getdPlasticStateVariablesdSubFs( ); - - const floatVector* getdPlasticStateVariablesdT( ); - - const floatMatrix* getdPlasticStateVariablesdStateVariables( ); - - const floatMatrix* getdPlasticStateVariablesdPreviousCauchyStress( ); - - const floatMatrix* getdPlasticStateVariablesdPreviousF( ); - - const floatMatrix* getdPlasticStateVariablesdPreviousSubFs( ); - - const floatVector* getdPlasticStateVariablesdPreviousT( ); - - const floatMatrix* getdPlasticStateVariablesdPreviousStateVariables( ); - - const floatVector* getStateVariables( ); - - const floatVector* getPreviousStateVariables( ); - - const floatVector* getPeryznaParameters( ); - - const floatVector* getDragStressParameters( ); - - const floatVector* getThermalParameters( ); - - const floatVector* getYieldParameters( ); - - const floatVector* getFlowParameters( ); - - const floatVector* getHardeningParameters( ); - const floatType* getIntegrationParameter( ); protected: @@ -628,209 +424,227 @@ namespace tardigradeHydra{ floatType _integrationParameter; - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, drivingStress, floatVector ) + //! Throw an error if the Peryzna parameters haven't been defined + void peryznaError( ){ throw std::runtime_error( "Peryzna parameters not defined but required" ); } + + //! Throw an error if the drag stress parameters haven't been defined + void dragStressError( ){ throw std::runtime_error( "Drag stress parameters not defined but required" ); } + + //! Throw an error if the thermal parameters haven't been defined + void thermalError( ){ throw std::runtime_error( "Thermal parameters not defined but required" ); } + + //! Throw an error if the yield parameters haven't been defined + void yieldError( ){ throw std::runtime_error( "Yield parameters not defined but required" ); } + + //! Throw an error if the flow parameters haven't been defined + void flowError( ){ throw std::runtime_error( "Flow parameters not defined but required" ); } + + //! Throw an error if the hardening parameters haven't been defined + void hardeningError( ){ throw std::runtime_error( "Hardening parameters not defined but required" ); } + + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, drivingStress, floatVector, setDrivingStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousDrivingStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousDrivingStress, floatVector, setPreviousDrivingStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDrivingStressdCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDrivingStressdCauchyStress, floatMatrix, setdDrivingStressdCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDrivingStressdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDrivingStressdF, floatMatrix, setdDrivingStressdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDrivingStressdSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDrivingStressdSubFs, floatMatrix, setdDrivingStressdSubFs ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDrivingStressdPreviousCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDrivingStressdPreviousCauchyStress, floatMatrix, setdPreviousDrivingStressdPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDrivingStressdPreviousF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDrivingStressdPreviousF, floatMatrix, setdPreviousDrivingStressdPreviousF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDrivingStressdPreviousSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDrivingStressdPreviousSubFs, floatMatrix, setdPreviousDrivingStressdPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, flowDirection, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, flowDirection, floatVector, setFlowDirection ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousFlowDirection, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousFlowDirection, floatVector, setPreviousFlowDirection ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFlowDirectiondCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFlowDirectiondCauchyStress, floatMatrix, setdFlowDirectiondCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFlowDirectiondF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFlowDirectiondF, floatMatrix, setdFlowDirectiondF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFlowDirectiondSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dFlowDirectiondSubFs, floatMatrix, setdFlowDirectiondSubFs ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousFlowDirectiondPreviousCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousFlowDirectiondPreviousCauchyStress, floatMatrix, setdPreviousFlowDirectiondPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousFlowDirectiondPreviousF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousFlowDirectiondPreviousF, floatMatrix, setdPreviousFlowDirectiondPreviousF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousFlowDirectiondPreviousSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousFlowDirectiondPreviousSubFs, floatMatrix, setdPreviousFlowDirectiondPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, yieldFunction, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, yieldFunction, floatType, setYieldFunction ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dYieldFunctiondCauchyStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dYieldFunctiondCauchyStress, floatVector, setdYieldFunctiondCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dYieldFunctiondF, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dYieldFunctiondF, floatVector, setdYieldFunctiondF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dYieldFunctiondSubFs, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dYieldFunctiondSubFs, floatVector, setdYieldFunctiondSubFs ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousYieldFunction, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousYieldFunction, floatType, setPreviousYieldFunction ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousYieldFunctiondPreviousCauchyStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousYieldFunctiondPreviousCauchyStress, floatVector, setdPreviousYieldFunctiondPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousYieldFunctiondPreviousF, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousYieldFunctiondPreviousF, floatVector, setdPreviousYieldFunctiondPreviousF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousYieldFunctiondPreviousSubFs, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousYieldFunctiondPreviousSubFs, floatVector, setdPreviousYieldFunctiondPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticThermalMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticThermalMultiplier, floatType, setPlasticThermalMultiplier ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticThermalMultiplierdT, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticThermalMultiplierdT, floatType, setdPlasticThermalMultiplierdT ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPlasticThermalMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPlasticThermalMultiplier, floatType, setPreviousPlasticThermalMultiplier ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticThermalMultiplierdPreviousT, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticThermalMultiplierdPreviousT, floatType, setdPreviousPlasticThermalMultiplierdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dragStress, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dragStress, floatType, setDragStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDragStressdStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dDragStressdStateVariables, floatVector, setdDragStressdStateVariables ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousDragStress, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousDragStress, floatType, setPreviousDragStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDragStressdPreviousStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousDragStressdPreviousStateVariables, floatVector, setdPreviousDragStressdPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, hardeningFunction, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, hardeningFunction, floatType, setHardeningFunction ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dHardeningFunctiondStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dHardeningFunctiondStateVariables, floatVector, setdHardeningFunctiondStateVariables ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousHardeningFunction, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousHardeningFunction, floatType, setPreviousHardeningFunction ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousHardeningFunctiondPreviousStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousHardeningFunctiondPreviousStateVariables, floatVector, setdPreviousHardeningFunctiondPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticMultiplier, floatType, setPlasticMultiplier ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdCauchyStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdCauchyStress, floatVector, setdPlasticMultiplierdCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdF, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdF, floatVector, setdPlasticMultiplierdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdSubFs, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdSubFs, floatVector, setdPlasticMultiplierdSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdT, floatType ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdT, floatType, setdPlasticMultiplierdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticMultiplierdStateVariables, floatVector, setdPlasticMultiplierdStateVariables ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPlasticMultiplier, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousPlasticMultiplier, floatType, setPreviousPlasticMultiplier ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousCauchyStress, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousCauchyStress, floatVector, setdPreviousPlasticMultiplierdPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousF, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousF, floatVector, setdPreviousPlasticMultiplierdPreviousF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousSubFs, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousSubFs, floatVector, setdPreviousPlasticMultiplierdPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousT, floatType ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousT, floatType, setdPreviousPlasticMultiplierdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousPlasticMultiplierdPreviousStateVariables, floatVector, setdPreviousPlasticMultiplierdPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, velocityGradient, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, velocityGradient, floatVector, setVelocityGradient ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdCauchyStress, floatMatrix, setdVelocityGradientdCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdF, floatMatrix, setdVelocityGradientdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdSubFs, floatMatrix, setdVelocityGradientdSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdT, floatVector, setdVelocityGradientdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dVelocityGradientdStateVariables, floatMatrix, setdVelocityGradientdStateVariables ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousVelocityGradient, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousVelocityGradient, floatVector, setPreviousVelocityGradient ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousCauchyStress, floatMatrix, setdPreviousVelocityGradientdPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousF, floatMatrix, setdPreviousVelocityGradientdPreviousF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousSubFs, floatMatrix, setdPreviousVelocityGradientdPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousT, floatVector, setdPreviousVelocityGradientdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousVelocityGradientdPreviousStateVariables, floatMatrix, setdPreviousVelocityGradientdPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, stateVariableEvolutionRates, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, stateVariableEvolutionRates, floatVector, setStateVariableEvolutionRates ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdCauchyStress, floatMatrix, setdStateVariableEvolutionRatesdCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdF, floatMatrix, setdStateVariableEvolutionRatesdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdSubFs, floatMatrix, setdStateVariableEvolutionRatesdSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdT, floatVector, setdStateVariableEvolutionRatesdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dStateVariableEvolutionRatesdStateVariables, floatMatrix, setdStateVariableEvolutionRatesdStateVariables ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousStateVariableEvolutionRates, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousStateVariableEvolutionRates, floatVector, setPreviousStateVariableEvolutionRates ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousCauchyStress, floatMatrix, setdPreviousStateVariableEvolutionRatesdPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousF, floatMatrix, setdPreviousStateVariableEvolutionRatesdPreviousF ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousSubFs, floatMatrix, setdPreviousStateVariableEvolutionRatesdPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousT, floatVector, setdPreviousStateVariableEvolutionRatesdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, dPreviousStateVariableEvolutionRatesdPreviousStateVariables, floatMatrix, setdPreviousStateVariableEvolutionRatesdPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticDeformationGradient, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticDeformationGradient, floatVector, setPlasticDeformationGradient ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdCauchyStress, floatMatrix, setdPlasticDeformationGradientdCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdF, floatMatrix, setdPlasticDeformationGradientdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdSubFs, floatMatrix, setdPlasticDeformationGradientdSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdT, floatVector, setdPlasticDeformationGradientdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdStateVariables, floatMatrix, setdPlasticDeformationGradientdStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousCauchyStress, floatMatrix, setdPlasticDeformationGradientdPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousF, floatMatrix, setdPlasticDeformationGradientdPreviousF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousSubFs, floatMatrix, setdPlasticDeformationGradientdPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousT, floatVector, setdPlasticDeformationGradientdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticDeformationGradientdPreviousStateVariables, floatMatrix, setdPlasticDeformationGradientdPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, plasticStateVariables, floatVector, setPlasticStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdCauchyStress, floatMatrix, setdPlasticStateVariablesdCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdF, floatMatrix, setdPlasticStateVariablesdF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdSubFs, floatMatrix, setdPlasticStateVariablesdSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdT, floatVector, setdPlasticStateVariablesdT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdStateVariables, floatMatrix, setdPlasticStateVariablesdStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousCauchyStress, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousCauchyStress, floatMatrix, setdPlasticStateVariablesdPreviousCauchyStress ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousF, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousF, floatMatrix, setdPlasticStateVariablesdPreviousF ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousSubFs, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousSubFs, floatMatrix, setdPlasticStateVariablesdPreviousSubFs ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousT, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousT, floatVector, setdPlasticStateVariablesdPreviousT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousStateVariables, floatMatrix ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, dPlasticStateVariablesdPreviousStateVariables, floatMatrix, setdPlasticStateVariablesdPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, stateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE( private, stateVariables, floatVector, setStateVariables ) - TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousStateVariables, floatVector ) + TARDIGRADE_HYDRA_DECLARE_PREVIOUS_STORAGE( private, previousStateVariables, floatVector, setPreviousStateVariables ) - TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, peryznaParameters, floatVector ) + TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, peryznaParameters, floatVector, peryznaError ) - TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, dragStressParameters, floatVector ) + TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, dragStressParameters, floatVector, dragStressError ) - TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, thermalParameters, floatVector ) + TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, thermalParameters, floatVector, thermalError ) - TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, yieldParameters, floatVector ) + TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, yieldParameters, floatVector, yieldError ) - TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, flowParameters, floatVector ) + TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, flowParameters, floatVector, flowError ) - TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, hardeningParameters, floatVector ) + TARDIGRADE_HYDRA_DECLARE_CONSTANT_STORAGE( private, hardeningParameters, floatVector, hardeningError ) }; diff --git a/src/cpp/tardigrade_hydraThermalExpansion.cpp b/src/cpp/tardigrade_hydraThermalExpansion.cpp index 1b87130a..7e6f2665 100644 --- a/src/cpp/tardigrade_hydraThermalExpansion.cpp +++ b/src/cpp/tardigrade_hydraThermalExpansion.cpp @@ -49,68 +49,6 @@ namespace tardigradeHydra{ } - const floatVector* residual::getThermalGreenLagrangeStrain( ){ - /*! - * Get the thermal Green-Lagrange strain - */ - - if ( !_thermalGreenLagrangeStrain.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setThermalGreenLagrangeStrain( ) ); - - } - - return &_thermalGreenLagrangeStrain.second; - - } - - const floatVector* residual::getThermalDeformationGradient( ){ - /*! - * Get the thermal deformation gradient - */ - - if ( !_thermalDeformationGradient.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setThermalDeformationGradient( ) ); - - } - - return &_thermalDeformationGradient.second; - - } - - const floatVector* residual::getdThermalGreenLagrangeStraindT( ){ - /*! - * Get the derivative of the thermal Green-Lagrange strain w.r.t. - * the temperature. - */ - - if ( !_dThermalGreenLagrangeStraindT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdThermalGreenLagrangeStraindT( ) ); - - } - - return &_dThermalGreenLagrangeStraindT.second; - - } - - const floatVector* residual::getdThermalDeformationGradientdT( ){ - /*! - * Get the derivative of the thermal deformation gradient w.r.t. - * the temperature. - */ - - if ( !_dThermalDeformationGradientdT.first ){ - - TARDIGRADE_ERROR_TOOLS_CATCH( setdThermalDeformationGradientdT( ) ); - - } - - return &_dThermalDeformationGradientdT.second; - - } - void residual::setThermalGreenLagrangeStrain( ){ /*! * Set the thermal Green-Lagrange strain defined as @@ -144,7 +82,7 @@ namespace tardigradeHydra{ floatVector eye( ( *hydra->getDimension( ) ) * ( *hydra->getDimension( ) ) ); tardigradeVectorTools::eye( eye ); - TARDIGRADE_ERROR_TOOLS_CATCH( thermalDeformationGradient = tardigradeVectorTools::matrixSqrt( 2 * ( *getThermalGreenLagrangeStrain( ) ) + eye, *hydra->getDimension( ), dThermalGreenLagrangeStraindThermalDeformationGradient ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( thermalDeformationGradient = tardigradeVectorTools::matrixSqrt( 2 * ( *get_thermalGreenLagrangeStrain( ) ) + eye, *hydra->getDimension( ), dThermalGreenLagrangeStraindThermalDeformationGradient ) ); set_thermalDeformationGradient( thermalDeformationGradient ); @@ -152,7 +90,7 @@ namespace tardigradeHydra{ TARDIGRADE_ERROR_TOOLS_CATCH( dThermalDeformationGradientdGreenLagrangeStrain = tardigradeVectorTools::inflate( 2 * tardigradeVectorTools::inverse( tardigradeVectorTools::appendVectors( dThermalGreenLagrangeStraindThermalDeformationGradient ), ( *dim ) * ( *dim ), ( *dim ) * ( *dim ) ), ( *dim ) * ( *dim ), ( *dim ) * ( *dim ) ) ); - set_dThermalDeformationGradientdT( tardigradeVectorTools::dot( dThermalDeformationGradientdGreenLagrangeStrain, *getdThermalGreenLagrangeStraindT( ) ) ); + set_dThermalDeformationGradientdT( tardigradeVectorTools::dot( dThermalDeformationGradientdGreenLagrangeStrain, *get_dThermalGreenLagrangeStraindT( ) ) ); } @@ -181,7 +119,7 @@ namespace tardigradeHydra{ * Defined as the residual's computed thermal deformation gradient minus the value stored in hydra's configurations. */ - setResidual( *getThermalDeformationGradient( ) - ( *hydra->getConfigurations( ) )[ *getThermalConfigurationIndex( ) ] ); + setResidual( *get_thermalDeformationGradient( ) - ( *hydra->get_configurations( ) )[ *getThermalConfigurationIndex( ) ] ); } @@ -209,7 +147,7 @@ namespace tardigradeHydra{ * Set the derivative of the residual w.r.t. the temperature */ - setdRdT( *getdThermalDeformationGradientdT( ) ); + setdRdT( *get_dThermalDeformationGradientdT( ) ); } diff --git a/src/cpp/tardigrade_hydraThermalExpansion.h b/src/cpp/tardigrade_hydraThermalExpansion.h index 8e214e62..c06c7ec1 100644 --- a/src/cpp/tardigrade_hydraThermalExpansion.h +++ b/src/cpp/tardigrade_hydraThermalExpansion.h @@ -106,14 +106,6 @@ namespace tardigradeHydra{ //! Get the quadratic parameters for the thermal expansion const floatVector* getQuadraticParameters( ){ return &_quadraticParameters; } - const floatVector* getThermalGreenLagrangeStrain( ); - - const floatVector* getThermalDeformationGradient( ); - - const floatVector* getdThermalGreenLagrangeStraindT( ); - - const floatVector* getdThermalDeformationGradientdT( ); - protected: virtual void setThermalGreenLagrangeStrain( ); @@ -157,13 +149,13 @@ namespace tardigradeHydra{ floatVector _quadraticParameters; - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, thermalGreenLagrangeStrain, floatVector) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, thermalGreenLagrangeStrain, floatVector, setThermalGreenLagrangeStrain ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, dThermalGreenLagrangeStraindT, floatVector) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, dThermalGreenLagrangeStraindT, floatVector, setdThermalGreenLagrangeStraindT ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, thermalDeformationGradient, floatVector) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, thermalDeformationGradient, floatVector, setThermalDeformationGradient ) - TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, dThermalDeformationGradientdT, floatVector) + TARDIGRADE_HYDRA_DECLARE_ITERATION_STORAGE(private, dThermalDeformationGradientdT, floatVector, setdThermalDeformationGradientdT ) virtual void decomposeParameters( const floatVector ¶meters ); diff --git a/src/cpp/tests/test_tardigrade_hydra.cpp b/src/cpp/tests/test_tardigrade_hydra.cpp index 1385d72d..7a760da0 100644 --- a/src/cpp/tests/test_tardigrade_hydra.cpp +++ b/src/cpp/tests/test_tardigrade_hydra.cpp @@ -109,49 +109,49 @@ namespace tardigradeHydra{ static void checkConfigurations( hydraBase &hydra ){ - BOOST_CHECK( &hydra._configurations.second == hydra.getConfigurations( ) ); + BOOST_CHECK( &hydra._configurations.second == hydra.get_configurations( ) ); } static void checkPreviousConfigurations( hydraBase &hydra ){ - BOOST_CHECK( &hydra._previousConfigurations.second == hydra.getPreviousConfigurations( ) ); + BOOST_CHECK( &hydra._previousConfigurations.second == hydra.get_previousConfigurations( ) ); } static void checkInverseConfigurations( hydraBase &hydra ){ - BOOST_CHECK( &hydra._inverseConfigurations.second == hydra.getInverseConfigurations( ) ); + BOOST_CHECK( &hydra._inverseConfigurations.second == hydra.get_inverseConfigurations( ) ); } static void checkPreviousInverseConfigurations( hydraBase &hydra ){ - BOOST_CHECK( &hydra._previousInverseConfigurations.second == hydra.getPreviousInverseConfigurations( ) ); + BOOST_CHECK( &hydra._previousInverseConfigurations.second == hydra.get_previousInverseConfigurations( ) ); } static void checkNonLinearSolveStateVariables( hydraBase &hydra ){ - BOOST_CHECK( &hydra._nonLinearSolveStateVariables.second == hydra.getNonLinearSolveStateVariables( ) ); + BOOST_CHECK( &hydra._nonLinearSolveStateVariables.second == hydra.get_nonLinearSolveStateVariables( ) ); } static void checkPreviousNonLinearSolveStateVariables( hydraBase &hydra ){ - BOOST_CHECK( &hydra._previousNonLinearSolveStateVariables.second == hydra.getPreviousNonLinearSolveStateVariables( ) ); + BOOST_CHECK( &hydra._previousNonLinearSolveStateVariables.second == hydra.get_previousNonLinearSolveStateVariables( ) ); } static void checkAdditionalStateVariables( hydraBase &hydra ){ - BOOST_CHECK( &hydra._additionalStateVariables.second == hydra.getAdditionalStateVariables( ) ); + BOOST_CHECK( &hydra._additionalStateVariables.second == hydra.get_additionalStateVariables( ) ); } static void checkPreviousAdditionalStateVariables( hydraBase &hydra ){ - BOOST_CHECK( &hydra._previousAdditionalStateVariables.second == hydra.getPreviousAdditionalStateVariables( ) ); + BOOST_CHECK( &hydra._previousAdditionalStateVariables.second == hydra.get_previousAdditionalStateVariables( ) ); } @@ -502,7 +502,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getNumNonLinearSolveStateVariables ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getConfigurations ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_configurations ){ tardigradeHydra::hydraBase hydra; @@ -510,7 +510,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getConfigurations ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousConfigurations ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_previousConfigurations ){ tardigradeHydra::hydraBase hydra; @@ -518,7 +518,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousConfigurations ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getInverseConfigurations ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_inverseConfigurations ){ tardigradeHydra::hydraBase hydra; @@ -526,7 +526,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getInverseConfigurations ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousInverseConfigurations ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_previousInverseConfigurations ){ tardigradeHydra::hydraBase hydra; @@ -534,7 +534,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousInverseConfigurations ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getNonLinearSolveStateVariables ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_nonLinearSolveStateVariables ){ tardigradeHydra::hydraBase hydra; @@ -542,7 +542,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getNonLinearSolveStateVariables ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousNonLinearSolveStateVariables ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_previousNonLinearSolveStateVariables ){ tardigradeHydra::hydraBase hydra; @@ -550,7 +550,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousNonLinearSolveStateVariables ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getAdditionalStateVariables ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_additionalStateVariables ){ tardigradeHydra::hydraBase hydra; @@ -558,7 +558,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getAdditionalStateVariables ){ } -BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousAdditionalStateVariables ){ +BOOST_AUTO_TEST_CASE( test_hydraBase_get_previousAdditionalStateVariables ){ tardigradeHydra::hydraBase hydra; @@ -683,21 +683,21 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_decomposeStateVariableVector ){ tardigradeHydra::unit_test::hydraBaseTester::decomposeStateVariableVector( hydra ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( configurationsAnswer, *hydra.getConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( configurationsAnswer, *hydra.get_configurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousConfigurationsAnswer, *hydra.getPreviousConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousConfigurationsAnswer, *hydra.get_previousConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( inverseConfigurationsAnswer, *hydra.getInverseConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( inverseConfigurationsAnswer, *hydra.get_inverseConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousInverseConfigurationsAnswer, *hydra.getPreviousInverseConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousInverseConfigurationsAnswer, *hydra.get_previousInverseConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( nonLinearSolveStateVariablesAnswer, *hydra.getNonLinearSolveStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( nonLinearSolveStateVariablesAnswer, *hydra.get_nonLinearSolveStateVariables( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousNonLinearSolveStateVariablesAnswer, *hydra.getPreviousNonLinearSolveStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousNonLinearSolveStateVariablesAnswer, *hydra.get_previousNonLinearSolveStateVariables( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( additionalStateVariablesAnswer, *hydra.getAdditionalStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( additionalStateVariablesAnswer, *hydra.get_additionalStateVariables( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousAdditionalStateVariablesAnswer, *hydra.getPreviousAdditionalStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousAdditionalStateVariablesAnswer, *hydra.get_previousAdditionalStateVariables( ) ) ); } @@ -1063,7 +1063,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getSubConfigurationJacobian ){ tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - floatMatrix configurations = *hydra.getConfigurations( ); + floatMatrix configurations = *hydra.get_configurations( ); floatVector x = tardigradeVectorTools::appendVectors( configurations ); @@ -1174,7 +1174,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getSubConfigurationJacobian2 ){ tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - floatMatrix configurations = *hydra.getConfigurations( ); + floatMatrix configurations = *hydra.get_configurations( ); floatVector x = tardigradeVectorTools::appendVectors( configurations ); @@ -1285,7 +1285,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getPrecedingConfigurationJacobian ){ tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - floatMatrix configurations = *hydra.getConfigurations( ); + floatMatrix configurations = *hydra.get_configurations( ); floatVector x = tardigradeVectorTools::appendVectors( configurations ); @@ -1396,7 +1396,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getFollowingConfigurationJacobian ){ tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - floatMatrix configurations = *hydra.getConfigurations( ); + floatMatrix configurations = *hydra.get_configurations( ); floatVector x = tardigradeVectorTools::appendVectors( configurations ); @@ -1507,7 +1507,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousSubConfigurationJacobian ){ tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - floatMatrix configurations = *hydra.getPreviousConfigurations( ); + floatMatrix configurations = *hydra.get_previousConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( configurations ); @@ -1618,7 +1618,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousPrecedingConfigurationJacobian ) tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - floatMatrix configurations = *hydra.getPreviousConfigurations( ); + floatMatrix configurations = *hydra.get_previousConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( configurations ); @@ -1729,7 +1729,7 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_getPreviousFollowingConfigurationJacobian ) tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - floatMatrix configurations = *hydra.getPreviousConfigurations( ); + floatMatrix configurations = *hydra.get_previousConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( configurations ); @@ -1860,9 +1860,9 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setFirstConfigurationGradients ){ floatVector F1_p, F1_m; - F1_p = ( *hydra_p.getConfigurations( ) )[ 0 ]; + F1_p = ( *hydra_p.get_configurations( ) )[ 0 ]; - F1_m = ( *hydra_m.getConfigurations( ) )[ 0 ]; + F1_m = ( *hydra_m.get_configurations( ) )[ 0 ]; for ( unsigned int j = 0; j < F1_p.size( ); j++ ){ @@ -1872,7 +1872,7 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setFirstConfigurationGradients ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dF1dF_answer, *hydra.getdF1dF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dF1dF_answer, *hydra.get_dF1dF( ) ) ); tardigradeHydra::unit_test::hydraBaseTester::checkdF1dF( hydra ); @@ -1890,9 +1890,9 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setFirstConfigurationGradients ){ floatVector F1_p, F1_m; - F1_p = ( *hydra_p.getConfigurations( ) )[ 0 ]; + F1_p = ( *hydra_p.get_configurations( ) )[ 0 ]; - F1_m = ( *hydra_m.getConfigurations( ) )[ 0 ]; + F1_m = ( *hydra_m.get_configurations( ) )[ 0 ]; for ( unsigned int j = 0; j < F1_p.size( ); j++ ){ @@ -1902,7 +1902,7 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setFirstConfigurationGradients ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dF1dFn_answer, *hydra.getdF1dFn( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dF1dFn_answer, *hydra.get_dF1dFn( ) ) ); tardigradeHydra::unit_test::hydraBaseTester::checkdF1dFn( hydra ); @@ -1966,9 +1966,9 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setPreviousFirstConfigurationGradients ){ floatVector F1_p, F1_m; - F1_p = ( *hydra_p.getPreviousConfigurations( ) )[ 0 ]; + F1_p = ( *hydra_p.get_previousConfigurations( ) )[ 0 ]; - F1_m = ( *hydra_m.getPreviousConfigurations( ) )[ 0 ]; + F1_m = ( *hydra_m.get_previousConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < F1_p.size( ); j++ ){ @@ -1978,7 +1978,7 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setPreviousFirstConfigurationGradients ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdF1dF_answer, *hydra.getPreviousdF1dF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdF1dF_answer, *hydra.get_previousdF1dF( ) ) ); for ( unsigned int i = 0; i < ( numConfigurations - 1 ) * deformationGradient.size( ); i++ ){ @@ -1994,9 +1994,9 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setPreviousFirstConfigurationGradients ){ floatVector F1_p, F1_m; - F1_p = ( *hydra_p.getPreviousConfigurations( ) )[ 0 ]; + F1_p = ( *hydra_p.get_previousConfigurations( ) )[ 0 ]; - F1_m = ( *hydra_m.getPreviousConfigurations( ) )[ 0 ]; + F1_m = ( *hydra_m.get_previousConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < F1_p.size( ); j++ ){ @@ -2006,7 +2006,7 @@ BOOST_AUTO_TEST_CASE( test_hydraTest_setPreviousFirstConfigurationGradients ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdF1dFn_answer, *hydra.getPreviousdF1dFn( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdF1dFn_answer, *hydra.get_previousdF1dFn( ) ) ); } @@ -3265,9 +3265,9 @@ BOOST_AUTO_TEST_CASE( test_hydraBase_decomposeUnknownVector ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *hydra.getStress( ), cauchyStressAnswer ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *hydra.getConfigurations( ), configurationsAnswer ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *hydra.get_configurations( ), configurationsAnswer ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *hydra.getNonLinearSolveStateVariables( ), isvAnswer ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *hydra.get_nonLinearSolveStateVariables( ), isvAnswer ) ); } @@ -3554,7 +3554,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setdRdF ){ BOOST_CHECK_NO_THROW( hydra.evaluate( ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2Answer, *hydra.elasticity.getPK2Stress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2Answer, *hydra.elasticity.get_PK2Stress( ) ) ); BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( cauchyStressAnswer, *hydra.getStress( ) ) ); @@ -3601,8 +3601,8 @@ BOOST_AUTO_TEST_CASE( test_getConfiguration ){ tardigradeHydra::hydraBase hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( hydra.getConfiguration( 1 ), ( *hydra.getConfigurations( ) )[ 1 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( hydra.getConfiguration( 1 ), ( *hydra.get_configurations( ) )[ 1 ] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( hydra.getPreviousConfiguration( 3 ), ( *hydra.getPreviousConfigurations( ) )[ 3 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( hydra.getPreviousConfiguration( 3 ), ( *hydra.get_previousConfigurations( ) )[ 3 ] ) ); } diff --git a/src/cpp/tests/test_tardigrade_hydraLinearElasticity.cpp b/src/cpp/tests/test_tardigrade_hydraLinearElasticity.cpp index 983bbb8b..a97b4a71 100644 --- a/src/cpp/tests/test_tardigrade_hydraLinearElasticity.cpp +++ b/src/cpp/tests/test_tardigrade_hydraLinearElasticity.cpp @@ -49,21 +49,21 @@ namespace tardigradeHydra{ BOOST_CHECK( &R._mu == R.getMu( ) ); - BOOST_CHECK( &R._Ee.second == R.getEe( ) ); + BOOST_CHECK( &R._Ee.second == R.get_Ee( ) ); - BOOST_CHECK( &R._dEedFe.second == R.getdEedFe( ) ); + BOOST_CHECK( &R._dEedFe.second == R.get_dEedFe( ) ); - BOOST_CHECK( &R._PK2Stress.second == R.getPK2Stress( ) ); + BOOST_CHECK( &R._PK2Stress.second == R.get_PK2Stress( ) ); - BOOST_CHECK( &R._dPK2StressdEe.second == R.getdPK2StressdEe( ) ); + BOOST_CHECK( &R._dPK2StressdEe.second == R.get_dPK2StressdEe( ) ); - BOOST_CHECK( &R._dPK2StressdFe.second == R.getdPK2StressdFe( ) ); + BOOST_CHECK( &R._dPK2StressdFe.second == R.get_dPK2StressdFe( ) ); - BOOST_CHECK( &R._dCauchyStressdPK2Stress.second == R.getdCauchyStressdPK2Stress( ) ); + BOOST_CHECK( &R._dCauchyStressdPK2Stress.second == R.get_dCauchyStressdPK2Stress( ) ); - BOOST_CHECK( &R._dCauchyStressdF.second == R.getdCauchyStressdF( ) ); + BOOST_CHECK( &R._dCauchyStressdF.second == R.get_dCauchyStressdF( ) ); - BOOST_CHECK( &R._dCauchyStressdFn.second == R.getdCauchyStressdFn( ) ); + BOOST_CHECK( &R._dCauchyStressdFn.second == R.get_dCauchyStressdFn( ) ); } @@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setEe ){ tardigradeHydra::linearElasticity::residual R( &hydra, 9, parameters ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( EeAnswer, *R.getEe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( EeAnswer, *R.get_Ee( ) ) ); } @@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setdEedFe ){ tardigradeHydra::linearElasticity::residual R( &hydra, 9, parameters ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dEedFeAnswer, *R.getdEedFe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dEedFeAnswer, *R.get_dEedFe( ) ) ); } @@ -349,7 +349,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2Stress ){ residualMock R( &hydra, 9, parameters ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2StressAnswer, *R.getPK2Stress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2StressAnswer, *R.get_PK2Stress( ) ) ); } @@ -456,13 +456,13 @@ BOOST_AUTO_TEST_CASE( test_residual_setdPK2StressdEe ){ for ( unsigned int j = 0; j < R.Ee.size( ); j++ ){ - gradient[ j ][ i ] = ( ( *Rp.getPK2Stress( ) )[ j ] - ( *Rm.getPK2Stress( ) )[ j ] ) / ( 2 * delta[ i ] ); + gradient[ j ][ i ] = ( ( *Rp.get_PK2Stress( ) )[ j ] - ( *Rm.get_PK2Stress( ) )[ j ] ) / ( 2 * delta[ i ] ); } } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.getdPK2StressdEe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.get_dPK2StressdEe( ) ) ); } @@ -560,13 +560,13 @@ BOOST_AUTO_TEST_CASE( test_residual_setdPK2StressdFe ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - gradient[ j ][ i ] = ( ( *Rp.getPK2Stress( ) )[ j ] - ( *Rm.getPK2Stress( ) )[ j ] ) / ( 2 * delta[ i ] ); + gradient[ j ][ i ] = ( ( *Rp.get_PK2Stress( ) )[ j ] - ( *Rm.get_PK2Stress( ) )[ j ] ) / ( 2 * delta[ i ] ); } } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.getdPK2StressdFe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.get_dPK2StressdFe( ) ) ); } @@ -772,7 +772,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setdCauchyStressdPK2Stress ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.getdCauchyStressdPK2Stress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.get_dCauchyStressdPK2Stress( ) ) ); } @@ -863,7 +863,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setdCauchyStressdF ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.getdCauchyStressdF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.get_dCauchyStressdF( ) ) ); } @@ -928,11 +928,11 @@ BOOST_AUTO_TEST_CASE( test_residual_setdCauchyStressdFn ){ floatMatrix gradient( deformationGradient.size( ), floatVector( deformationGradient.size( ), 0 ) ); - BOOST_CHECK( R.getdCauchyStressdFn( )->size( ) == 9 ); + BOOST_CHECK( R.get_dCauchyStressdFn( )->size( ) == 9 ); for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( ( *R.getdCauchyStressdFn( ) )[ i ].size( ) == 0 ); + BOOST_CHECK( ( *R.get_dCauchyStressdFn( ) )[ i ].size( ) == 0 ); } @@ -1026,7 +1026,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setdCauchyStressdFn2 ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.getdCauchyStressdFn( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *R.get_dCauchyStressdFn( ) ) ); } diff --git a/src/cpp/tests/test_tardigrade_hydraLinearViscoelasticity.cpp b/src/cpp/tests/test_tardigrade_hydraLinearViscoelasticity.cpp index e8efab0a..5c602d1e 100644 --- a/src/cpp/tests/test_tardigrade_hydraLinearViscoelasticity.cpp +++ b/src/cpp/tests/test_tardigrade_hydraLinearViscoelasticity.cpp @@ -65,13 +65,13 @@ namespace tardigradeHydra{ BOOST_CHECK( &R._isochoricTaus == R.getIsochoricTaus( ) ); - BOOST_CHECK( &R._Je.second == R.getJe( ) ); + BOOST_CHECK( &R._Je.second == R.get_Je( ) ); - BOOST_CHECK( &R._Fehat.second == R.getFehat( ) ); + BOOST_CHECK( &R._Fehat.second == R.get_Fehat( ) ); - BOOST_CHECK( &R._previousJe.second == R.getPreviousJe( ) ); + BOOST_CHECK( &R._previousJe.second == R.get_previousJe( ) ); - BOOST_CHECK( &R._previousFehat.second == R.getPreviousFehat( ) ); + BOOST_CHECK( &R._previousFehat.second == R.get_previousFehat( ) ); BOOST_CHECK( &R._numStateVariables == R.getNumStateVariables( ) ); @@ -79,41 +79,41 @@ namespace tardigradeHydra{ BOOST_CHECK( &R._isochoricTemperatureParameters == R.getIsochoricTemperatureParameters( ) ); - BOOST_CHECK( &R._volumetricRateMultiplier.second == R.getVolumetricRateMultiplier( ) ); + BOOST_CHECK( &R._volumetricRateMultiplier.second == R.get_volumetricRateMultiplier( ) ); - BOOST_CHECK( &R._previousVolumetricRateMultiplier.second == R.getPreviousVolumetricRateMultiplier( ) ); + BOOST_CHECK( &R._previousVolumetricRateMultiplier.second == R.get_previousVolumetricRateMultiplier( ) ); - BOOST_CHECK( &R._isochoricRateMultiplier.second == R.getIsochoricRateMultiplier( ) ); + BOOST_CHECK( &R._isochoricRateMultiplier.second == R.get_isochoricRateMultiplier( ) ); - BOOST_CHECK( &R._previousIsochoricRateMultiplier.second == R.getPreviousIsochoricRateMultiplier( ) ); + BOOST_CHECK( &R._previousIsochoricRateMultiplier.second == R.get_previousIsochoricRateMultiplier( ) ); - BOOST_CHECK( &R._dVolumetricRateMultiplierdT.second == R.getdVolumetricRateMultiplierdT( ) ); + BOOST_CHECK( &R._dVolumetricRateMultiplierdT.second == R.get_dVolumetricRateMultiplierdT( ) ); - BOOST_CHECK( &R._dPreviousVolumetricRateMultiplierdPreviousT.second == R.getdPreviousVolumetricRateMultiplierdPreviousT( ) ); + BOOST_CHECK( &R._dPreviousVolumetricRateMultiplierdPreviousT.second == R.get_dPreviousVolumetricRateMultiplierdPreviousT( ) ); - BOOST_CHECK( &R._dIsochoricRateMultiplierdT.second == R.getdIsochoricRateMultiplierdT( ) ); + BOOST_CHECK( &R._dIsochoricRateMultiplierdT.second == R.get_dIsochoricRateMultiplierdT( ) ); - BOOST_CHECK( &R._dPreviousIsochoricRateMultiplierdPreviousT.second == R.getdPreviousIsochoricRateMultiplierdPreviousT( ) ); + BOOST_CHECK( &R._dPreviousIsochoricRateMultiplierdPreviousT.second == R.get_dPreviousIsochoricRateMultiplierdPreviousT( ) ); BOOST_CHECK( &R._integrationAlpha == R.getIntegrationAlpha( ) ); - BOOST_CHECK( &R._PK2MeanStress.second == R.getPK2MeanStress( ) ); + BOOST_CHECK( &R._PK2MeanStress.second == R.get_PK2MeanStress( ) ); - BOOST_CHECK( &R._PK2IsochoricStress.second == R.getPK2IsochoricStress( ) ); + BOOST_CHECK( &R._PK2IsochoricStress.second == R.get_PK2IsochoricStress( ) ); - BOOST_CHECK( &R._dPK2MeanStressdFe.second == R.getdPK2MeanStressdFe( ) ); + BOOST_CHECK( &R._dPK2MeanStressdFe.second == R.get_dPK2MeanStressdFe( ) ); - BOOST_CHECK( &R._dPK2MeanStressdT.second == R.getdPK2MeanStressdT( ) ); + BOOST_CHECK( &R._dPK2MeanStressdT.second == R.get_dPK2MeanStressdT( ) ); - BOOST_CHECK( &R._dPK2IsochoricStressdFe.second == R.getdPK2IsochoricStressdFe( ) ); + BOOST_CHECK( &R._dPK2IsochoricStressdFe.second == R.get_dPK2IsochoricStressdFe( ) ); - BOOST_CHECK( &R._dPK2IsochoricStressdT.second == R.getdPK2IsochoricStressdT( ) ); + BOOST_CHECK( &R._dPK2IsochoricStressdT.second == R.get_dPK2IsochoricStressdT( ) ); - BOOST_CHECK( &R._dCauchyStressdT.second == R.getdCauchyStressdT( ) ); + BOOST_CHECK( &R._dCauchyStressdT.second == R.get_dCauchyStressdT( ) ); - BOOST_CHECK( &R._volumetricViscoelasticStateVariables.second == R.getUpdatedVolumetricViscoelasticStateVariables( ) ); + BOOST_CHECK( &R._volumetricViscoelasticStateVariables.second == R.get_volumetricViscoelasticStateVariables( ) ); - BOOST_CHECK( &R._isochoricViscoelasticStateVariables.second == R.getUpdatedIsochoricViscoelasticStateVariables( ) ); + BOOST_CHECK( &R._isochoricViscoelasticStateVariables.second == R.get_isochoricViscoelasticStateVariables( ) ); } @@ -279,9 +279,9 @@ BOOST_AUTO_TEST_CASE( test_residual_decomposeElasticDeformation ){ tardigradeHydra::linearViscoelasticity::residual R2( &hydra, 9, parameters, ISVlb, ISVub ); - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( JeAnswer, *R1.getJe( ) ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( JeAnswer, *R1.get_Je( ) ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( FehatAnswer, *R2.getFehat( ) ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( FehatAnswer, *R2.get_Fehat( ) ) ); } @@ -342,9 +342,9 @@ BOOST_AUTO_TEST_CASE( test_residual_decomposePreviousElasticDeformation ){ tardigradeHydra::linearViscoelasticity::residual R2( &hydra, 9, parameters, ISVlb, ISVub ); - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( JeAnswer, *R1.getPreviousJe( ) ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( JeAnswer, *R1.get_previousJe( ) ) ); - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( FehatAnswer, *R2.getPreviousFehat( ) ) ); + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( FehatAnswer, *R2.get_previousFehat( ) ) ); } @@ -421,21 +421,21 @@ BOOST_AUTO_TEST_CASE( test_residual_gradientsOfDecomposedElasticDeformationGradi for ( unsigned int j = 0; j < 1; j++ ){ - gradientJe[ i ] = ( ( *Rp.getJe( ) ) - ( *Rm.getJe( ) ) ) / ( 2 * delta[ i ] ); + gradientJe[ i ] = ( ( *Rp.get_Je( ) ) - ( *Rm.get_Je( ) ) ) / ( 2 * delta[ i ] ); } for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - gradientFehat[ j ][ i ] = ( ( *Rp.getFehat( ) )[ j ] - ( *Rm.getFehat( ) )[ j ] ) / ( 2 * delta[ i ] ); + gradientFehat[ j ][ i ] = ( ( *Rp.get_Fehat( ) )[ j ] - ( *Rm.get_Fehat( ) )[ j ] ) / ( 2 * delta[ i ] ); } } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradientJe, *R.getdJedFe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradientJe, *R.get_dJedFe( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradientFehat, *R.getdFehatdFe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradientFehat, *R.get_dFehatdFe( ) ) ); } @@ -570,13 +570,13 @@ BOOST_AUTO_TEST_CASE( test_residual_setRateMultipliers ){ tardigradeHydra::linearViscoelasticity::residual R( &hydra, 9, parameters, ISVlb, ISVub ); - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( volumetricRateMultiplierAnswer, *R.getVolumetricRateMultiplier( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( volumetricRateMultiplierAnswer, *R.get_volumetricRateMultiplier( ) ) ) - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( previousVolumetricRateMultiplierAnswer, *R.getPreviousVolumetricRateMultiplier( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( previousVolumetricRateMultiplierAnswer, *R.get_previousVolumetricRateMultiplier( ) ) ) - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( isochoricRateMultiplierAnswer, *R.getIsochoricRateMultiplier( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( isochoricRateMultiplierAnswer, *R.get_isochoricRateMultiplier( ) ) ) - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( previousIsochoricRateMultiplierAnswer, *R.getPreviousIsochoricRateMultiplier( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( previousIsochoricRateMultiplierAnswer, *R.get_previousIsochoricRateMultiplier( ) ) ) } @@ -658,9 +658,9 @@ BOOST_AUTO_TEST_CASE( test_residual_setdRateMultipliersdT ){ tardigradeHydra::linearViscoelasticity::residual Rm( &hydram, 9, parameters, ISVlb, ISVub ); - dVolumetricRateMultiplierdT = ( *Rp.getVolumetricRateMultiplier( ) - *Rm.getVolumetricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); + dVolumetricRateMultiplierdT = ( *Rp.get_volumetricRateMultiplier( ) - *Rm.get_volumetricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); - dIsochoricRateMultiplierdT = ( *Rp.getIsochoricRateMultiplier( ) - *Rm.getIsochoricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); + dIsochoricRateMultiplierdT = ( *Rp.get_isochoricRateMultiplier( ) - *Rm.get_isochoricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); } @@ -680,19 +680,19 @@ BOOST_AUTO_TEST_CASE( test_residual_setdRateMultipliersdT ){ tardigradeHydra::linearViscoelasticity::residual Rm( &hydram, 9, parameters, ISVlb, ISVub ); - dPreviousVolumetricRateMultiplierdPreviousT = ( *Rp.getPreviousVolumetricRateMultiplier( ) - *Rm.getPreviousVolumetricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); + dPreviousVolumetricRateMultiplierdPreviousT = ( *Rp.get_previousVolumetricRateMultiplier( ) - *Rm.get_previousVolumetricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); - dPreviousIsochoricRateMultiplierdPreviousT = ( *Rp.getPreviousIsochoricRateMultiplier( ) - *Rm.getPreviousIsochoricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); + dPreviousIsochoricRateMultiplierdPreviousT = ( *Rp.get_previousIsochoricRateMultiplier( ) - *Rm.get_previousIsochoricRateMultiplier( ) ) / ( 2 * deltas[ i ] ); } - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dVolumetricRateMultiplierdT, *R.getdVolumetricRateMultiplierdT( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dVolumetricRateMultiplierdT, *R.get_dVolumetricRateMultiplierdT( ) ) ) - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dPreviousVolumetricRateMultiplierdPreviousT, *R.getdPreviousVolumetricRateMultiplierdPreviousT( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dPreviousVolumetricRateMultiplierdPreviousT, *R.get_dPreviousVolumetricRateMultiplierdPreviousT( ) ) ) - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dIsochoricRateMultiplierdT, *R.getdIsochoricRateMultiplierdT( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dIsochoricRateMultiplierdT, *R.get_dIsochoricRateMultiplierdT( ) ) ) - TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dPreviousIsochoricRateMultiplierdPreviousT, *R.getdPreviousIsochoricRateMultiplierdPreviousT( ) ) ) + TARDIGRADE_ERROR_TOOLS_CATCH( tardigradeVectorTools::fuzzyEquals( dPreviousIsochoricRateMultiplierdPreviousT, *R.get_dPreviousIsochoricRateMultiplierdPreviousT( ) ) ) } @@ -858,9 +858,9 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2MeanStress ){ residualMock R( &hydra, 9, parameters, ISVlb, ISVub, 0.5 ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2MeanStressAnswer[ 0 ], *R.getPK2MeanStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2MeanStressAnswer[ 0 ], *R.get_PK2MeanStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( updatedISVsAnswer, *R.getUpdatedVolumetricViscoelasticStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( updatedISVsAnswer, *R.get_volumetricViscoelasticStateVariables( ) ) ); } @@ -948,7 +948,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2MeanStressDerivatives ){ for ( unsigned int j = 0; j < 1; j++ ){ - dPK2MeanStressdFe[ i ] = ( ( *Rp.getPK2MeanStress( ) ) - ( *Rm.getPK2MeanStress( ) ) ) / ( 2 * deltas[ i ] ); + dPK2MeanStressdFe[ i ] = ( ( *Rp.get_PK2MeanStress( ) ) - ( *Rm.get_PK2MeanStress( ) ) ) / ( 2 * deltas[ i ] ); } @@ -972,15 +972,15 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2MeanStressDerivatives ){ for ( unsigned int j = 0; j < 1; j++ ){ - dPK2MeanStressdT = ( ( *Rp.getPK2MeanStress( ) ) - ( *Rm.getPK2MeanStress( ) ) ) / ( 2 * deltas[ i ] ); + dPK2MeanStressdT = ( ( *Rp.get_PK2MeanStress( ) ) - ( *Rm.get_PK2MeanStress( ) ) ) / ( 2 * deltas[ i ] ); } } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2MeanStressdFe, *R.getdPK2MeanStressdFe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2MeanStressdFe, *R.get_dPK2MeanStressdFe( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2MeanStressdT, *R.getdPK2MeanStressdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2MeanStressdT, *R.get_dPK2MeanStressdT( ) ) ); } @@ -1066,9 +1066,9 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2IsochoricStress ){ residualMock R( &hydra, 9, parameters, ISVlb, ISVub, 0.5 ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2IsochoricStressAnswer, *R.getPK2IsochoricStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2IsochoricStressAnswer, *R.get_PK2IsochoricStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( updatedISVsAnswer, *R.getUpdatedIsochoricViscoelasticStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( updatedISVsAnswer, *R.get_isochoricViscoelasticStateVariables( ) ) ); } @@ -1156,7 +1156,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2IsochoricStressDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dPK2IsochoricStressdFe[ j ][ i ] = ( ( *Rp.getPK2IsochoricStress( ) )[ j ] - ( *Rm.getPK2IsochoricStress( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dPK2IsochoricStressdFe[ j ][ i ] = ( ( *Rp.get_PK2IsochoricStress( ) )[ j ] - ( *Rm.get_PK2IsochoricStress( ) )[ j ] ) / ( 2 * deltas[ i ] ); } @@ -1180,15 +1180,15 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2IsochoricStressDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dPK2IsochoricStressdT[ j ] = ( ( *Rp.getPK2IsochoricStress( ) )[ j ] - ( *Rm.getPK2IsochoricStress( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dPK2IsochoricStressdT[ j ] = ( ( *Rp.get_PK2IsochoricStress( ) )[ j ] - ( *Rm.get_PK2IsochoricStress( ) )[ j ] ) / ( 2 * deltas[ i ] ); } } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2IsochoricStressdFe, *R.getdPK2IsochoricStressdFe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2IsochoricStressdFe, *R.get_dPK2IsochoricStressdFe( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2IsochoricStressdT, *R.getdPK2IsochoricStressdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2IsochoricStressdT, *R.get_dPK2IsochoricStressdT( ) ) ); } @@ -1284,9 +1284,9 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2Stress ){ residualMock R( &hydra, 9, parameters, ISVlb, ISVub, 0.5 ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2StressAnswer, *R.getPK2Stress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( PK2StressAnswer, *R.get_PK2Stress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( tardigradeVectorTools::appendVectors( { *R.getUpdatedVolumetricViscoelasticStateVariables( ), *R.getUpdatedIsochoricViscoelasticStateVariables( ) } ), + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( tardigradeVectorTools::appendVectors( { *R.get_volumetricViscoelasticStateVariables( ), *R.get_isochoricViscoelasticStateVariables( ) } ), *R.getCurrentAdditionalStateVariables( ) ) ); } @@ -1375,7 +1375,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2StressDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dPK2StressdFe[ j ][ i ] = ( ( *Rp.getPK2Stress( ) )[ j ] - ( *Rm.getPK2Stress( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dPK2StressdFe[ j ][ i ] = ( ( *Rp.get_PK2Stress( ) )[ j ] - ( *Rm.get_PK2Stress( ) )[ j ] ) / ( 2 * deltas[ i ] ); } @@ -1399,15 +1399,15 @@ BOOST_AUTO_TEST_CASE( test_residual_setPK2StressDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dPK2StressdT[ j ] = ( ( *Rp.getPK2Stress( ) )[ j ] - ( *Rm.getPK2Stress( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dPK2StressdT[ j ] = ( ( *Rp.get_PK2Stress( ) )[ j ] - ( *Rm.get_PK2Stress( ) )[ j ] ) / ( 2 * deltas[ i ] ); } } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2StressdFe, *R.getdPK2StressdFe( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2StressdFe, *R.get_dPK2StressdFe( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2StressdT, *R.getdPK2StressdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2StressdT, *R.get_dPK2StressdT( ) ) ); } @@ -1525,9 +1525,9 @@ BOOST_AUTO_TEST_CASE( test_residual_setdCauchyStressdT ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dCauchyStressdF, *R.getdCauchyStressdF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dCauchyStressdF, *R.get_dCauchyStressdF( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dCauchyStressdT, *R.getdCauchyStressdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dCauchyStressdT, *R.get_dCauchyStressdT( ) ) ); } diff --git a/src/cpp/tests/test_tardigrade_hydraMicromorphic.cpp b/src/cpp/tests/test_tardigrade_hydraMicromorphic.cpp index 483416c9..928d7116 100644 --- a/src/cpp/tests/test_tardigrade_hydraMicromorphic.cpp +++ b/src/cpp/tests/test_tardigrade_hydraMicromorphic.cpp @@ -182,21 +182,21 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_constructor ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousGradientMicroDeformation, *hydra.getPreviousGradientMicroDeformation( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( configurationsAnswer, *hydra.getConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( configurationsAnswer, *hydra.get_configurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousConfigurationsAnswer, *hydra.getPreviousConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousConfigurationsAnswer, *hydra.get_previousConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( inverseConfigurationsAnswer, *hydra.getInverseConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( inverseConfigurationsAnswer, *hydra.get_inverseConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousInverseConfigurationsAnswer, *hydra.getPreviousInverseConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousInverseConfigurationsAnswer, *hydra.get_previousInverseConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( microConfigurationsAnswer, *hydra.getMicroConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( microConfigurationsAnswer, *hydra.get_microConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousMicroConfigurationsAnswer, *hydra.getPreviousMicroConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousMicroConfigurationsAnswer, *hydra.get_previousMicroConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( inverseMicroConfigurationsAnswer, *hydra.getInverseMicroConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( inverseMicroConfigurationsAnswer, *hydra.get_inverseMicroConfigurations( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousInverseMicroConfigurationsAnswer, *hydra.getPreviousInverseMicroConfigurations( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousInverseMicroConfigurationsAnswer, *hydra.get_previousInverseMicroConfigurations( ) ) ); } @@ -1037,7 +1037,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousFollowing } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousMicroConfiguration ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_previousMicroConfiguration ){ floatType time = 1.23; @@ -1269,7 +1269,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getSubMicroConfigura dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatMatrix microConfigurations = *hydra.getMicroConfigurations( ); + floatMatrix microConfigurations = *hydra.get_microConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( microConfigurations ); @@ -1454,7 +1454,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPrecedingMicroCon dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatMatrix microConfigurations = *hydra.getMicroConfigurations( ); + floatMatrix microConfigurations = *hydra.get_microConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( microConfigurations ); @@ -1639,7 +1639,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getFollowingMicroCon dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatMatrix microConfigurations = *hydra.getMicroConfigurations( ); + floatMatrix microConfigurations = *hydra.get_microConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( microConfigurations ); @@ -1824,7 +1824,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousSubMicroC dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatMatrix microConfigurations = *hydra.getPreviousMicroConfigurations( ); + floatMatrix microConfigurations = *hydra.get_previousMicroConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( microConfigurations ); @@ -2009,7 +2009,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousPreceding dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatMatrix microConfigurations = *hydra.getPreviousMicroConfigurations( ); + floatMatrix microConfigurations = *hydra.get_previousMicroConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( microConfigurations ); @@ -2194,7 +2194,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousFollowing dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatMatrix microConfigurations = *hydra.getPreviousMicroConfigurations( ); + floatMatrix microConfigurations = *hydra.get_previousMicroConfigurations( ); floatVector x = tardigradeVectorTools::appendVectors( microConfigurations ); @@ -2270,7 +2270,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousFollowing } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getdChi1dChi ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_dChi1dChi ){ floatType time = 1.23; @@ -2420,7 +2420,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getdChi1dChi ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.getdChi1dChi( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.get_dChi1dChi( ) ) ); } @@ -2574,11 +2574,11 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousdChi1dChi } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.getPreviousdChi1dChi( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.get_previousdChi1dChi( ) ) ); } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getdChi1dChin ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_dChi1dChin ){ floatType time = 1.23; @@ -2728,11 +2728,11 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getdChi1dChin ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.getdChi1dChin( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.get_dChi1dChin( ) ) ); } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousdChi1dChin ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_previousdChi1dChin ){ floatType time = 1.23; @@ -2882,11 +2882,11 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousdChi1dChi } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.getPreviousdChi1dChin( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradient, *hydra.get_previousdChi1dChin( ) ) ); } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConfigurations ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_gradientMicroConfigurations ){ floatType time = 1.23; @@ -3000,15 +3000,15 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf 0.30696868, -0.10562995, 0.23107304, -0.33893099, 0.10069857, 0.36586446, 0.48352161 }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer1, ( *hydra.getGradientMicroConfigurations( ) )[ 0 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer1, ( *hydra.get_gradientMicroConfigurations( ) )[ 0 ] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, ( *hydra.getGradientMicroConfigurations( ) )[ 1 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, ( *hydra.get_gradientMicroConfigurations( ) )[ 1 ] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer3, ( *hydra.getGradientMicroConfigurations( ) )[ 2 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer3, ( *hydra.get_gradientMicroConfigurations( ) )[ 2 ] ) ); } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConfigurations_jacobians ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_gradientMicroConfigurations_jacobians ){ floatType time = 1.23; @@ -3137,9 +3137,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_gradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_gradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3171,9 +3171,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_gradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_gradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3183,7 +3183,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dFn, *hydra.getdGradChi1dFn( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dFn, *hydra.get_dGradChi1dFn( ) ) ); for ( unsigned int i = 0; i < microDeformation.size( ); i++ ){ @@ -3205,9 +3205,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_gradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_gradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3217,7 +3217,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChi, *hydra.getdGradChi1dChi( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChi, *hydra.get_dGradChi1dChi( ) ) ); for ( unsigned int i = 0; i < ( numConfigurations - 1 ) * microDeformation.size( ); i++ ){ @@ -3239,9 +3239,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_gradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_gradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3251,7 +3251,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChin, *hydra.getdGradChi1dChin( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChin, *hydra.get_dGradChi1dChin( ) ) ); for ( unsigned int i = 0; i < gradientMicroDeformation.size( ); i++ ){ @@ -3273,9 +3273,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_gradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_gradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3285,7 +3285,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChi, *hydra.getdGradChi1dGradChi( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChi, *hydra.get_dGradChi1dGradChi( ) ) ); for ( unsigned int i = 0; i < ( numConfigurations - 1 ) * gradientMicroDeformation.size( ); i++ ){ @@ -3308,9 +3308,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_gradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_gradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3320,11 +3320,11 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getGradientMicroConf } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChin, *hydra.getdGradChi1dGradChin( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChin, *hydra.get_dGradChi1dGradChin( ) ) ); } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientMicroConfigurations ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_previousGradientMicroConfigurations ){ floatType time = 1.23; @@ -3438,15 +3438,15 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM 0.30696868, -0.10562995, 0.23107304, -0.33893099, 0.10069857, 0.36586446, 0.48352161 }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer1, ( *hydra.getPreviousGradientMicroConfigurations( ) )[ 0 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer1, ( *hydra.get_previousGradientMicroConfigurations( ) )[ 0 ] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, ( *hydra.getPreviousGradientMicroConfigurations( ) )[ 1 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, ( *hydra.get_previousGradientMicroConfigurations( ) )[ 1 ] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer3, ( *hydra.getPreviousGradientMicroConfigurations( ) )[ 2 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer3, ( *hydra.get_previousGradientMicroConfigurations( ) )[ 2 ] ) ); } -BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientMicroConfigurations_jacobians ){ +BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_get_previousGradientMicroConfigurations_jacobians ){ floatType time = 1.23; @@ -3575,9 +3575,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_previousGradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_previousGradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3609,9 +3609,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_previousGradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_previousGradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3621,7 +3621,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dFn, *hydra.getPreviousdGradChi1dFn( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dFn, *hydra.get_previousdGradChi1dFn( ) ) ); for ( unsigned int i = 0; i < microDeformation.size( ); i++ ){ @@ -3643,9 +3643,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_previousGradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_previousGradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3655,7 +3655,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChi, *hydra.getPreviousdGradChi1dChi( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChi, *hydra.get_previousdGradChi1dChi( ) ) ); for ( unsigned int i = 0; i < ( numConfigurations - 1 ) * microDeformation.size( ); i++ ){ @@ -3677,9 +3677,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_previousGradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_previousGradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3689,7 +3689,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChin, *hydra.getPreviousdGradChi1dChin( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dChin, *hydra.get_previousdGradChi1dChin( ) ) ); for ( unsigned int i = 0; i < gradientMicroDeformation.size( ); i++ ){ @@ -3711,9 +3711,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_previousGradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_previousGradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3723,7 +3723,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChi, *hydra.getPreviousdGradChi1dGradChi( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChi, *hydra.get_previousdGradChi1dGradChi( ) ) ); for ( unsigned int i = 0; i < ( numConfigurations - 1 ) * gradientMicroDeformation.size( ); i++ ){ @@ -3746,9 +3746,9 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM dimension, configuration_unknown_count, tolr, tola, maxIterations, maxLSIterations, lsAlpha ); - floatVector valp = ( *hydrap.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valp = ( *hydrap.get_previousGradientMicroConfigurations( ) )[ 0 ]; - floatVector valm = ( *hydram.getPreviousGradientMicroConfigurations( ) )[ 0 ]; + floatVector valm = ( *hydram.get_previousGradientMicroConfigurations( ) )[ 0 ]; for ( unsigned int j = 0; j < nterms; j++ ){ @@ -3758,7 +3758,7 @@ BOOST_AUTO_TEST_CASE( test_tardigrade_hydraBaseMicromorphic_getPreviousGradientM } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChin, *hydra.getPreviousdGradChi1dGradChin( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGradChi1dGradChin, *hydra.get_previousdGradChi1dGradChin( ) ) ); } diff --git a/src/cpp/tests/test_tardigrade_hydraMicromorphicLinearElasticity.cpp b/src/cpp/tests/test_tardigrade_hydraMicromorphicLinearElasticity.cpp index a250ae7c..89bffc5e 100644 --- a/src/cpp/tests/test_tardigrade_hydraMicromorphicLinearElasticity.cpp +++ b/src/cpp/tests/test_tardigrade_hydraMicromorphicLinearElasticity.cpp @@ -971,7 +971,7 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ chi2 += eye; - tardigradeHydra::micromorphicLinearElasticity::linearElasticityReferenceDerivedMeasures( *R.getRightCauchyGreen( ), *R.getPsi( ), *R.getGamma( ), + tardigradeHydra::micromorphicLinearElasticity::linearElasticityReferenceDerivedMeasures( *R.get_rightCauchyGreen( ), *R.get_psi( ), *R.get_gamma( ), *R.getAMatrix( ), *R.getBMatrix( ), *R.getCMatrix( ), *R.getDMatrix( ), localPK2Stress, localReferenceSymmetricMicroStress, localReferenceHigherOrderStress ); @@ -981,7 +981,7 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeMicromorphicTools::pullBackHigherOrderStress( localReferenceHigherOrderStress, F2, chi2, answerReferenceHigherOrderStress ); - tardigradeHydra::micromorphicLinearElasticity::linearElasticityReferenceDerivedMeasures( *R.getPreviousRightCauchyGreen( ), *R.getPreviousPsi( ), *R.getPreviousGamma( ), + tardigradeHydra::micromorphicLinearElasticity::linearElasticityReferenceDerivedMeasures( *R.get_previousRightCauchyGreen( ), *R.get_previousPsi( ), *R.get_previousGamma( ), *R.getAMatrix( ), *R.getBMatrix( ), *R.getCMatrix( ), *R.getDMatrix( ), previousLocalPK2Stress, previousLocalReferenceSymmetricMicroStress, previousLocalReferenceHigherOrderStress ); @@ -991,31 +991,31 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeMicromorphicTools::pullBackHigherOrderStress( previousLocalReferenceHigherOrderStress, F2, chi2, previousAnswerReferenceHigherOrderStress ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPK2Stress( ), answerPK2Stress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_PK2Stress( ), answerPK2Stress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getReferenceSymmetricMicroStress( ), answerReferenceSymmetricMicroStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_referenceSymmetricMicroStress( ), answerReferenceSymmetricMicroStress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getReferenceHigherOrderStress( ), answerReferenceHigherOrderStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_referenceHigherOrderStress( ), answerReferenceHigherOrderStress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousPK2Stress( ), previousAnswerPK2Stress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousPK2Stress( ), previousAnswerPK2Stress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousReferenceSymmetricMicroStress( ), previousAnswerReferenceSymmetricMicroStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousReferenceSymmetricMicroStress( ), previousAnswerReferenceSymmetricMicroStress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousReferenceHigherOrderStress( ), previousAnswerReferenceHigherOrderStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousReferenceHigherOrderStress( ), previousAnswerReferenceHigherOrderStress ) ); - RJ.getdPK2dF( ); //Set the values of the deformation Jacobians + RJ.get_dPK2dF( ); //Set the values of the deformation Jacobians - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPK2Stress( ), answerPK2Stress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_PK2Stress( ), answerPK2Stress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getReferenceSymmetricMicroStress( ), answerReferenceSymmetricMicroStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_referenceSymmetricMicroStress( ), answerReferenceSymmetricMicroStress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getReferenceHigherOrderStress( ), answerReferenceHigherOrderStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_referenceHigherOrderStress( ), answerReferenceHigherOrderStress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousPK2Stress( ), previousAnswerPK2Stress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousPK2Stress( ), previousAnswerPK2Stress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousReferenceSymmetricMicroStress( ), previousAnswerReferenceSymmetricMicroStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousReferenceSymmetricMicroStress( ), previousAnswerReferenceSymmetricMicroStress ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousReferenceHigherOrderStress( ), previousAnswerReferenceHigherOrderStress ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousReferenceHigherOrderStress( ), previousAnswerReferenceHigherOrderStress ) ); //Test jacobians w.r.t. the deformation gradient constantType eps = 1e-6; @@ -1041,22 +1041,22 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPK2Stress( ) ) - ( *rm.getPK2Stress( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_PK2Stress( ) ) - ( *rm.get_PK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdPK2dF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dPK2dF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getReferenceSymmetricMicroStress( ) ) - ( *rm.getReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceSymmetricMicroStress( ) ) - ( *rm.get_referenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdSIGMAdF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dSIGMAdF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getReferenceHigherOrderStress( ) ) - ( *rm.getReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceHigherOrderStress( ) ) - ( *rm.get_referenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdMdF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dMdF( ) )[ j ][ i ] ) ); } } @@ -1083,22 +1083,22 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPK2Stress( ) ) - ( *rm.getPK2Stress( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_PK2Stress( ) ) - ( *rm.get_PK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdPK2dChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dPK2dChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getReferenceSymmetricMicroStress( ) ) - ( *rm.getReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceSymmetricMicroStress( ) ) - ( *rm.get_referenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdSIGMAdChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dSIGMAdChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getReferenceHigherOrderStress( ) ) - ( *rm.getReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceHigherOrderStress( ) ) - ( *rm.get_referenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdMdChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dMdChi( ) )[ j ][ i ] ) ); } } @@ -1125,22 +1125,22 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPK2Stress( ) ) - ( *rm.getPK2Stress( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_PK2Stress( ) ) - ( *rm.get_PK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdPK2dGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dPK2dGradChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getReferenceSymmetricMicroStress( ) ) - ( *rm.getReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceSymmetricMicroStress( ) ) - ( *rm.get_referenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdSIGMAdGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dSIGMAdGradChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getReferenceHigherOrderStress( ) ) - ( *rm.getReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceHigherOrderStress( ) ) - ( *rm.get_referenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdMdGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dMdGradChi( ) )[ j ][ i ] ) ); } } @@ -1167,22 +1167,22 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPreviousPK2Stress( ) ) - ( *rm.getPreviousPK2Stress( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_previousPK2Stress( ) ) - ( *rm.get_previousPK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdPK2dF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdPK2dF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousReferenceSymmetricMicroStress( ) ) - ( *rm.getPreviousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceSymmetricMicroStress( ) ) - ( *rm.get_previousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdSIGMAdF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdSIGMAdF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousReferenceHigherOrderStress( ) ) - ( *rm.getPreviousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceHigherOrderStress( ) ) - ( *rm.get_previousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdMdF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdMdF( ) )[ j ][ i ] ) ); } } @@ -1209,22 +1209,22 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPreviousPK2Stress( ) ) - ( *rm.getPreviousPK2Stress( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_previousPK2Stress( ) ) - ( *rm.get_previousPK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdPK2dChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdPK2dChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousReferenceSymmetricMicroStress( ) ) - ( *rm.getPreviousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceSymmetricMicroStress( ) ) - ( *rm.get_previousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdSIGMAdChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdSIGMAdChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousReferenceHigherOrderStress( ) ) - ( *rm.getPreviousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceHigherOrderStress( ) ) - ( *rm.get_previousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdMdChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdMdChi( ) )[ j ][ i ] ) ); } } @@ -1251,22 +1251,22 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPreviousPK2Stress( ) ) - ( *rm.getPreviousPK2Stress( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_previousPK2Stress( ) ) - ( *rm.get_previousPK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdPK2dGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdPK2dGradChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousReferenceSymmetricMicroStress( ) ) - ( *rm.getPreviousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceSymmetricMicroStress( ) ) - ( *rm.get_previousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdSIGMAdGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdSIGMAdGradChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousReferenceHigherOrderStress( ) ) - ( *rm.getPreviousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceHigherOrderStress( ) ) - ( *rm.get_previousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdMdGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdMdGradChi( ) )[ j ][ i ] ) ); } } @@ -1301,37 +1301,37 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPK2Stress( ) ) - ( *rm.getPK2Stress( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_PK2Stress( ) ) - ( *rm.get_PK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ dPK2dStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getReferenceSymmetricMicroStress( ) ) - ( *rm.getReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceSymmetricMicroStress( ) ) - ( *rm.get_referenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ dSIGMAdStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getReferenceHigherOrderStress( ) ) - ( *rm.getReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_referenceHigherOrderStress( ) ) - ( *rm.get_referenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ dMdStateVariables[ j ][ i ] = gradCol [ j ]; } - gradCol = ( ( *rp.getPreviousPK2Stress( ) ) - ( *rm.getPreviousPK2Stress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousPK2Stress( ) ) - ( *rm.get_previousPK2Stress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ previousdPK2dStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getPreviousReferenceSymmetricMicroStress( ) ) - ( *rm.getPreviousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceSymmetricMicroStress( ) ) - ( *rm.get_previousReferenceSymmetricMicroStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ previousdSIGMAdStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getPreviousReferenceHigherOrderStress( ) ) - ( *rm.getPreviousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousReferenceHigherOrderStress( ) ) - ( *rm.get_previousReferenceHigherOrderStress( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ previousdMdStateVariables[ j ][ i ] = gradCol [ j ]; @@ -1343,19 +1343,19 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2dStateVariables[ i ][ j ], ( *RJ.getdPK2dFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2dStateVariables[ i ][ j ], ( *RJ.get_dPK2dFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dSIGMAdStateVariables[ i ][ j ], ( *RJ.getdSIGMAdFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dSIGMAdStateVariables[ i ][ j ], ( *RJ.get_dSIGMAdFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dMdStateVariables[ i ][ j ], ( *RJ.getdMdFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dMdStateVariables[ i ][ j ], ( *RJ.get_dMdFn( ) )[ i ][ j ] ) ); } @@ -1365,19 +1365,19 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2dStateVariables[ i ][ j ], ( *RJ.getdPK2dChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2dStateVariables[ i ][ j ], ( *RJ.get_dPK2dChin( ) )[ i ][ j - 9 ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dSIGMAdStateVariables[ i ][ j ], ( *RJ.getdSIGMAdChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dSIGMAdStateVariables[ i ][ j ], ( *RJ.get_dSIGMAdChin( ) )[ i ][ j - 9 ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dMdStateVariables[ i ][ j ], ( *RJ.getdMdChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dMdStateVariables[ i ][ j ], ( *RJ.get_dMdChin( ) )[ i ][ j - 9 ] ) ); } @@ -1387,19 +1387,19 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2dStateVariables[ i ][ j ], ( *RJ.getdPK2dGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPK2dStateVariables[ i ][ j ], ( *RJ.get_dPK2dGradChin( ) )[ i ][ j - 18 ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dSIGMAdStateVariables[ i ][ j ], ( *RJ.getdSIGMAdGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dSIGMAdStateVariables[ i ][ j ], ( *RJ.get_dSIGMAdGradChin( ) )[ i ][ j - 18 ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dMdStateVariables[ i ][ j ], ( *RJ.getdMdGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dMdStateVariables[ i ][ j ], ( *RJ.get_dMdGradChin( ) )[ i ][ j - 18 ] ) ); } @@ -1410,19 +1410,19 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPK2dStateVariables[ i ][ j ], ( *RJ.getPreviousdPK2dFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPK2dStateVariables[ i ][ j ], ( *RJ.get_previousdPK2dFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdSIGMAdStateVariables[ i ][ j ], ( *RJ.getPreviousdSIGMAdFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdSIGMAdStateVariables[ i ][ j ], ( *RJ.get_previousdSIGMAdFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdMdStateVariables[ i ][ j ], ( *RJ.getPreviousdMdFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdMdStateVariables[ i ][ j ], ( *RJ.get_previousdMdFn( ) )[ i ][ j ] ) ); } @@ -1432,19 +1432,19 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPK2dStateVariables[ i ][ j ], ( *RJ.getPreviousdPK2dChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPK2dStateVariables[ i ][ j ], ( *RJ.get_previousdPK2dChin( ) )[ i ][ j - 9 ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdSIGMAdStateVariables[ i ][ j ], ( *RJ.getPreviousdSIGMAdChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdSIGMAdStateVariables[ i ][ j ], ( *RJ.get_previousdSIGMAdChin( ) )[ i ][ j - 9 ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdMdStateVariables[ i ][ j ], ( *RJ.getPreviousdMdChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdMdStateVariables[ i ][ j ], ( *RJ.get_previousdMdChin( ) )[ i ][ j - 9 ] ) ); } @@ -1454,19 +1454,19 @@ BOOST_AUTO_TEST_CASE( testLinearElasticityReferenceDerivedMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPK2dStateVariables[ i ][ j ], ( *RJ.getPreviousdPK2dGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPK2dStateVariables[ i ][ j ], ( *RJ.get_previousdPK2dGradChin( ) )[ i ][ j - 18 ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdSIGMAdStateVariables[ i ][ j ], ( *RJ.getPreviousdSIGMAdGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdSIGMAdStateVariables[ i ][ j ], ( *RJ.get_previousdSIGMAdGradChin( ) )[ i ][ j - 18 ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdMdStateVariables[ i ][ j ], ( *RJ.getPreviousdMdGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdMdStateVariables[ i ][ j ], ( *RJ.get_previousdMdGradChin( ) )[ i ][ j - 18 ] ) ); } @@ -2306,17 +2306,17 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( resultGamma, answerGamma ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getRightCauchyGreen( ), answerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_rightCauchyGreen( ), answerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPsi( ), answerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_psi( ), answerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getGamma( ), answerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_gamma( ), answerGamma ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousRightCauchyGreen( ), previousAnswerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousRightCauchyGreen( ), previousAnswerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousPsi( ), previousAnswerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousPsi( ), previousAnswerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousGamma( ), previousAnswerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousGamma( ), previousAnswerGamma ) ); //Test the jacobians @@ -2327,7 +2327,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ resultCJ, resultPsiJ, resultGammaJ, dCdF, dPsidF, dPsidXi, dGammadF, dGammadGradXi ); - RJ.getdRightCauchyGreendF( ); //Set the values of the deformation Jacobians + RJ.get_dRightCauchyGreendF( ); //Set the values of the deformation Jacobians BOOST_CHECK( !error ); @@ -2337,17 +2337,17 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( resultGammaJ, answerGamma ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getRightCauchyGreen( ), answerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_rightCauchyGreen( ), answerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPsi( ), answerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_psi( ), answerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getGamma( ), answerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_gamma( ), answerGamma ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousRightCauchyGreen( ), previousAnswerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousRightCauchyGreen( ), previousAnswerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousPsi( ), previousAnswerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousPsi( ), previousAnswerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousGamma( ), previousAnswerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousGamma( ), previousAnswerGamma ) ); //Test jacobians w.r.t. the deformation gradient @@ -2376,7 +2376,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], dCdF[j][i] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdRightCauchyGreendF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dRightCauchyGreendF( ) )[ j ][ i ] ) ); } gradCol = ( resultPsi_P - resultPsi_M ) / ( 2 * delta[i] ); @@ -2384,7 +2384,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], dPsidF[j][i] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdPsidF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dPsidF( ) )[ j ][ i ] ) ); } gradCol = ( resultGamma_P - resultGamma_M ) / ( 2 * delta[i] ); @@ -2392,7 +2392,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], dGammadF[j][i] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdGammadF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dGammadF( ) )[ j ][ i ] ) ); } } @@ -2428,14 +2428,14 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], dPsidXi[j][i] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdPsidChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dPsidChi( ) )[ j ][ i ] ) ); } gradCol = ( resultGamma_P - resultGamma_M ) / ( 2 * delta[ i ] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[ j ], 0. ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[ j ], ( *RJ.getdGammadChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[ j ], ( *RJ.get_dGammadChi( ) )[ j ][ i ] ) ); } } @@ -2477,7 +2477,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], dGammadGradXi[j][i] ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdGammadGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dGammadGradChi( ) )[ j ][ i ] ) ); } } @@ -2504,19 +2504,19 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ variableVector gradCol = ( resultC_P - resultC_M ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdRightCauchyGreendF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdRightCauchyGreendF( ) )[ j ][ i ] ) ); } gradCol = ( resultPsi_P - resultPsi_M ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdPsidF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdPsidF( ) )[ j ][ i ] ) ); } gradCol = ( resultGamma_P - resultGamma_M ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdGammadF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdGammadF( ) )[ j ][ i ] ) ); } } @@ -2550,14 +2550,14 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ gradCol = ( resultPsi_P - resultPsi_M ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdPsidChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdPsidChi( ) )[ j ][ i ] ) ); } gradCol = ( resultGamma_P - resultGamma_M ) / ( 2 * delta[ i ] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[ j ], 0. ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[ j ], ( *RJ.getPreviousdGammadChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[ j ], ( *RJ.get_previousdGammadChi( ) )[ j ][ i ] ) ); } } @@ -2597,7 +2597,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures ){ gradCol = ( resultGamma_P - resultGamma_M ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdGammadGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdGammadGradChi( ) )[ j ][ i ] ) ); } } } @@ -2720,35 +2720,35 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual RJ( &hydra, 45, parameters ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getRightCauchyGreen( ), answerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_rightCauchyGreen( ), answerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPsi( ), answerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_psi( ), answerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getGamma( ), answerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_gamma( ), answerGamma ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousRightCauchyGreen( ), previousAnswerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousRightCauchyGreen( ), previousAnswerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousPsi( ), previousAnswerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousPsi( ), previousAnswerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getPreviousGamma( ), previousAnswerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_previousGamma( ), previousAnswerGamma ) ); //Test the jacobians variableVector resultCJ, resultPsiJ, resultGammaJ; - RJ.getdRightCauchyGreendF( ); //Set the values of the deformation Jacobians + RJ.get_dRightCauchyGreendF( ); //Set the values of the deformation Jacobians - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getRightCauchyGreen( ), answerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_rightCauchyGreen( ), answerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPsi( ), answerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_psi( ), answerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getGamma( ), answerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_gamma( ), answerGamma ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousRightCauchyGreen( ), previousAnswerC ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousRightCauchyGreen( ), previousAnswerC ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousPsi( ), previousAnswerPsi ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousPsi( ), previousAnswerPsi ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.getPreviousGamma( ), previousAnswerGamma ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *RJ.get_previousGamma( ), previousAnswerGamma ) ); //Test jacobians w.r.t. the deformation gradient constantType eps = 1e-6; @@ -2774,22 +2774,22 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getRightCauchyGreen( ) ) - ( *rm.getRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_rightCauchyGreen( ) ) - ( *rm.get_rightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdRightCauchyGreendF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dRightCauchyGreendF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPsi( ) ) - ( *rm.getPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_psi( ) ) - ( *rm.get_psi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdPsidF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dPsidF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getGamma( ) ) - ( *rm.getGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_gamma( ) ) - ( *rm.get_gamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdGammadF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dGammadF( ) )[ j ][ i ] ) ); } } @@ -2816,22 +2816,22 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getRightCauchyGreen( ) ) - ( *rm.getRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_rightCauchyGreen( ) ) - ( *rm.get_rightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], 0. ) ); } - gradCol = ( ( *rp.getPsi( ) ) - ( *rm.getPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_psi( ) ) - ( *rm.get_psi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdPsidChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dPsidChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getGamma( ) ) - ( *rm.getGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_gamma( ) ) - ( *rm.get_gamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdGammadChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dGammadChi( ) )[ j ][ i ] ) ); } } @@ -2858,22 +2858,22 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getRightCauchyGreen( ) ) - ( *rm.getRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_rightCauchyGreen( ) ) - ( *rm.get_rightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], 0. ) ); } - gradCol = ( ( *rp.getPsi( ) ) - ( *rm.getPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_psi( ) ) - ( *rm.get_psi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], 0. ) ); } - gradCol = ( ( *rp.getGamma( ) ) - ( *rm.getGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_gamma( ) ) - ( *rm.get_gamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getdGammadGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_dGammadGradChi( ) )[ j ][ i ] ) ); } } @@ -2900,22 +2900,22 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPreviousRightCauchyGreen( ) ) - ( *rm.getPreviousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_previousRightCauchyGreen( ) ) - ( *rm.get_previousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdRightCauchyGreendF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdRightCauchyGreendF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousPsi( ) ) - ( *rm.getPreviousPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousPsi( ) ) - ( *rm.get_previousPsi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdPsidF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdPsidF( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousGamma( ) ) - ( *rm.getPreviousGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousGamma( ) ) - ( *rm.get_previousGamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdGammadF( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdGammadF( ) )[ j ][ i ] ) ); } } @@ -2942,22 +2942,22 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPreviousRightCauchyGreen( ) ) - ( *rm.getPreviousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_previousRightCauchyGreen( ) ) - ( *rm.get_previousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], 0. ) ); } - gradCol = ( ( *rp.getPreviousPsi( ) ) - ( *rm.getPreviousPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousPsi( ) ) - ( *rm.get_previousPsi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdPsidChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdPsidChi( ) )[ j ][ i ] ) ); } - gradCol = ( ( *rp.getPreviousGamma( ) ) - ( *rm.getPreviousGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousGamma( ) ) - ( *rm.get_previousGamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdGammadChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdGammadChi( ) )[ j ][ i ] ) ); } } @@ -2984,22 +2984,22 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getPreviousRightCauchyGreen( ) ) - ( *rm.getPreviousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_previousRightCauchyGreen( ) ) - ( *rm.get_previousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], 0. ) ); } - gradCol = ( ( *rp.getPreviousPsi( ) ) - ( *rm.getPreviousPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousPsi( ) ) - ( *rm.get_previousPsi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], 0. ) ); } - gradCol = ( ( *rp.getPreviousGamma( ) ) - ( *rm.getPreviousGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousGamma( ) ) - ( *rm.get_previousGamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.getPreviousdGammadGradChi( ) )[ j ][ i ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( gradCol[j], ( *RJ.get_previousdGammadGradChi( ) )[ j ][ i ] ) ); } } @@ -3034,37 +3034,37 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ tardigradeHydra::micromorphicLinearElasticity::residual rm( &hydram, 45, parameters ); - variableVector gradCol = ( ( *rp.getRightCauchyGreen( ) ) - ( *rm.getRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + variableVector gradCol = ( ( *rp.get_rightCauchyGreen( ) ) - ( *rm.get_rightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ dCdStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getPsi( ) ) - ( *rm.getPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_psi( ) ) - ( *rm.get_psi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ dPsidStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getGamma( ) ) - ( *rm.getGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_gamma( ) ) - ( *rm.get_gamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ dGammadStateVariables[ j ][ i ] = gradCol [ j ]; } - gradCol = ( ( *rp.getPreviousRightCauchyGreen( ) ) - ( *rm.getPreviousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousRightCauchyGreen( ) ) - ( *rm.get_previousRightCauchyGreen( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ previousdCdStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getPreviousPsi( ) ) - ( *rm.getPreviousPsi( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousPsi( ) ) - ( *rm.get_previousPsi( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ previousdPsidStateVariables[ j ][ i ] = gradCol[ j ]; } - gradCol = ( ( *rp.getPreviousGamma( ) ) - ( *rm.getPreviousGamma( ) ) ) / ( 2 * delta[i] ); + gradCol = ( ( *rp.get_previousGamma( ) ) - ( *rm.get_previousGamma( ) ) ) / ( 2 * delta[i] ); for ( unsigned int j = 0; j < gradCol.size(); j++ ){ previousdGammadStateVariables[ j ][ i ] = gradCol [ j ]; @@ -3076,19 +3076,19 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dCdStateVariables[ i ][ j ], ( *RJ.getdRightCauchyGreendFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dCdStateVariables[ i ][ j ], ( *RJ.get_dRightCauchyGreendFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPsidStateVariables[ i ][ j ], ( *RJ.getdPsidFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPsidStateVariables[ i ][ j ], ( *RJ.get_dPsidFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGammadStateVariables[ i ][ j ], ( *RJ.getdGammadFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGammadStateVariables[ i ][ j ], ( *RJ.get_dGammadFn( ) )[ i ][ j ] ) ); } @@ -3104,13 +3104,13 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPsidStateVariables[ i ][ j ], ( *RJ.getdPsidChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPsidStateVariables[ i ][ j ], ( *RJ.get_dPsidChin( ) )[ i ][ j - 9 ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGammadStateVariables[ i ][ j ], ( *RJ.getdGammadChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGammadStateVariables[ i ][ j ], ( *RJ.get_dGammadChin( ) )[ i ][ j - 9 ] ) ); } @@ -3132,7 +3132,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGammadStateVariables[ i ][ j ], ( *RJ.getdGammadGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dGammadStateVariables[ i ][ j ], ( *RJ.get_dGammadGradChin( ) )[ i ][ j - 18 ] ) ); } @@ -3142,19 +3142,19 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdCdStateVariables[ i ][ j ], ( *RJ.getPreviousdRightCauchyGreendFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdCdStateVariables[ i ][ j ], ( *RJ.get_previousdRightCauchyGreendFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPsidStateVariables[ i ][ j ], ( *RJ.getPreviousdPsidFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPsidStateVariables[ i ][ j ], ( *RJ.get_previousdPsidFn( ) )[ i ][ j ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdGammadStateVariables[ i ][ j ], ( *RJ.getPreviousdGammadFn( ) )[ i ][ j ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdGammadStateVariables[ i ][ j ], ( *RJ.get_previousdGammadFn( ) )[ i ][ j ] ) ); } @@ -3170,13 +3170,13 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ for ( unsigned int i = 0; i < 9; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPsidStateVariables[ i ][ j ], ( *RJ.getPreviousdPsidChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdPsidStateVariables[ i ][ j ], ( *RJ.get_previousdPsidChin( ) )[ i ][ j - 9 ] ) ); } for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdGammadStateVariables[ i ][ j ], ( *RJ.getPreviousdGammadChin( ) )[ i ][ j - 9 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdGammadStateVariables[ i ][ j ], ( *RJ.get_previousdGammadChin( ) )[ i ][ j - 9 ] ) ); } @@ -3198,7 +3198,7 @@ BOOST_AUTO_TEST_CASE( testComputeDeformationMeasures2 ){ for ( unsigned int i = 0; i < 27; i++ ){ - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdGammadStateVariables[ i ][ j ], ( *RJ.getPreviousdGammadGradChin( ) )[ i ][ j - 18 ] ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( previousdGammadStateVariables[ i ][ j ], ( *RJ.get_previousdGammadGradChin( ) )[ i ][ j - 18 ] ) ); } diff --git a/src/cpp/tests/test_tardigrade_hydraPeryznaViscoplasticity.cpp b/src/cpp/tests/test_tardigrade_hydraPeryznaViscoplasticity.cpp index 587bd2e2..a83b30bd 100644 --- a/src/cpp/tests/test_tardigrade_hydraPeryznaViscoplasticity.cpp +++ b/src/cpp/tests/test_tardigrade_hydraPeryznaViscoplasticity.cpp @@ -50,205 +50,205 @@ namespace tardigradeHydra{ try{ - BOOST_CHECK( &R._drivingStress.second == R.getDrivingStress( ) ); + BOOST_CHECK( &R._drivingStress.second == R.get_drivingStress( ) ); - BOOST_CHECK( &R._previousDrivingStress.second == R.getPreviousDrivingStress( ) ); + BOOST_CHECK( &R._previousDrivingStress.second == R.get_previousDrivingStress( ) ); - BOOST_CHECK( &R._flowDirection.second == R.getFlowDirection( ) ); + BOOST_CHECK( &R._flowDirection.second == R.get_flowDirection( ) ); - BOOST_CHECK( &R._previousFlowDirection.second == R.getPreviousFlowDirection( ) ); + BOOST_CHECK( &R._previousFlowDirection.second == R.get_previousFlowDirection( ) ); - BOOST_CHECK( &R._yieldFunction.second == R.getYieldFunction( ) ); + BOOST_CHECK( &R._yieldFunction.second == R.get_yieldFunction( ) ); - BOOST_CHECK( &R._previousYieldFunction.second == R.getPreviousYieldFunction( ) ); + BOOST_CHECK( &R._previousYieldFunction.second == R.get_previousYieldFunction( ) ); - BOOST_CHECK( &R._plasticThermalMultiplier.second == R.getPlasticThermalMultiplier( ) ); + BOOST_CHECK( &R._plasticThermalMultiplier.second == R.get_plasticThermalMultiplier( ) ); - BOOST_CHECK( &R._previousPlasticThermalMultiplier.second == R.getPreviousPlasticThermalMultiplier( ) ); + BOOST_CHECK( &R._previousPlasticThermalMultiplier.second == R.get_previousPlasticThermalMultiplier( ) ); - BOOST_CHECK( &R._dragStress.second == R.getDragStress( ) ); + BOOST_CHECK( &R._dragStress.second == R.get_dragStress( ) ); - BOOST_CHECK( &R._previousDragStress.second == R.getPreviousDragStress( ) ); + BOOST_CHECK( &R._previousDragStress.second == R.get_previousDragStress( ) ); - BOOST_CHECK( &R._hardeningFunction.second == R.getHardeningFunction( ) ); + BOOST_CHECK( &R._hardeningFunction.second == R.get_hardeningFunction( ) ); - BOOST_CHECK( &R._previousHardeningFunction.second == R.getPreviousHardeningFunction( ) ); + BOOST_CHECK( &R._previousHardeningFunction.second == R.get_previousHardeningFunction( ) ); - BOOST_CHECK( &R._plasticMultiplier.second == R.getPlasticMultiplier( ) ); + BOOST_CHECK( &R._plasticMultiplier.second == R.get_plasticMultiplier( ) ); - BOOST_CHECK( &R._previousPlasticMultiplier.second == R.getPreviousPlasticMultiplier( ) ); + BOOST_CHECK( &R._previousPlasticMultiplier.second == R.get_previousPlasticMultiplier( ) ); - BOOST_CHECK( &R._velocityGradient.second == R.getVelocityGradient( ) ); + BOOST_CHECK( &R._velocityGradient.second == R.get_velocityGradient( ) ); - BOOST_CHECK( &R._previousVelocityGradient.second == R.getPreviousVelocityGradient( ) ); + BOOST_CHECK( &R._previousVelocityGradient.second == R.get_previousVelocityGradient( ) ); - BOOST_CHECK( &R._stateVariableEvolutionRates.second == R.getStateVariableEvolutionRates( ) ); + BOOST_CHECK( &R._stateVariableEvolutionRates.second == R.get_stateVariableEvolutionRates( ) ); - BOOST_CHECK( &R._previousStateVariableEvolutionRates.second == R.getPreviousStateVariableEvolutionRates( ) ); + BOOST_CHECK( &R._previousStateVariableEvolutionRates.second == R.get_previousStateVariableEvolutionRates( ) ); - BOOST_CHECK( &R._plasticDeformationGradient.second == R.getPlasticDeformationGradient( ) ); + BOOST_CHECK( &R._plasticDeformationGradient.second == R.get_plasticDeformationGradient( ) ); - BOOST_CHECK( &R._plasticStateVariables.second == R.getPlasticStateVariables( ) ); + BOOST_CHECK( &R._plasticStateVariables.second == R.get_plasticStateVariables( ) ); - BOOST_CHECK( &R._stateVariables.second == R.getStateVariables( ) ); + BOOST_CHECK( &R._stateVariables.second == R.get_stateVariables( ) ); - BOOST_CHECK( &R._peryznaParameters.second == R.getPeryznaParameters( ) ); + BOOST_CHECK( &R._peryznaParameters.second == R.get_peryznaParameters( ) ); - BOOST_CHECK( &R._dragStressParameters.second == R.getDragStressParameters( ) ); + BOOST_CHECK( &R._dragStressParameters.second == R.get_dragStressParameters( ) ); - BOOST_CHECK( &R._thermalParameters.second == R.getThermalParameters( ) ); + BOOST_CHECK( &R._thermalParameters.second == R.get_thermalParameters( ) ); - BOOST_CHECK( &R._yieldParameters.second == R.getYieldParameters( ) ); + BOOST_CHECK( &R._yieldParameters.second == R.get_yieldParameters( ) ); - BOOST_CHECK( &R._flowParameters.second == R.getFlowParameters( ) ); + BOOST_CHECK( &R._flowParameters.second == R.get_flowParameters( ) ); - BOOST_CHECK( &R._hardeningParameters.second == R.getHardeningParameters( ) ); + BOOST_CHECK( &R._hardeningParameters.second == R.get_hardeningParameters( ) ); BOOST_CHECK( &R._integrationParameter == R.getIntegrationParameter( ) ); - BOOST_CHECK( &R._dDrivingStressdCauchyStress.second == R.getdDrivingStressdCauchyStress( ) ); + BOOST_CHECK( &R._dDrivingStressdCauchyStress.second == R.get_dDrivingStressdCauchyStress( ) ); - BOOST_CHECK( &R._dDrivingStressdF.second == R.getdDrivingStressdF( ) ); + BOOST_CHECK( &R._dDrivingStressdF.second == R.get_dDrivingStressdF( ) ); - BOOST_CHECK( &R._dDrivingStressdSubFs.second == R.getdDrivingStressdSubFs( ) ); + BOOST_CHECK( &R._dDrivingStressdSubFs.second == R.get_dDrivingStressdSubFs( ) ); - BOOST_CHECK( &R._dPreviousDrivingStressdPreviousCauchyStress.second == R.getdPreviousDrivingStressdPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPreviousDrivingStressdPreviousCauchyStress.second == R.get_dPreviousDrivingStressdPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPreviousDrivingStressdPreviousF.second == R.getdPreviousDrivingStressdPreviousF( ) ); + BOOST_CHECK( &R._dPreviousDrivingStressdPreviousF.second == R.get_dPreviousDrivingStressdPreviousF( ) ); - BOOST_CHECK( &R._dPreviousDrivingStressdPreviousSubFs.second == R.getdPreviousDrivingStressdPreviousSubFs( ) ); + BOOST_CHECK( &R._dPreviousDrivingStressdPreviousSubFs.second == R.get_dPreviousDrivingStressdPreviousSubFs( ) ); - BOOST_CHECK( &R._dFlowDirectiondCauchyStress.second == R.getdFlowDirectiondCauchyStress( ) ); + BOOST_CHECK( &R._dFlowDirectiondCauchyStress.second == R.get_dFlowDirectiondCauchyStress( ) ); - BOOST_CHECK( &R._dFlowDirectiondF.second == R.getdFlowDirectiondF( ) ); + BOOST_CHECK( &R._dFlowDirectiondF.second == R.get_dFlowDirectiondF( ) ); - BOOST_CHECK( &R._dFlowDirectiondSubFs.second == R.getdFlowDirectiondSubFs( ) ); + BOOST_CHECK( &R._dFlowDirectiondSubFs.second == R.get_dFlowDirectiondSubFs( ) ); - BOOST_CHECK( &R._dPreviousFlowDirectiondPreviousCauchyStress.second == R.getdPreviousFlowDirectiondPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPreviousFlowDirectiondPreviousCauchyStress.second == R.get_dPreviousFlowDirectiondPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPreviousFlowDirectiondPreviousF.second == R.getdPreviousFlowDirectiondPreviousF( ) ); + BOOST_CHECK( &R._dPreviousFlowDirectiondPreviousF.second == R.get_dPreviousFlowDirectiondPreviousF( ) ); - BOOST_CHECK( &R._dPreviousFlowDirectiondPreviousSubFs.second == R.getdPreviousFlowDirectiondPreviousSubFs( ) ); + BOOST_CHECK( &R._dPreviousFlowDirectiondPreviousSubFs.second == R.get_dPreviousFlowDirectiondPreviousSubFs( ) ); - BOOST_CHECK( &R._dYieldFunctiondCauchyStress.second == R.getdYieldFunctiondCauchyStress( ) ); + BOOST_CHECK( &R._dYieldFunctiondCauchyStress.second == R.get_dYieldFunctiondCauchyStress( ) ); - BOOST_CHECK( &R._dYieldFunctiondF.second == R.getdYieldFunctiondF( ) ); + BOOST_CHECK( &R._dYieldFunctiondF.second == R.get_dYieldFunctiondF( ) ); - BOOST_CHECK( &R._dYieldFunctiondSubFs.second == R.getdYieldFunctiondSubFs( ) ); + BOOST_CHECK( &R._dYieldFunctiondSubFs.second == R.get_dYieldFunctiondSubFs( ) ); - BOOST_CHECK( &R._dPreviousYieldFunctiondPreviousCauchyStress.second == R.getdPreviousYieldFunctiondPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPreviousYieldFunctiondPreviousCauchyStress.second == R.get_dPreviousYieldFunctiondPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPreviousYieldFunctiondPreviousF.second == R.getdPreviousYieldFunctiondPreviousF( ) ); + BOOST_CHECK( &R._dPreviousYieldFunctiondPreviousF.second == R.get_dPreviousYieldFunctiondPreviousF( ) ); - BOOST_CHECK( &R._dPreviousYieldFunctiondPreviousSubFs.second == R.getdPreviousYieldFunctiondPreviousSubFs( ) ); + BOOST_CHECK( &R._dPreviousYieldFunctiondPreviousSubFs.second == R.get_dPreviousYieldFunctiondPreviousSubFs( ) ); - BOOST_CHECK( &R._dPlasticThermalMultiplierdT.second == R.getdPlasticThermalMultiplierdT( ) ); + BOOST_CHECK( &R._dPlasticThermalMultiplierdT.second == R.get_dPlasticThermalMultiplierdT( ) ); - BOOST_CHECK( &R._dPreviousPlasticThermalMultiplierdPreviousT.second == R.getdPreviousPlasticThermalMultiplierdPreviousT( ) ); + BOOST_CHECK( &R._dPreviousPlasticThermalMultiplierdPreviousT.second == R.get_dPreviousPlasticThermalMultiplierdPreviousT( ) ); - BOOST_CHECK( &R._dDragStressdStateVariables.second == R.getdDragStressdStateVariables( ) ); + BOOST_CHECK( &R._dDragStressdStateVariables.second == R.get_dDragStressdStateVariables( ) ); - BOOST_CHECK( &R._dPreviousDragStressdPreviousStateVariables.second == R.getdPreviousDragStressdPreviousStateVariables( ) ); + BOOST_CHECK( &R._dPreviousDragStressdPreviousStateVariables.second == R.get_dPreviousDragStressdPreviousStateVariables( ) ); - BOOST_CHECK( &R._dPlasticMultiplierdCauchyStress.second == R.getdPlasticMultiplierdCauchyStress( ) ); + BOOST_CHECK( &R._dPlasticMultiplierdCauchyStress.second == R.get_dPlasticMultiplierdCauchyStress( ) ); - BOOST_CHECK( &R._dPlasticMultiplierdF.second == R.getdPlasticMultiplierdF( ) ); + BOOST_CHECK( &R._dPlasticMultiplierdF.second == R.get_dPlasticMultiplierdF( ) ); - BOOST_CHECK( &R._dPlasticMultiplierdSubFs.second == R.getdPlasticMultiplierdSubFs( ) ); + BOOST_CHECK( &R._dPlasticMultiplierdSubFs.second == R.get_dPlasticMultiplierdSubFs( ) ); - BOOST_CHECK( &R._dPlasticMultiplierdT.second == R.getdPlasticMultiplierdT( ) ); + BOOST_CHECK( &R._dPlasticMultiplierdT.second == R.get_dPlasticMultiplierdT( ) ); - BOOST_CHECK( &R._dPlasticMultiplierdStateVariables.second == R.getdPlasticMultiplierdStateVariables( ) ); + BOOST_CHECK( &R._dPlasticMultiplierdStateVariables.second == R.get_dPlasticMultiplierdStateVariables( ) ); - BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousCauchyStress.second == R.getdPreviousPlasticMultiplierdPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousCauchyStress.second == R.get_dPreviousPlasticMultiplierdPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousF.second == R.getdPreviousPlasticMultiplierdPreviousF( ) ); + BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousF.second == R.get_dPreviousPlasticMultiplierdPreviousF( ) ); - BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousSubFs.second == R.getdPreviousPlasticMultiplierdPreviousSubFs( ) ); + BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousSubFs.second == R.get_dPreviousPlasticMultiplierdPreviousSubFs( ) ); - BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousT.second == R.getdPreviousPlasticMultiplierdPreviousT( ) ); + BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousT.second == R.get_dPreviousPlasticMultiplierdPreviousT( ) ); - BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousStateVariables.second == R.getdPreviousPlasticMultiplierdPreviousStateVariables( ) ); + BOOST_CHECK( &R._dPreviousPlasticMultiplierdPreviousStateVariables.second == R.get_dPreviousPlasticMultiplierdPreviousStateVariables( ) ); - BOOST_CHECK( &R._dVelocityGradientdCauchyStress.second == R.getdVelocityGradientdCauchyStress( ) ); + BOOST_CHECK( &R._dVelocityGradientdCauchyStress.second == R.get_dVelocityGradientdCauchyStress( ) ); - BOOST_CHECK( &R._dVelocityGradientdF.second == R.getdVelocityGradientdF( ) ); + BOOST_CHECK( &R._dVelocityGradientdF.second == R.get_dVelocityGradientdF( ) ); - BOOST_CHECK( &R._dVelocityGradientdSubFs.second == R.getdVelocityGradientdSubFs( ) ); + BOOST_CHECK( &R._dVelocityGradientdSubFs.second == R.get_dVelocityGradientdSubFs( ) ); - BOOST_CHECK( &R._dVelocityGradientdT.second == R.getdVelocityGradientdT( ) ); + BOOST_CHECK( &R._dVelocityGradientdT.second == R.get_dVelocityGradientdT( ) ); - BOOST_CHECK( &R._dVelocityGradientdStateVariables.second == R.getdVelocityGradientdStateVariables( ) ); + BOOST_CHECK( &R._dVelocityGradientdStateVariables.second == R.get_dVelocityGradientdStateVariables( ) ); - BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousCauchyStress.second == R.getdPreviousVelocityGradientdPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousCauchyStress.second == R.get_dPreviousVelocityGradientdPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousF.second == R.getdPreviousVelocityGradientdPreviousF( ) ); + BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousF.second == R.get_dPreviousVelocityGradientdPreviousF( ) ); - BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousSubFs.second == R.getdPreviousVelocityGradientdPreviousSubFs( ) ); + BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousSubFs.second == R.get_dPreviousVelocityGradientdPreviousSubFs( ) ); - BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousT.second == R.getdPreviousVelocityGradientdPreviousT( ) ); + BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousT.second == R.get_dPreviousVelocityGradientdPreviousT( ) ); - BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousStateVariables.second == R.getdPreviousVelocityGradientdPreviousStateVariables( ) ); + BOOST_CHECK( &R._dPreviousVelocityGradientdPreviousStateVariables.second == R.get_dPreviousVelocityGradientdPreviousStateVariables( ) ); - BOOST_CHECK( &R._dStateVariableEvolutionRatesdCauchyStress.second == R.getdStateVariableEvolutionRatesdCauchyStress( ) ); + BOOST_CHECK( &R._dStateVariableEvolutionRatesdCauchyStress.second == R.get_dStateVariableEvolutionRatesdCauchyStress( ) ); - BOOST_CHECK( &R._dStateVariableEvolutionRatesdF.second == R.getdStateVariableEvolutionRatesdF( ) ); + BOOST_CHECK( &R._dStateVariableEvolutionRatesdF.second == R.get_dStateVariableEvolutionRatesdF( ) ); - BOOST_CHECK( &R._dStateVariableEvolutionRatesdSubFs.second == R.getdStateVariableEvolutionRatesdSubFs( ) ); + BOOST_CHECK( &R._dStateVariableEvolutionRatesdSubFs.second == R.get_dStateVariableEvolutionRatesdSubFs( ) ); - BOOST_CHECK( &R._dStateVariableEvolutionRatesdT.second == R.getdStateVariableEvolutionRatesdT( ) ); + BOOST_CHECK( &R._dStateVariableEvolutionRatesdT.second == R.get_dStateVariableEvolutionRatesdT( ) ); - BOOST_CHECK( &R._dStateVariableEvolutionRatesdStateVariables.second == R.getdStateVariableEvolutionRatesdStateVariables( ) ); + BOOST_CHECK( &R._dStateVariableEvolutionRatesdStateVariables.second == R.get_dStateVariableEvolutionRatesdStateVariables( ) ); - BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousCauchyStress.second == R.getdPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousCauchyStress.second == R.get_dPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousF.second == R.getdPreviousStateVariableEvolutionRatesdPreviousF( ) ); + BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousF.second == R.get_dPreviousStateVariableEvolutionRatesdPreviousF( ) ); - BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousSubFs.second == R.getdPreviousStateVariableEvolutionRatesdPreviousSubFs( ) ); + BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousSubFs.second == R.get_dPreviousStateVariableEvolutionRatesdPreviousSubFs( ) ); - BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousT.second == R.getdPreviousStateVariableEvolutionRatesdPreviousT( ) ); + BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousT.second == R.get_dPreviousStateVariableEvolutionRatesdPreviousT( ) ); - BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousStateVariables.second == R.getdPreviousStateVariableEvolutionRatesdPreviousStateVariables( ) ); + BOOST_CHECK( &R._dPreviousStateVariableEvolutionRatesdPreviousStateVariables.second == R.get_dPreviousStateVariableEvolutionRatesdPreviousStateVariables( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdCauchyStress.second == R.getdPlasticDeformationGradientdCauchyStress( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdCauchyStress.second == R.get_dPlasticDeformationGradientdCauchyStress( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdF.second == R.getdPlasticDeformationGradientdF( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdF.second == R.get_dPlasticDeformationGradientdF( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdSubFs.second == R.getdPlasticDeformationGradientdSubFs( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdSubFs.second == R.get_dPlasticDeformationGradientdSubFs( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdT.second == R.getdPlasticDeformationGradientdT( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdT.second == R.get_dPlasticDeformationGradientdT( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdStateVariables.second == R.getdPlasticDeformationGradientdStateVariables( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdStateVariables.second == R.get_dPlasticDeformationGradientdStateVariables( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousCauchyStress.second == R.getdPlasticDeformationGradientdPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousCauchyStress.second == R.get_dPlasticDeformationGradientdPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousF.second == R.getdPlasticDeformationGradientdPreviousF( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousF.second == R.get_dPlasticDeformationGradientdPreviousF( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousSubFs.second == R.getdPlasticDeformationGradientdPreviousSubFs( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousSubFs.second == R.get_dPlasticDeformationGradientdPreviousSubFs( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousT.second == R.getdPlasticDeformationGradientdPreviousT( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousT.second == R.get_dPlasticDeformationGradientdPreviousT( ) ); - BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousStateVariables.second == R.getdPlasticDeformationGradientdPreviousStateVariables( ) ); + BOOST_CHECK( &R._dPlasticDeformationGradientdPreviousStateVariables.second == R.get_dPlasticDeformationGradientdPreviousStateVariables( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdCauchyStress.second == R.getdPlasticStateVariablesdCauchyStress( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdCauchyStress.second == R.get_dPlasticStateVariablesdCauchyStress( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdF.second == R.getdPlasticStateVariablesdF( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdF.second == R.get_dPlasticStateVariablesdF( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdSubFs.second == R.getdPlasticStateVariablesdSubFs( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdSubFs.second == R.get_dPlasticStateVariablesdSubFs( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdT.second == R.getdPlasticStateVariablesdT( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdT.second == R.get_dPlasticStateVariablesdT( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdStateVariables.second == R.getdPlasticStateVariablesdStateVariables( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdStateVariables.second == R.get_dPlasticStateVariablesdStateVariables( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdPreviousCauchyStress.second == R.getdPlasticStateVariablesdPreviousCauchyStress( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdPreviousCauchyStress.second == R.get_dPlasticStateVariablesdPreviousCauchyStress( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdPreviousF.second == R.getdPlasticStateVariablesdPreviousF( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdPreviousF.second == R.get_dPlasticStateVariablesdPreviousF( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdPreviousSubFs.second == R.getdPlasticStateVariablesdPreviousSubFs( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdPreviousSubFs.second == R.get_dPlasticStateVariablesdPreviousSubFs( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdPreviousT.second == R.getdPlasticStateVariablesdPreviousT( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdPreviousT.second == R.get_dPlasticStateVariablesdPreviousT( ) ); - BOOST_CHECK( &R._dPlasticStateVariablesdPreviousStateVariables.second == R.getdPlasticStateVariablesdPreviousStateVariables( ) ); + BOOST_CHECK( &R._dPlasticStateVariablesdPreviousStateVariables.second == R.get_dPlasticStateVariablesdPreviousStateVariables( ) ); } catch( std::exception &e ){ @@ -398,24 +398,18 @@ BOOST_AUTO_TEST_CASE( test_residual_basicGetTests ){ unsigned int dimension = 3; - try{ - hydraBaseMock hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, - previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); + hydraBaseMock hydra( time, deltaTime, temperature, previousTemperature, deformationGradient, previousDeformationGradient, + previousStateVariables, parameters, numConfigurations, numNonLinearSolveStateVariables, dimension ); - residualMock R( &hydra, 9, 1, hydra.stateVariableIndices, hydra.viscoPlasticParameters ); + residualMock R( &hydra, 9, 1, hydra.stateVariableIndices, hydra.viscoPlasticParameters ); - tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); + tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - tardigradeHydra::peryznaViscoplasticity::unit_test::residualTester::runBasicGetTests( R ); - } - catch( std::exception &e ){ - tardigradeErrorTools::printNestedExceptions( e ); - throw e; - } + tardigradeHydra::peryznaViscoplasticity::unit_test::residualTester::runBasicGetTests( R ); } -BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ +BOOST_AUTO_TEST_CASE( test_residual_get_drivingStress ){ /*! * Test of computing the driving stress */ @@ -562,19 +556,19 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ 1. , 1.21012101, 0.90759076, 0.75 , 0.90759076, 0.68069307 }; - Rjac.getdDrivingStressdCauchyStress( ); + Rjac.get_dDrivingStressdCauchyStress( ); - Rjac.getdPreviousDrivingStressdPreviousCauchyStress( ); + Rjac.get_dPreviousDrivingStressdPreviousCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getDrivingStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_drivingStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getDrivingStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_drivingStress( ) ) ); answer = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getPreviousDrivingStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_previousDrivingStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getPreviousDrivingStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_previousDrivingStress( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -603,11 +597,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatVector dp = *R.getDrivingStress( ); + floatVector dp = *R.get_drivingStress( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatVector dm = *R.getDrivingStress( ); + floatVector dm = *R.get_drivingStress( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -617,7 +611,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDrivingStressdCauchyStress, *Rjac.getdDrivingStressdCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDrivingStressdCauchyStress, *Rjac.get_dDrivingStressdCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -640,9 +634,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getDrivingStress( ); + floatVector dp = *Rp.get_drivingStress( ); - floatVector dm = *Rm.getDrivingStress( ); + floatVector dm = *Rm.get_drivingStress( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -652,7 +646,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDrivingStressdF, *Rjac.getdDrivingStressdF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDrivingStressdF, *Rjac.get_dDrivingStressdF( ) ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -675,9 +669,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getDrivingStress( ); + floatVector dp = *Rp.get_drivingStress( ); - floatVector dm = *Rm.getDrivingStress( ); + floatVector dm = *Rm.get_drivingStress( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -687,7 +681,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDrivingStressdSubFs, *Rjac.getdDrivingStressdSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDrivingStressdSubFs, *Rjac.get_dDrivingStressdSubFs( ) ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -714,9 +708,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousDrivingStress( ); + floatVector dp = *Rp.get_previousDrivingStress( ); - floatVector dm = *Rm.getPreviousDrivingStress( ); + floatVector dm = *Rm.get_previousDrivingStress( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -726,7 +720,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDrivingStressdPreviousCauchyStress, *Rjac.getdPreviousDrivingStressdPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDrivingStressdPreviousCauchyStress, *Rjac.get_dPreviousDrivingStressdPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -749,9 +743,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousDrivingStress( ); + floatVector dp = *Rp.get_previousDrivingStress( ); - floatVector dm = *Rm.getPreviousDrivingStress( ); + floatVector dm = *Rm.get_previousDrivingStress( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -761,7 +755,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDrivingStressdPreviousF, *Rjac.getdPreviousDrivingStressdPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDrivingStressdPreviousF, *Rjac.get_dPreviousDrivingStressdPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -784,9 +778,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousDrivingStress( ); + floatVector dp = *Rp.get_previousDrivingStress( ); - floatVector dm = *Rm.getPreviousDrivingStress( ); + floatVector dm = *Rm.get_previousDrivingStress( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -796,10 +790,10 @@ BOOST_AUTO_TEST_CASE( test_residual_getDrivingStress ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDrivingStressdPreviousSubFs, *Rjac.getdPreviousDrivingStressdPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDrivingStressdPreviousSubFs, *Rjac.get_dPreviousDrivingStressdPreviousSubFs( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection ){ +BOOST_AUTO_TEST_CASE( test_residual_get_flowDirection ){ /*! * Test of computing the driving stress */ @@ -950,15 +944,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection ){ TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeStressTools::druckerPragerSurface( R.previousDrivingStress, R.flowParameters[ 1 ], R.flowParameters[ 0 ], dpYield, jac, answer2 ) ); - BOOST_CHECK( R.getFlowDirection( )->size( ) == 9 ); + BOOST_CHECK( R.get_flowDirection( )->size( ) == 9 ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getFlowDirection( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_flowDirection( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousFlowDirection( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousFlowDirection( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_flowDirection_jacobian ){ /*! * Test of computing the flow direction stress */ @@ -1101,9 +1095,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - R.getdFlowDirectiondCauchyStress( ); + R.get_dFlowDirectiondCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getFlowDirection( ), *R_ngrad.getFlowDirection( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_flowDirection( ), *R_ngrad.get_flowDirection( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -1132,11 +1126,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatVector dp = *R.getFlowDirection( ); + floatVector dp = *R.get_flowDirection( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatVector dm = *R.getFlowDirection( ); + floatVector dm = *R.get_flowDirection( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -1146,7 +1140,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dFlowDirectiondCauchyStress, *R.getdFlowDirectiondCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dFlowDirectiondCauchyStress, *R.get_dFlowDirectiondCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -1169,9 +1163,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getFlowDirection( ); + floatVector dp = *Rp.get_flowDirection( ); - floatVector dm = *Rm.getFlowDirection( ); + floatVector dm = *Rm.get_flowDirection( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -1181,7 +1175,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dFlowDirectiondF, *R.getdFlowDirectiondF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dFlowDirectiondF, *R.get_dFlowDirectiondF( ) ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -1204,9 +1198,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getFlowDirection( ); + floatVector dp = *Rp.get_flowDirection( ); - floatVector dm = *Rm.getFlowDirection( ); + floatVector dm = *Rm.get_flowDirection( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -1216,7 +1210,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dFlowDirectiondSubFs, *R.getdFlowDirectiondSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dFlowDirectiondSubFs, *R.get_dFlowDirectiondSubFs( ) ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -1243,9 +1237,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousFlowDirection( ); + floatVector dp = *Rp.get_previousFlowDirection( ); - floatVector dm = *Rm.getPreviousFlowDirection( ); + floatVector dm = *Rm.get_previousFlowDirection( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -1255,7 +1249,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousFlowDirectiondPreviousCauchyStress, *R.getdPreviousFlowDirectiondPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousFlowDirectiondPreviousCauchyStress, *R.get_dPreviousFlowDirectiondPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -1278,9 +1272,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousFlowDirection( ); + floatVector dp = *Rp.get_previousFlowDirection( ); - floatVector dm = *Rm.getPreviousFlowDirection( ); + floatVector dm = *Rm.get_previousFlowDirection( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -1290,7 +1284,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousFlowDirectiondPreviousF, *R.getdPreviousFlowDirectiondPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousFlowDirectiondPreviousF, *R.get_dPreviousFlowDirectiondPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -1313,9 +1307,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousFlowDirection( ); + floatVector dp = *Rp.get_previousFlowDirection( ); - floatVector dm = *Rm.getPreviousFlowDirection( ); + floatVector dm = *Rm.get_previousFlowDirection( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -1325,10 +1319,10 @@ BOOST_AUTO_TEST_CASE( test_residual_getFlowDirection_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousFlowDirectiondPreviousSubFs, *R.getdPreviousFlowDirectiondPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousFlowDirectiondPreviousSubFs, *R.get_dPreviousFlowDirectiondPreviousSubFs( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction ){ +BOOST_AUTO_TEST_CASE( test_residual_get_yieldFunction ){ /*! * Test of computing the yield function */ @@ -1476,11 +1470,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction ){ floatType answer2; TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeStressTools::druckerPragerSurface( R.previousDrivingStress, R.yieldParameters[1], R.yieldParameters[0], answer2 ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousYieldFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousYieldFunction( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_yieldFunction_jacobian ){ /*! * Test of computing the yield function's Jacobian */ @@ -1623,9 +1617,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - R.getdYieldFunctiondCauchyStress( ); + R.get_dYieldFunctiondCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getYieldFunction( ), *R_ngrad.getYieldFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_yieldFunction( ), *R_ngrad.get_yieldFunction( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -1653,17 +1647,17 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatType dp = *R.getYieldFunction( ); + floatType dp = *R.get_yieldFunction( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatType dm = *R.getYieldFunction( ); + floatType dm = *R.get_yieldFunction( ); dYieldFunctiondCauchyStress[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dYieldFunctiondCauchyStress, *R.getdYieldFunctiondCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dYieldFunctiondCauchyStress, *R.get_dYieldFunctiondCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -1686,15 +1680,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getYieldFunction( ); + floatType dp = *Rp.get_yieldFunction( ); - floatType dm = *Rm.getYieldFunction( ); + floatType dm = *Rm.get_yieldFunction( ); dYieldFunctiondF[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dYieldFunctiondF, *R.getdYieldFunctiondF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dYieldFunctiondF, *R.get_dYieldFunctiondF( ) ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -1717,15 +1711,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getYieldFunction( ); + floatType dp = *Rp.get_yieldFunction( ); - floatType dm = *Rm.getYieldFunction( ); + floatType dm = *Rm.get_yieldFunction( ); dYieldFunctiondSubFs[ i ] = ( dp - dm ) / ( 2 * delta[ i + 9 ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dYieldFunctiondSubFs, *R.getdYieldFunctiondSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dYieldFunctiondSubFs, *R.get_dYieldFunctiondSubFs( ) ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -1752,15 +1746,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousYieldFunction( ); + floatType dp = *Rp.get_previousYieldFunction( ); - floatType dm = *Rm.getPreviousYieldFunction( ); + floatType dm = *Rm.get_previousYieldFunction( ); dPreviousYieldFunctiondPreviousCauchyStress[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousYieldFunctiondPreviousCauchyStress, *R.getdPreviousYieldFunctiondPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousYieldFunctiondPreviousCauchyStress, *R.get_dPreviousYieldFunctiondPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -1783,15 +1777,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousYieldFunction( ); + floatType dp = *Rp.get_previousYieldFunction( ); - floatType dm = *Rm.getPreviousYieldFunction( ); + floatType dm = *Rm.get_previousYieldFunction( ); dPreviousYieldFunctiondPreviousF[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousYieldFunctiondPreviousF, *R.getdPreviousYieldFunctiondPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousYieldFunctiondPreviousF, *R.get_dPreviousYieldFunctiondPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -1814,18 +1808,18 @@ BOOST_AUTO_TEST_CASE( test_residual_getYieldFunction_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousYieldFunction( ); + floatType dp = *Rp.get_previousYieldFunction( ); - floatType dm = *Rm.getPreviousYieldFunction( ); + floatType dm = *Rm.get_previousYieldFunction( ); dPreviousYieldFunctiondPreviousSubFs[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousYieldFunctiondPreviousSubFs, *R.getdPreviousYieldFunctiondPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousYieldFunctiondPreviousSubFs, *R.get_dPreviousYieldFunctiondPreviousSubFs( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getPlasticThermalMultiplier ){ +BOOST_AUTO_TEST_CASE( test_residual_get_plasticThermalMultiplier ){ /*! * Test of computing the plastic thermal multiplier */ @@ -1943,9 +1937,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticThermalMultiplier ){ residualMock Rjac( &hydra, 9, 1, hydra.stateVariableIndices, hydra.viscoPlasticParameters ); - Rjac.getdPlasticThermalMultiplierdT( ); + Rjac.get_dPlasticThermalMultiplierdT( ); - Rjac.getdPreviousPlasticThermalMultiplierdPreviousT( ); + Rjac.get_dPreviousPlasticThermalMultiplierdPreviousT( ); floatType exp = ( -hydra.viscoPlasticParameters[ 3 ] * ( temperature - hydra.viscoPlasticParameters[ 5 ] ) / ( hydra.viscoPlasticParameters[ 4 ] + temperature - hydra.viscoPlasticParameters[ 5 ] ) ); @@ -1955,13 +1949,13 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticThermalMultiplier ){ floatType answer2 = std::pow( 10, exp ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getPlasticThermalMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_plasticThermalMultiplier( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousPlasticThermalMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousPlasticThermalMultiplier( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getPlasticThermalMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_plasticThermalMultiplier( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.getPreviousPlasticThermalMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.get_previousPlasticThermalMultiplier( ) ) ); // Check the Jacobians w.r.t. the temperature floatType eps = 1e-6; @@ -1982,14 +1976,14 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticThermalMultiplier ){ residualMock Rm( &hydram, 9, 1, hydra.stateVariableIndices, hydra.viscoPlasticParameters ); - floatType dp = *Rp.getPlasticThermalMultiplier( ); + floatType dp = *Rp.get_plasticThermalMultiplier( ); - floatType dm = *Rm.getPlasticThermalMultiplier( ); + floatType dm = *Rm.get_plasticThermalMultiplier( ); dPlasticThermalMultiplierdT = ( dp - dm ) / ( 2 * delta ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticThermalMultiplierdT, *Rjac.getdPlasticThermalMultiplierdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticThermalMultiplierdT, *Rjac.get_dPlasticThermalMultiplierdT( ) ) ); floatType dPreviousPlasticThermalMultiplierdPreviousT = 0; @@ -2007,18 +2001,18 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticThermalMultiplier ){ residualMock Rm( &hydram, 9, 1, hydra.stateVariableIndices, hydra.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousPlasticThermalMultiplier( ); + floatType dp = *Rp.get_previousPlasticThermalMultiplier( ); - floatType dm = *Rm.getPreviousPlasticThermalMultiplier( ); + floatType dm = *Rm.get_previousPlasticThermalMultiplier( ); dPreviousPlasticThermalMultiplierdPreviousT += ( dp - dm ) / ( 2 * delta ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticThermalMultiplierdPreviousT, *Rjac.getdPreviousPlasticThermalMultiplierdPreviousT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticThermalMultiplierdPreviousT, *Rjac.get_dPreviousPlasticThermalMultiplierdPreviousT( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getDragStress ){ +BOOST_AUTO_TEST_CASE( test_residual_get_dragStress ){ /*! * Test of computing the drag stress */ @@ -2160,13 +2154,13 @@ BOOST_AUTO_TEST_CASE( test_residual_getDragStress ){ floatType answer2 = hydra.viscoPlasticParameters[ 1 ] + R.previousStateVariables[ 0 ] * hydra.viscoPlasticParameters[ 2 ]; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getDragStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_dragStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousDragStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousDragStress( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getDragStress_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_dragStress_jacobian ){ /*! * Test of computing the drag stress */ @@ -2317,17 +2311,17 @@ BOOST_AUTO_TEST_CASE( test_residual_getDragStress_jacobian ){ floatType answer2 = hydra.viscoPlasticParameters[ 1 ] + R.previousStateVariables[ 0 ] * hydra.viscoPlasticParameters[ 2 ]; - Rjac.getdDragStressdStateVariables( ); + Rjac.get_dDragStressdStateVariables( ); - Rjac.getdPreviousDragStressdPreviousStateVariables( ); + Rjac.get_dPreviousDragStressdPreviousStateVariables( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getDragStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_dragStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousDragStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousDragStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getDragStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_dragStress( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.getPreviousDragStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.get_previousDragStress( ) ) ); floatType eps = 1e-6; @@ -2353,14 +2347,14 @@ BOOST_AUTO_TEST_CASE( test_residual_getDragStress_jacobian ){ Rm.stateVariables -= delta; - floatType dp = *Rp.getDragStress( ); + floatType dp = *Rp.get_dragStress( ); - floatType dm = *Rm.getDragStress( ); + floatType dm = *Rm.get_dragStress( ); dDragStressdStateVariables[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDragStressdStateVariables, *Rjac.getdDragStressdStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dDragStressdStateVariables, *Rjac.get_dDragStressdStateVariables( ) ) ); floatVector dPreviousDragStressdPreviousStateVariables( R.previousStateVariables.size( ), 0 ); @@ -2384,18 +2378,18 @@ BOOST_AUTO_TEST_CASE( test_residual_getDragStress_jacobian ){ Rm.previousStateVariables -= delta; - floatType dp = *Rp.getPreviousDragStress( ); + floatType dp = *Rp.get_previousDragStress( ); - floatType dm = *Rm.getPreviousDragStress( ); + floatType dm = *Rm.get_previousDragStress( ); dPreviousDragStressdPreviousStateVariables[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDragStressdPreviousStateVariables, *Rjac.getdPreviousDragStressdPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousDragStressdPreviousStateVariables, *Rjac.get_dPreviousDragStressdPreviousStateVariables( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getHardeningFunction ){ +BOOST_AUTO_TEST_CASE( test_residual_get_hardeningFunction ){ /*! * Test of computing the hardening function */ @@ -2539,17 +2533,17 @@ BOOST_AUTO_TEST_CASE( test_residual_getHardeningFunction ){ floatType answer2 = hydra.viscoPlasticParameters[ 9 ] + R.previousStateVariables[ 0 ] * hydra.viscoPlasticParameters[ 10 ]; - Rjac.getdHardeningFunctiondStateVariables( ); + Rjac.get_dHardeningFunctiondStateVariables( ); - Rjac.getdPreviousHardeningFunctiondPreviousStateVariables( ); + Rjac.get_dPreviousHardeningFunctiondPreviousStateVariables( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getHardeningFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_hardeningFunction( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousHardeningFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousHardeningFunction( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getHardeningFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_hardeningFunction( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.getPreviousHardeningFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.get_previousHardeningFunction( ) ) ); floatType eps = 1e-6; @@ -2575,14 +2569,14 @@ BOOST_AUTO_TEST_CASE( test_residual_getHardeningFunction ){ Rm.stateVariables -= delta; - floatType dp = *Rp.getHardeningFunction( ); + floatType dp = *Rp.get_hardeningFunction( ); - floatType dm = *Rm.getHardeningFunction( ); + floatType dm = *Rm.get_hardeningFunction( ); dHardeningFunctiondStateVariables[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dHardeningFunctiondStateVariables, *Rjac.getdHardeningFunctiondStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dHardeningFunctiondStateVariables, *Rjac.get_dHardeningFunctiondStateVariables( ) ) ); floatVector dPreviousHardeningFunctiondPreviousStateVariables( R.previousStateVariables.size( ), 0 ); @@ -2606,14 +2600,14 @@ BOOST_AUTO_TEST_CASE( test_residual_getHardeningFunction ){ Rm.previousStateVariables -= delta; - floatType dp = *Rp.getPreviousHardeningFunction( ); + floatType dp = *Rp.get_previousHardeningFunction( ); - floatType dm = *Rm.getPreviousHardeningFunction( ); + floatType dm = *Rm.get_previousHardeningFunction( ); dPreviousHardeningFunctiondPreviousStateVariables[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousHardeningFunctiondPreviousStateVariables, *Rjac.getdPreviousHardeningFunctiondPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousHardeningFunctiondPreviousStateVariables, *Rjac.get_dPreviousHardeningFunctiondPreviousStateVariables( ) ) ); } BOOST_AUTO_TEST_CASE( test_residual_decomposeParameters ){ @@ -2748,17 +2742,17 @@ BOOST_AUTO_TEST_CASE( test_residual_decomposeParameters ){ floatVector answer_hardeningParameters = { hydra.viscoPlasticParameters[ 9 ], hydra.viscoPlasticParameters[ 10 ] }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_peryznaParameters, *R.getPeryznaParameters( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_peryznaParameters, *R.get_peryznaParameters( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_dragStressParameters, *R.getDragStressParameters( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_dragStressParameters, *R.get_dragStressParameters( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_thermalParameters, *R.getThermalParameters( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_thermalParameters, *R.get_thermalParameters( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_yieldParameters, *R.getYieldParameters( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_yieldParameters, *R.get_yieldParameters( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_flowParameters, *R.getFlowParameters( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_flowParameters, *R.get_flowParameters( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_hardeningParameters, *R.getHardeningParameters( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer_hardeningParameters, *R.get_hardeningParameters( ) ) ); } @@ -2889,7 +2883,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableIndices ){ } -BOOST_AUTO_TEST_CASE( test_residual_getStateVariables ){ +BOOST_AUTO_TEST_CASE( test_residual_get_stateVariables ){ /*! * Test of decomposing the parameter vector */ @@ -3012,15 +3006,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariables ){ floatVector answer = { 4, 6 }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_stateVariables( ) ) ); floatVector answer2 = { 0.01, 0.03 }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousStateVariables( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getPlasticMuliplier ){ +BOOST_AUTO_TEST_CASE( test_residual_get_plasticMuliplier ){ /*! * Test of computing the plastic multiplier */ @@ -3330,21 +3324,21 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMuliplier ){ floatType answer2 = R.previousA * std::pow( R.previousf / R.previousq, R.n ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getPlasticMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_plasticMultiplier( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousPlasticMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousPlasticMultiplier( ) ) ); - Rjac.getdPlasticMultiplierdCauchyStress( ); + Rjac.get_dPlasticMultiplierdCauchyStress( ); - Rjac.getdPreviousPlasticMultiplierdPreviousCauchyStress( ); + Rjac.get_dPreviousPlasticMultiplierdPreviousCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getPlasticMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_plasticMultiplier( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.getPreviousPlasticMultiplier( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.get_previousPlasticMultiplier( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_plasticMultiplier_jacobian ){ /*! * Test of computing the plastic multiplier's Jacobian */ @@ -3487,9 +3481,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - R.getdYieldFunctiondCauchyStress( ); + R.get_dYieldFunctiondCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getYieldFunction( ), *R_ngrad.getYieldFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_yieldFunction( ), *R_ngrad.get_yieldFunction( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -3525,17 +3519,17 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatType dp = *R.getPlasticMultiplier( ); + floatType dp = *R.get_plasticMultiplier( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatType dm = *R.getPlasticMultiplier( ); + floatType dm = *R.get_plasticMultiplier( ); dPlasticMultiplierdCauchyStress[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdCauchyStress, *R.getdPlasticMultiplierdCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdCauchyStress, *R.get_dPlasticMultiplierdCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -3558,15 +3552,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPlasticMultiplier( ); + floatType dp = *Rp.get_plasticMultiplier( ); - floatType dm = *Rm.getPlasticMultiplier( ); + floatType dm = *Rm.get_plasticMultiplier( ); dPlasticMultiplierdF[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdF, *R.getdPlasticMultiplierdF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdF, *R.get_dPlasticMultiplierdF( ) ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -3589,15 +3583,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPlasticMultiplier( ); + floatType dp = *Rp.get_plasticMultiplier( ); - floatType dm = *Rm.getPlasticMultiplier( ); + floatType dm = *Rm.get_plasticMultiplier( ); dPlasticMultiplierdSubFs[ i ] = ( dp - dm ) / ( 2 * delta[ i + 9 ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdSubFs, *R.getdPlasticMultiplierdSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdSubFs, *R.get_dPlasticMultiplierdSubFs( ) ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -3618,15 +3612,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPlasticMultiplier( ); + floatType dp = *Rp.get_plasticMultiplier( ); - floatType dm = *Rm.getPlasticMultiplier( ); + floatType dm = *Rm.get_plasticMultiplier( ); dPlasticMultiplierdT = ( dp - dm ) / ( 2 * delta ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdT, *R.getdPlasticMultiplierdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdT, *R.get_dPlasticMultiplierdT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -3649,15 +3643,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPlasticMultiplier( ); + floatType dp = *Rp.get_plasticMultiplier( ); - floatType dm = *Rm.getPlasticMultiplier( ); + floatType dm = *Rm.get_plasticMultiplier( ); dPlasticMultiplierdStateVariables[ i ] = ( dp - dm ) / ( 2 * delta[ 27 + hydra.stateVariableIndices[ i ] ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdStateVariables, *R.getdPlasticMultiplierdStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticMultiplierdStateVariables, *R.get_dPlasticMultiplierdStateVariables( ) ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -3684,15 +3678,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousPlasticMultiplier( ); + floatType dp = *Rp.get_previousPlasticMultiplier( ); - floatType dm = *Rm.getPreviousPlasticMultiplier( ); + floatType dm = *Rm.get_previousPlasticMultiplier( ); dPreviousPlasticMultiplierdPreviousCauchyStress[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousCauchyStress, *R.getdPreviousPlasticMultiplierdPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousCauchyStress, *R.get_dPreviousPlasticMultiplierdPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -3715,15 +3709,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousPlasticMultiplier( ); + floatType dp = *Rp.get_previousPlasticMultiplier( ); - floatType dm = *Rm.getPreviousPlasticMultiplier( ); + floatType dm = *Rm.get_previousPlasticMultiplier( ); dPreviousPlasticMultiplierdPreviousF[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousF, *R.getdPreviousPlasticMultiplierdPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousF, *R.get_dPreviousPlasticMultiplierdPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -3746,15 +3740,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousPlasticMultiplier( ); + floatType dp = *Rp.get_previousPlasticMultiplier( ); - floatType dm = *Rm.getPreviousPlasticMultiplier( ); + floatType dm = *Rm.get_previousPlasticMultiplier( ); dPreviousPlasticMultiplierdPreviousSubFs[ i ] = ( dp - dm ) / ( 2 * delta[ i ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousSubFs, *R.getdPreviousPlasticMultiplierdPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousSubFs, *R.get_dPreviousPlasticMultiplierdPreviousSubFs( ) ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -3775,15 +3769,15 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousPlasticMultiplier( ); + floatType dp = *Rp.get_previousPlasticMultiplier( ); - floatType dm = *Rm.getPreviousPlasticMultiplier( ); + floatType dm = *Rm.get_previousPlasticMultiplier( ); dPreviousPlasticMultiplierdPreviousT = ( dp - dm ) / ( 2 * delta ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousT, *R.getdPreviousPlasticMultiplierdPreviousT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousT, *R.get_dPreviousPlasticMultiplierdPreviousT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -3806,19 +3800,19 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticMultiplier_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatType dp = *Rp.getPreviousPlasticMultiplier( ); + floatType dp = *Rp.get_previousPlasticMultiplier( ); - floatType dm = *Rm.getPreviousPlasticMultiplier( ); + floatType dm = *Rm.get_previousPlasticMultiplier( ); dPreviousPlasticMultiplierdPreviousStateVariables[ i ] = ( dp - dm ) / ( 2 * delta[ 18 + hydra.stateVariableIndices[ i ] ] ); } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousStateVariables, *R.getdPreviousPlasticMultiplierdPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousPlasticMultiplierdPreviousStateVariables, *R.get_dPreviousPlasticMultiplierdPreviousStateVariables( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient ){ +BOOST_AUTO_TEST_CASE( test_residual_get_velocityGradient ){ /*! * Test of computing the velocity gradient */ @@ -4162,27 +4156,24 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient ){ floatVector answer = R.gamma * R.nhat; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getVelocityGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_velocityGradient( ) ) ); floatVector answer2 = R.previousGamma * R.previousNhat; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousVelocityGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousVelocityGradient( ) ) ); - try{ - Rjac.getdVelocityGradientdCauchyStress( ); + Rjac.get_dVelocityGradientdCauchyStress( ); - Rjac.getdPreviousVelocityGradientdPreviousCauchyStress( ); - } - catch(std::exception &e){tardigradeErrorTools::printNestedExceptions(e);} + Rjac.get_dPreviousVelocityGradientdPreviousCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getVelocityGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_velocityGradient( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.getPreviousVelocityGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.get_previousVelocityGradient( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_velocityGradient_jacobian ){ /*! * Test of computing the velocity gradient's Jacobian */ @@ -4325,9 +4316,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - R.getdYieldFunctiondCauchyStress( ); + R.get_dYieldFunctiondCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getYieldFunction( ), *R_ngrad.getYieldFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_yieldFunction( ), *R_ngrad.get_yieldFunction( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -4363,11 +4354,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatVector dp = *R.getVelocityGradient( ); + floatVector dp = *R.get_velocityGradient( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatVector dm = *R.getVelocityGradient( ); + floatVector dm = *R.get_velocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4377,7 +4368,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdCauchyStress, *R.getdVelocityGradientdCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdCauchyStress, *R.get_dVelocityGradientdCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -4400,9 +4391,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getVelocityGradient( ); + floatVector dp = *Rp.get_velocityGradient( ); - floatVector dm = *Rm.getVelocityGradient( ); + floatVector dm = *Rm.get_velocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4412,7 +4403,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdF, *R.getdVelocityGradientdF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdF, *R.get_dVelocityGradientdF( ) ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -4435,9 +4426,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getVelocityGradient( ); + floatVector dp = *Rp.get_velocityGradient( ); - floatVector dm = *Rm.getVelocityGradient( ); + floatVector dm = *Rm.get_velocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4447,7 +4438,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdSubFs, *R.getdVelocityGradientdSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdSubFs, *R.get_dVelocityGradientdSubFs( ) ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -4468,9 +4459,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getVelocityGradient( ); + floatVector dp = *Rp.get_velocityGradient( ); - floatVector dm = *Rm.getVelocityGradient( ); + floatVector dm = *Rm.get_velocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4480,7 +4471,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdT, *R.getdVelocityGradientdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdT, *R.get_dVelocityGradientdT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -4503,9 +4494,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getVelocityGradient( ); + floatVector dp = *Rp.get_velocityGradient( ); - floatVector dm = *Rm.getVelocityGradient( ); + floatVector dm = *Rm.get_velocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4515,7 +4506,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdStateVariables, *R.getdVelocityGradientdStateVariables( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dVelocityGradientdStateVariables, *R.get_dVelocityGradientdStateVariables( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -4542,9 +4533,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousVelocityGradient( ); + floatVector dp = *Rp.get_previousVelocityGradient( ); - floatVector dm = *Rm.getPreviousVelocityGradient( ); + floatVector dm = *Rm.get_previousVelocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4554,7 +4545,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousCauchyStress, *R.getdPreviousVelocityGradientdPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousCauchyStress, *R.get_dPreviousVelocityGradientdPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -4577,9 +4568,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousVelocityGradient( ); + floatVector dp = *Rp.get_previousVelocityGradient( ); - floatVector dm = *Rm.getPreviousVelocityGradient( ); + floatVector dm = *Rm.get_previousVelocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4589,7 +4580,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousF, *R.getdPreviousVelocityGradientdPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousF, *R.get_dPreviousVelocityGradientdPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -4612,9 +4603,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousVelocityGradient( ); + floatVector dp = *Rp.get_previousVelocityGradient( ); - floatVector dm = *Rm.getPreviousVelocityGradient( ); + floatVector dm = *Rm.get_previousVelocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4624,7 +4615,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousSubFs, *R.getdPreviousVelocityGradientdPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousSubFs, *R.get_dPreviousVelocityGradientdPreviousSubFs( ) ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -4645,9 +4636,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousVelocityGradient( ); + floatVector dp = *Rp.get_previousVelocityGradient( ); - floatVector dm = *Rm.getPreviousVelocityGradient( ); + floatVector dm = *Rm.get_previousVelocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4657,7 +4648,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousT, *R.getdPreviousVelocityGradientdPreviousT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousT, *R.get_dPreviousVelocityGradientdPreviousT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -4680,9 +4671,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousVelocityGradient( ); + floatVector dp = *Rp.get_previousVelocityGradient( ); - floatVector dm = *Rm.getPreviousVelocityGradient( ); + floatVector dm = *Rm.get_previousVelocityGradient( ); for ( unsigned int j = 0; j < 9; j++ ){ @@ -4692,11 +4683,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getVelocityGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousStateVariables, *R.getdPreviousVelocityGradientdPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousVelocityGradientdPreviousStateVariables, *R.get_dPreviousVelocityGradientdPreviousStateVariables( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRate ){ +BOOST_AUTO_TEST_CASE( test_residual_get_stateVariableEvolutionRate ){ /*! * Test of computing the velocity gradient */ @@ -5003,23 +4994,23 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRate ){ floatVector answer = { R.gamma * R.hardeningFunction }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getStateVariableEvolutionRates( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_stateVariableEvolutionRates( ) ) ); floatVector answer2 = { R.previousGamma * R.previousHardeningFunction }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.getPreviousStateVariableEvolutionRates( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *R.get_previousStateVariableEvolutionRates( ) ) ); - Rjac.getdStateVariableEvolutionRatesdCauchyStress( ); + Rjac.get_dStateVariableEvolutionRatesdCauchyStress( ); - Rjac.getdPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ); + Rjac.get_dPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.getStateVariableEvolutionRates( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac.get_stateVariableEvolutionRates( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.getPreviousStateVariableEvolutionRates( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer2, *Rjac.get_previousStateVariableEvolutionRates( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_stateVariableEvolutionRates_jacobian ){ /*! * Test of computing the velocity gradient's Jacobian */ @@ -5162,9 +5153,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - R.getdYieldFunctiondCauchyStress( ); + R.get_dYieldFunctiondCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getYieldFunction( ), *R_ngrad.getYieldFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_yieldFunction( ), *R_ngrad.get_yieldFunction( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -5202,11 +5193,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatVector dp = *R.getStateVariableEvolutionRates( ); + floatVector dp = *R.get_stateVariableEvolutionRates( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatVector dm = *R.getStateVariableEvolutionRates( ); + floatVector dm = *R.get_stateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5216,7 +5207,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdCauchyStress, *R.getdStateVariableEvolutionRatesdCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdCauchyStress, *R.get_dStateVariableEvolutionRatesdCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -5239,9 +5230,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_stateVariableEvolutionRates( ); - floatVector dm = *Rm.getStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_stateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5251,7 +5242,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdF, *R.getdStateVariableEvolutionRatesdF( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdF, *R.get_dStateVariableEvolutionRatesdF( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -5274,9 +5265,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_stateVariableEvolutionRates( ); - floatVector dm = *Rm.getStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_stateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5286,7 +5277,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdSubFs, *R.getdStateVariableEvolutionRatesdSubFs( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdSubFs, *R.get_dStateVariableEvolutionRatesdSubFs( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -5307,9 +5298,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_stateVariableEvolutionRates( ); - floatVector dm = *Rm.getStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_stateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5319,7 +5310,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdT, *R.getdStateVariableEvolutionRatesdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdT, *R.get_dStateVariableEvolutionRatesdT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -5342,9 +5333,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_stateVariableEvolutionRates( ); - floatVector dm = *Rm.getStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_stateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5354,7 +5345,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdStateVariables, *R.getdStateVariableEvolutionRatesdStateVariables( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dStateVariableEvolutionRatesdStateVariables, *R.get_dStateVariableEvolutionRatesdStateVariables( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -5381,9 +5372,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_previousStateVariableEvolutionRates( ); - floatVector dm = *Rm.getPreviousStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_previousStateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5393,7 +5384,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousCauchyStress, *R.getdPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousCauchyStress, *R.get_dPreviousStateVariableEvolutionRatesdPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -5416,9 +5407,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_previousStateVariableEvolutionRates( ); - floatVector dm = *Rm.getPreviousStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_previousStateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5428,7 +5419,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousF, *R.getdPreviousStateVariableEvolutionRatesdPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousF, *R.get_dPreviousStateVariableEvolutionRatesdPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -5451,9 +5442,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_previousStateVariableEvolutionRates( ); - floatVector dm = *Rm.getPreviousStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_previousStateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5463,7 +5454,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousSubFs, *R.getdPreviousStateVariableEvolutionRatesdPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousSubFs, *R.get_dPreviousStateVariableEvolutionRatesdPreviousSubFs( ) ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -5484,9 +5475,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_previousStateVariableEvolutionRates( ); - floatVector dm = *Rm.getPreviousStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_previousStateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5496,7 +5487,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousT, *R.getdPreviousStateVariableEvolutionRatesdPreviousT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousT, *R.get_dPreviousStateVariableEvolutionRatesdPreviousT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -5519,9 +5510,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPreviousStateVariableEvolutionRates( ); + floatVector dp = *Rp.get_previousStateVariableEvolutionRates( ); - floatVector dm = *Rm.getPreviousStateVariableEvolutionRates( ); + floatVector dm = *Rm.get_previousStateVariableEvolutionRates( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -5531,11 +5522,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getStateVariableEvolutionRates_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousStateVariables, *R.getdPreviousStateVariableEvolutionRatesdPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPreviousStateVariableEvolutionRatesdPreviousStateVariables, *R.get_dPreviousStateVariableEvolutionRatesdPreviousStateVariables( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient ){ +BOOST_AUTO_TEST_CASE( test_residual_get_plasticDeformationGradient ){ /*! * Test of computing the plastic deformation gradient */ @@ -5807,22 +5798,19 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient ){ -0.33457515, 0.67081398, -0.19950498, -0.08532789, -0.43831590, 0.05757591 }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getPlasticDeformationGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_plasticDeformationGradient( ) ) ); - try{ - Rjac1.getdPlasticDeformationGradientdCauchyStress( ); + Rjac1.get_dPlasticDeformationGradientdCauchyStress( ); - Rjac2.getdPlasticDeformationGradientdPreviousCauchyStress( ); - } - catch(std::exception &e){tardigradeErrorTools::printNestedExceptions(e);} + Rjac2.get_dPlasticDeformationGradientdPreviousCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac1.getPlasticDeformationGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac1.get_plasticDeformationGradient( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac2.getPlasticDeformationGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *Rjac2.get_plasticDeformationGradient( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_plasticDeformationGradient_jacobian ){ /*! * Test of computing the plastic deformation gradient */ @@ -5965,9 +5953,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - R.getdYieldFunctiondCauchyStress( ); + R.get_dYieldFunctiondCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getYieldFunction( ), *R_ngrad.getYieldFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_yieldFunction( ), *R_ngrad.get_yieldFunction( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -6005,11 +5993,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatVector dp = *R.getPlasticDeformationGradient( ); + floatVector dp = *R.get_plasticDeformationGradient( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatVector dm = *R.getPlasticDeformationGradient( ); + floatVector dm = *R.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6019,7 +6007,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdCauchyStress, *R.getdPlasticDeformationGradientdCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdCauchyStress, *R.get_dPlasticDeformationGradientdCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -6042,9 +6030,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6054,7 +6042,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdF, *R.getdPlasticDeformationGradientdF( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdF, *R.get_dPlasticDeformationGradientdF( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -6077,9 +6065,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6089,7 +6077,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdSubFs, *R.getdPlasticDeformationGradientdSubFs( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdSubFs, *R.get_dPlasticDeformationGradientdSubFs( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -6110,9 +6098,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6122,7 +6110,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdT, *R.getdPlasticDeformationGradientdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdT, *R.get_dPlasticDeformationGradientdT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -6145,9 +6133,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6157,7 +6145,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdStateVariables, *R.getdPlasticDeformationGradientdStateVariables( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdStateVariables, *R.get_dPlasticDeformationGradientdStateVariables( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -6184,9 +6172,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6196,7 +6184,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousCauchyStress, *R.getdPlasticDeformationGradientdPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousCauchyStress, *R.get_dPlasticDeformationGradientdPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -6219,9 +6207,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6231,7 +6219,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousF, *R.getdPlasticDeformationGradientdPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousF, *R.get_dPlasticDeformationGradientdPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -6254,9 +6242,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6266,7 +6254,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousSubFs, *R.getdPlasticDeformationGradientdPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousSubFs, *R.get_dPlasticDeformationGradientdPreviousSubFs( ) ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -6287,9 +6275,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6299,7 +6287,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousT, *R.getdPlasticDeformationGradientdPreviousT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousT, *R.get_dPlasticDeformationGradientdPreviousT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -6322,9 +6310,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticDeformationGradient( ); + floatVector dp = *Rp.get_plasticDeformationGradient( ); - floatVector dm = *Rm.getPlasticDeformationGradient( ); + floatVector dm = *Rm.get_plasticDeformationGradient( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6334,11 +6322,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticDeformationGradient_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousStateVariables, *R.getdPlasticDeformationGradientdPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticDeformationGradientdPreviousStateVariables, *R.get_dPlasticDeformationGradientdPreviousStateVariables( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables ){ +BOOST_AUTO_TEST_CASE( test_residual_get_plasticStateVariables ){ /*! * Test of computing the plastic state variables */ @@ -6616,22 +6604,19 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables ){ floatVector answer = { 7.472, 2.2136 }; - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.getPlasticStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R.get_plasticStateVariables( ) ) ); - try{ - R1.getdPlasticStateVariablesdCauchyStress( ); + R1.get_dPlasticStateVariablesdCauchyStress( ); - R2.getdPlasticStateVariablesdPreviousCauchyStress( ); - } - catch(std::exception &e){tardigradeErrorTools::printNestedExceptions( e );} + R2.get_dPlasticStateVariablesdPreviousCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R1.getPlasticStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R1.get_plasticStateVariables( ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R2.getPlasticStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( answer, *R2.get_plasticStateVariables( ) ) ); } -BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ +BOOST_AUTO_TEST_CASE( test_residual_get_plasticStateVariables_jacobian ){ /*! * Test of computing the plastic deformation gradient */ @@ -6774,9 +6759,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - R.getdYieldFunctiondCauchyStress( ); + R.get_dYieldFunctiondCauchyStress( ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.getYieldFunction( ), *R_ngrad.getYieldFunction( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( *R.get_yieldFunction( ), *R_ngrad.get_yieldFunction( ) ) ); // Test the jacobians floatType eps = 1e-6; @@ -6814,11 +6799,11 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector + delta ); - floatVector dp = *R.getPlasticStateVariables( ); + floatVector dp = *R.get_plasticStateVariables( ); tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector - delta ); - floatVector dm = *R.getPlasticStateVariables( ); + floatVector dm = *R.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6828,7 +6813,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdCauchyStress, *R.getdPlasticStateVariablesdCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdCauchyStress, *R.get_dPlasticStateVariablesdCauchyStress( ) ) ); // Jacobians w.r.t. the deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -6851,9 +6836,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6863,7 +6848,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdF, *R.getdPlasticStateVariablesdF( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdF, *R.get_dPlasticStateVariablesdF( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -6886,9 +6871,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6898,7 +6883,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdSubFs, *R.getdPlasticStateVariablesdSubFs( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdSubFs, *R.get_dPlasticStateVariablesdSubFs( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -6919,9 +6904,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6931,7 +6916,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdT, *R.getdPlasticStateVariablesdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdT, *R.get_dPlasticStateVariablesdT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -6954,9 +6939,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -6966,7 +6951,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdStateVariables, *R.getdPlasticStateVariablesdStateVariables( ), 1e-5, 1e-5 ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdStateVariables, *R.get_dPlasticStateVariablesdStateVariables( ), 1e-5, 1e-5 ) ); // Jacobians w.r.t. the Previous Cauchy stress for ( unsigned int i = 0; i < 9; i++ ){ @@ -6993,9 +6978,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -7005,7 +6990,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousCauchyStress, *R.getdPlasticStateVariablesdPreviousCauchyStress( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousCauchyStress, *R.get_dPlasticStateVariablesdPreviousCauchyStress( ) ) ); // Jacobians w.r.t. the previous deformation gradient for ( unsigned int i = 0; i < 9; i++ ){ @@ -7028,9 +7013,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -7040,7 +7025,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousF, *R.getdPlasticStateVariablesdPreviousF( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousF, *R.get_dPlasticStateVariablesdPreviousF( ) ) ); // Jacobians w.r.t. the previous sub-deformation gradients for ( unsigned int i = 0; i < 18; i++ ){ @@ -7063,9 +7048,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -7075,7 +7060,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousSubFs, *R.getdPlasticStateVariablesdPreviousSubFs( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousSubFs, *R.get_dPlasticStateVariablesdPreviousSubFs( ) ) ); // Jacobians w.r.t. the temperature for ( unsigned int i = 0; i < 1; i++ ){ @@ -7096,9 +7081,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -7108,7 +7093,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousT, *R.getdPlasticStateVariablesdPreviousT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousT, *R.get_dPlasticStateVariablesdPreviousT( ) ) ); // Jacobians w.r.t. the state variables for ( unsigned int i = 0; i < hydra.stateVariableIndices.size( ); i++ ){ @@ -7131,9 +7116,9 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ residualMock Rm( &hydra_m, 9, 1, hydra_m.stateVariableIndices, hydra_m.viscoPlasticParameters ); - floatVector dp = *Rp.getPlasticStateVariables( ); + floatVector dp = *Rp.get_plasticStateVariables( ); - floatVector dm = *Rm.getPlasticStateVariables( ); + floatVector dm = *Rm.get_plasticStateVariables( ); for ( unsigned int j = 0; j < nvar; j++ ){ @@ -7143,7 +7128,7 @@ BOOST_AUTO_TEST_CASE( test_residual_getPlasticStateVariables_jacobian ){ } - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousStateVariables, *R.getdPlasticStateVariablesdPreviousStateVariables( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dPlasticStateVariablesdPreviousStateVariables, *R.get_dPlasticStateVariablesdPreviousStateVariables( ) ) ); } diff --git a/src/cpp/tests/test_tardigrade_hydraThermalExpansion.cpp b/src/cpp/tests/test_tardigrade_hydraThermalExpansion.cpp index e3dcb8c6..587389ab 100644 --- a/src/cpp/tests/test_tardigrade_hydraThermalExpansion.cpp +++ b/src/cpp/tests/test_tardigrade_hydraThermalExpansion.cpp @@ -55,13 +55,13 @@ namespace tardigradeHydra{ BOOST_CHECK( &R._quadraticParameters == R.getQuadraticParameters( ) ); - BOOST_CHECK( &R._thermalGreenLagrangeStrain.second == R.getThermalGreenLagrangeStrain( ) ); + BOOST_CHECK( &R._thermalGreenLagrangeStrain.second == R.get_thermalGreenLagrangeStrain( ) ); - BOOST_CHECK( &R._thermalDeformationGradient.second == R.getThermalDeformationGradient( ) ); + BOOST_CHECK( &R._thermalDeformationGradient.second == R.get_thermalDeformationGradient( ) ); - BOOST_CHECK( &R._dThermalGreenLagrangeStraindT.second == R.getdThermalGreenLagrangeStraindT( ) ); + BOOST_CHECK( &R._dThermalGreenLagrangeStraindT.second == R.get_dThermalGreenLagrangeStraindT( ) ); - BOOST_CHECK( &R._dThermalDeformationGradientdT.second == R.getdThermalDeformationGradientdT( ) ); + BOOST_CHECK( &R._dThermalDeformationGradientdT.second == R.get_dThermalDeformationGradientdT( ) ); } @@ -382,7 +382,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalGreenLagrangeStrain ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( thermalGreenLagrangeStrain, *R.getThermalGreenLagrangeStrain( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( thermalGreenLagrangeStrain, *R.get_thermalGreenLagrangeStrain( ) ) ); } @@ -504,7 +504,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalGreenLagrangeStrainDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dThermalGreenLagrangeStraindF[ j ][ i ] = ( ( *Rp.getThermalGreenLagrangeStrain( ) )[ j ] - ( *Rm.getThermalGreenLagrangeStrain( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dThermalGreenLagrangeStraindF[ j ][ i ] = ( ( *Rp.get_thermalGreenLagrangeStrain( ) )[ j ] - ( *Rm.get_thermalGreenLagrangeStrain( ) )[ j ] ) / ( 2 * deltas[ i ] ); } @@ -529,7 +529,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalGreenLagrangeStrainDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dThermalGreenLagrangeStraindT[ j ] = ( ( *Rp.getThermalGreenLagrangeStrain( ) )[ j ] - ( *Rm.getThermalGreenLagrangeStrain( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dThermalGreenLagrangeStraindT[ j ] = ( ( *Rp.get_thermalGreenLagrangeStrain( ) )[ j ] - ( *Rm.get_thermalGreenLagrangeStrain( ) )[ j ] ) / ( 2 * deltas[ i ] ); } @@ -537,7 +537,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalGreenLagrangeStrainDerivatives ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dThermalGreenLagrangeStraindF, floatMatrix( 9, floatVector( 9, 0 ) ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dThermalGreenLagrangeStraindT, *R.getdThermalGreenLagrangeStraindT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dThermalGreenLagrangeStraindT, *R.get_dThermalGreenLagrangeStraindT( ) ) ); } @@ -664,7 +664,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalDeformationGradient ){ tardigradeHydra::unit_test::hydraBaseTester::updateUnknownVector( hydra, unknownVector ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( thermalDeformationGradient, *R.getThermalDeformationGradient( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( thermalDeformationGradient, *R.get_thermalDeformationGradient( ) ) ); } @@ -786,7 +786,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalDeformationGradientDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dThermalDeformationGradientdF[ j ][ i ] = ( ( *Rp.getThermalDeformationGradient( ) )[ j ] - ( *Rm.getThermalDeformationGradient( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dThermalDeformationGradientdF[ j ][ i ] = ( ( *Rp.get_thermalDeformationGradient( ) )[ j ] - ( *Rm.get_thermalDeformationGradient( ) )[ j ] ) / ( 2 * deltas[ i ] ); } @@ -811,7 +811,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalDeformationGradientDerivatives ){ for ( unsigned int j = 0; j < deformationGradient.size( ); j++ ){ - dThermalDeformationGradientdT[ j ] = ( ( *Rp.getThermalDeformationGradient( ) )[ j ] - ( *Rm.getThermalDeformationGradient( ) )[ j ] ) / ( 2 * deltas[ i ] ); + dThermalDeformationGradientdT[ j ] = ( ( *Rp.get_thermalDeformationGradient( ) )[ j ] - ( *Rm.get_thermalDeformationGradient( ) )[ j ] ) / ( 2 * deltas[ i ] ); } @@ -819,7 +819,7 @@ BOOST_AUTO_TEST_CASE( test_residual_setThermalDeformationGradientDerivatives ){ BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dThermalDeformationGradientdF, floatMatrix( 9, floatVector( 9, 0 ) ) ) ); - BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dThermalDeformationGradientdT, *R.getdThermalDeformationGradientdT( ) ) ); + BOOST_CHECK( tardigradeVectorTools::fuzzyEquals( dThermalDeformationGradientdT, *R.get_dThermalDeformationGradientdT( ) ) ); }