Skip to content

Commit

Permalink
Change SetValue to SetValues
Browse files Browse the repository at this point in the history
  • Loading branch information
@tteschemacher
tteschemacher committed Mar 5, 2020
1 parent 6ccc491 commit ee99f9d
Show file tree
Hide file tree
Showing 60 changed files with 202 additions and 200 deletions.
6 changes: 3 additions & 3 deletions ...actMechanicsApplication/custom_conditions/deformable_contact/contact_domain_condition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ namespace Kratos
//*********************************SET DOUBLE VALUE***********************************
//************************************************************************************

void ContactDomainCondition::SetValueOnIntegrationPoints( const Variable<double>& rVariable,
void ContactDomainCondition::SetValuesOnIntegrationPoints( const Variable<double>& rVariable,
std::vector<double>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand All @@ -307,7 +307,7 @@ namespace Kratos
//*********************************SET VECTOR VALUE***********************************
//************************************************************************************

void ContactDomainCondition::SetValueOnIntegrationPoints( const Variable<Vector>& rVariable,
void ContactDomainCondition::SetValuesOnIntegrationPoints( const Variable<Vector>& rVariable,
std::vector<Vector>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand All @@ -318,7 +318,7 @@ namespace Kratos
//*********************************SET MATRIX VALUE***********************************
//************************************************************************************

void ContactDomainCondition::SetValueOnIntegrationPoints( const Variable<Matrix>& rVariable,
void ContactDomainCondition::SetValuesOnIntegrationPoints( const Variable<Matrix>& rVariable,
std::vector<Matrix>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand Down
8 changes: 4 additions & 4 deletions ...actMechanicsApplication/custom_conditions/deformable_contact/contact_domain_condition.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,24 +457,24 @@ class KRATOS_API(CONTACT_MECHANICS_APPLICATION) ContactDomainCondition
* interface to the constitutive law!
* Note, that these functions expect a std::vector of values for the
* specified variable type that contains a value for each integration point!
* SetValueOnIntegrationPoints: set the values for given Variable.
* SetValuesOnIntegrationPoints: set the values for given Variable.
* GetValueOnIntegrationPoints: get the values for given Variable.
*/

//SET
/**
* Set a double Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
/**
* Set a Vector Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

/**
* Set a Matrix Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

//GET:
/**
Expand Down
6 changes: 3 additions & 3 deletions ...chanicsApplication/custom_conditions/thermal_contact/thermal_contact_domain_condition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ void ThermalContactDomainCondition::GetSecondDerivativesVector( Vector& rValues,
//*********************************SET DOUBLE VALUE***********************************
//************************************************************************************

void ThermalContactDomainCondition::SetValueOnIntegrationPoints( const Variable<double>& rVariable,
void ThermalContactDomainCondition::SetValuesOnIntegrationPoints( const Variable<double>& rVariable,
std::vector<double>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand All @@ -199,7 +199,7 @@ void ThermalContactDomainCondition::SetValueOnIntegrationPoints( const Variable<
//*********************************SET VECTOR VALUE***********************************
//************************************************************************************

void ThermalContactDomainCondition::SetValueOnIntegrationPoints( const Variable<Vector>& rVariable,
void ThermalContactDomainCondition::SetValuesOnIntegrationPoints( const Variable<Vector>& rVariable,
std::vector<Vector>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand All @@ -210,7 +210,7 @@ void ThermalContactDomainCondition::SetValueOnIntegrationPoints( const Variable<
//*********************************SET MATRIX VALUE***********************************
//************************************************************************************

void ThermalContactDomainCondition::SetValueOnIntegrationPoints( const Variable<Matrix>& rVariable,
void ThermalContactDomainCondition::SetValuesOnIntegrationPoints( const Variable<Matrix>& rVariable,
std::vector<Matrix>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand Down
8 changes: 4 additions & 4 deletions ...chanicsApplication/custom_conditions/thermal_contact/thermal_contact_domain_condition.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,24 +256,24 @@ class KRATOS_API(CONTACT_MECHANICS_APPLICATION) ThermalContactDomainCondition
* interface to the constitutive law!
* Note, that these functions expect a std::vector of values for the
* specified variable type that contains a value for each integration point!
* SetValueOnIntegrationPoints: set the values for given Variable.
* SetValuesOnIntegrationPoints: set the values for given Variable.
* GetValueOnIntegrationPoints: get the values for given Variable.
*/

//SET
/**
* Set a double Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
/**
* Set a Vector Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

/**
* Set a Matrix Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

//GET:
/**
Expand Down
2 changes: 1 addition & 1 deletion applications/DamApplication/custom_elements/small_displacement_interface_element.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ void SmallDisplacementInterfaceElement<TDim,TNumNodes>::GetSecondDerivativesVect
//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

template< unsigned int TDim, unsigned int TNumNodes >
void SmallDisplacementInterfaceElement<TDim,TNumNodes>::SetValueOnIntegrationPoints( const Variable<double>& rVariable,
void SmallDisplacementInterfaceElement<TDim,TNumNodes>::SetValuesOnIntegrationPoints( const Variable<double>& rVariable,
std::vector<double>& rValues,const ProcessInfo& rCurrentProcessInfo )
{
for ( unsigned int GPoint = 0; GPoint < mConstitutiveLawVector.size(); GPoint++ )
Expand Down
2 changes: 1 addition & 1 deletion applications/DamApplication/custom_elements/small_displacement_interface_element.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class SmallDisplacementInterfaceElement : public Element

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

void SetValueOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

void GetValueOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

Expand Down
8 changes: 4 additions & 4 deletions applications/DamApplication/custom_elements/solid_element.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ void SolidElement::GetSecondDerivativesVector( Vector& rValues, int Step )
//*********************************SET DOUBLE VALUE***********************************
//************************************************************************************

void SolidElement::SetValueOnIntegrationPoints( const Variable<double>& rVariable,
void SolidElement::SetValuesOnIntegrationPoints( const Variable<double>& rVariable,
std::vector<double>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand All @@ -291,7 +291,7 @@ void SolidElement::SetValueOnIntegrationPoints( const Variable<double>& rVariabl
//*********************************SET VECTOR VALUE***********************************
//************************************************************************************

void SolidElement::SetValueOnIntegrationPoints( const Variable<Vector>& rVariable,
void SolidElement::SetValuesOnIntegrationPoints( const Variable<Vector>& rVariable,
std::vector<Vector>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand All @@ -307,7 +307,7 @@ void SolidElement::SetValueOnIntegrationPoints( const Variable<Vector>& rVariabl
//************************************************************************************


void SolidElement::SetValueOnIntegrationPoints( const Variable<Matrix>& rVariable,
void SolidElement::SetValuesOnIntegrationPoints( const Variable<Matrix>& rVariable,
std::vector<Matrix>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand All @@ -323,7 +323,7 @@ void SolidElement::SetValueOnIntegrationPoints( const Variable<Matrix>& rVariabl
//********************************SET CONSTITUTIVE VALUE******************************
//************************************************************************************

void SolidElement::SetValueOnIntegrationPoints( const Variable<ConstitutiveLaw::Pointer>& rVariable,
void SolidElement::SetValuesOnIntegrationPoints( const Variable<ConstitutiveLaw::Pointer>& rVariable,
std::vector<ConstitutiveLaw::Pointer>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
Expand Down
10 changes: 5 additions & 5 deletions applications/DamApplication/custom_elements/solid_element.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,30 +358,30 @@ class KRATOS_API(DAM_APPLICATION) SolidElement
* interface to the constitutive law!
* Note, that these functions expect a std::vector of values for the
* specified variable type that contains a value for each integration point!
* SetValueOnIntegrationPoints: set the values for given Variable.
* SetValuesOnIntegrationPoints: set the values for given Variable.
* GetValueOnIntegrationPoints: get the values for given Variable.
*/

//SET
/**
* Set a double Value on the Element Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<double>& rVariable, std::vector<double>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

/**
* Set a Vector Value on the Element Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

/**
* Set a Matrix Value on the Element Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

/**
* Set a Constitutive Law Value
*/
void SetValueOnIntegrationPoints( const Variable<ConstitutiveLaw::Pointer>& rVariable,
void SetValuesOnIntegrationPoints( const Variable<ConstitutiveLaw::Pointer>& rVariable,
std::vector<ConstitutiveLaw::Pointer>& rValues,
const ProcessInfo& rCurrentProcessInfo ) override;

Expand Down
8 changes: 4 additions & 4 deletions applications/DelaunayMeshingApplication/custom_conditions/composite_condition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,25 +330,25 @@ void CompositeCondition::GetSecondDerivativesVector( Vector& rValues, int Step )
//*********************************SET VECTOR VALUE***********************************
//************************************************************************************

void CompositeCondition::SetValueOnIntegrationPoints( const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo )
void CompositeCondition::SetValuesOnIntegrationPoints( const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo )
{
for (ConditionIterator cn = mChildConditions.begin() ; cn != mChildConditions.end(); ++cn)
{
cn->SetValueOnIntegrationPoints(rVariable,rValues,rCurrentProcessInfo);
cn->SetValuesOnIntegrationPoints(rVariable,rValues,rCurrentProcessInfo);
}
}


//*********************************SET MATRIX VALUE***********************************
//************************************************************************************

void CompositeCondition::SetValueOnIntegrationPoints( const Variable<Matrix>& rVariable,
void CompositeCondition::SetValuesOnIntegrationPoints( const Variable<Matrix>& rVariable,
std::vector<Matrix>& rValues,
const ProcessInfo& rCurrentProcessInfo )
{
for (ConditionIterator cn = mChildConditions.begin() ; cn != mChildConditions.end(); ++cn)
{
cn->SetValueOnIntegrationPoints(rVariable,rValues,rCurrentProcessInfo);
cn->SetValuesOnIntegrationPoints(rVariable,rValues,rCurrentProcessInfo);
}
}

Expand Down
6 changes: 3 additions & 3 deletions applications/DelaunayMeshingApplication/custom_conditions/composite_condition.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,20 +245,20 @@ class KRATOS_API(DELAUNAY_MESHING_APPLICATION) CompositeCondition
* interface to the constitutive law!
* Note, that these functions expect a std::vector of values for the
* specified variable type that contains a value for each integration point!
* SetValueOnIntegrationPoints: set the values for given Variable.
* SetValuesOnIntegrationPoints: set the values for given Variable.
* GetValueOnIntegrationPoints: get the values for given Variable.
*/

//SET
/**
* Set a Vector Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Vector>& rVariable, std::vector<Vector>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

/**
* Set a Matrix Value on the Condition Constitutive Law
*/
void SetValueOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;
void SetValuesOnIntegrationPoints(const Variable<Matrix>& rVariable, std::vector<Matrix>& rValues, const ProcessInfo& rCurrentProcessInfo) override;

//GET:
/**
Expand Down
16 changes: 8 additions & 8 deletions applications/DelaunayMeshingApplication/custom_utilities/mesh_data_transfer_utilities.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara
}


i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.DoubleVariables[i]),NodesDoubleVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.DoubleVariables[i]),NodesDoubleVariableArray,CurrentProcessInfo);

}

Expand Down Expand Up @@ -442,7 +442,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara
}


i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.Array1DVariables[i]),NodesArray1DVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.Array1DVariables[i]),NodesArray1DVariableArray,CurrentProcessInfo);

}

Expand Down Expand Up @@ -478,7 +478,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara
}


i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.VectorVariables[i]),NodesVectorVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.VectorVariables[i]),NodesVectorVariableArray,CurrentProcessInfo);

}

Expand Down Expand Up @@ -517,7 +517,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara
}


i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.MatrixVariables[i]),NodesMatrixVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.MatrixVariables[i]),NodesMatrixVariableArray,CurrentProcessInfo);

}

Expand Down Expand Up @@ -641,7 +641,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara

//std::cout<<" transfer ["<<i_elem.Id()<<"] "<<NodesDoubleVariableArray[0]<<" element "<<ElementDoubleVariableArray[0]<<std::endl;

i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.DoubleVariables[i]),NodesDoubleVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.DoubleVariables[i]),NodesDoubleVariableArray,CurrentProcessInfo);

}

Expand Down Expand Up @@ -672,7 +672,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara
}


i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.Array1DVariables[i]),NodesArray1DVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.Array1DVariables[i]),NodesArray1DVariableArray,CurrentProcessInfo);

}

Expand Down Expand Up @@ -707,7 +707,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara
}


i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.VectorVariables[i]),NodesVectorVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.VectorVariables[i]),NodesVectorVariableArray,CurrentProcessInfo);

}

Expand Down Expand Up @@ -744,7 +744,7 @@ void MeshDataTransferUtilities::TransferNodalValuesToElements(const TransferPara
}


i_elem.SetValueOnIntegrationPoints(*(rTransferVariables.MatrixVariables[i]),NodesMatrixVariableArray,CurrentProcessInfo);
i_elem.SetValuesOnIntegrationPoints(*(rTransferVariables.MatrixVariables[i]),NodesMatrixVariableArray,CurrentProcessInfo);

}

Expand Down
Loading

0 comments on commit ee99f9d

Please sign in to comment.