Skip to content

Fix typos in applications/ULFapplication #13412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ namespace Kratos
boost::numeric::ublas::bounded_matrix<double,2,6> msConvOp = ZeroMatrix(2,6);
boost::numeric::ublas::bounded_matrix<double,6,6> msAuxMat = ZeroMatrix(6,6);
array_1d<double,6> msAuxVec = ZeroVector(6); //dimension = number of nodes
array_1d<double,2> ms_adv_vel = ZeroVector(2); //dimesion coincides with space dimension
array_1d<double,2> ms_vel_gauss = ZeroVector(2); //dimesion coincides with space dimension
array_1d<double,2> ms_adv_vel = ZeroVector(2); //dimension coincides with space dimension
array_1d<double,2> ms_vel_gauss = ZeroVector(2); //dimension coincides with space dimension
///////////////////////////////////////////////////////////////////////////////////


Expand Down Expand Up @@ -285,8 +285,8 @@ namespace Kratos
boost::numeric::ublas::bounded_matrix<double,2,6> msConvOp = ZeroMatrix(2,6);
boost::numeric::ublas::bounded_matrix<double,6,6> msAuxMat = ZeroMatrix(6,6);
array_1d<double,6> msAuxVec = ZeroVector(6); //dimension = number of nodes
array_1d<double,2> ms_adv_vel = ZeroVector(2); //dimesion coincides with space dimension
array_1d<double,2> ms_vel_gauss = ZeroVector(2); //dimesion coincides with space dimension
array_1d<double,2> ms_adv_vel = ZeroVector(2); //dimension coincides with space dimension
array_1d<double,2> ms_vel_gauss = ZeroVector(2); //dimension coincides with space dimension
array_1d<double,3> ms_temp_vec_np = ZeroVector(3); //dimension = number of nodes
array_1d<double,3> ms_aux0 = ZeroVector(3); //dimension = number of nodes
array_1d<double,3> ms_aux1 = ZeroVector(3); //dimension = number of nodes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class Fluid2DGLS_expl
// static array_1d<double,3> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
// static array_1d<double,2> ms_vel_gauss; //dimesion coincides with space dimension
// static array_1d<double,2> ms_vel_gauss; //dimension coincides with space dimension
// static array_1d<double,3> ms_temp_vec_np; //dimension = number of nodes
// static array_1d<double,3> ms_u_DN;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class HypoElasticSolid2D
static array_1d<double,3> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
static array_1d<double,2> ms_vel_gauss; //dimesion coincides with space dimension
static array_1d<double,2> ms_vel_gauss; //dimension coincides with space dimension
static array_1d<double,3> ms_temp_vec_np; //dimension = number of nodes
static array_1d<double,3> ms_u_DN;

Expand Down
24 changes: 12 additions & 12 deletions applications/ULFapplication/custom_elements/surface_tension.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace Kratos
/**
* This class is based on the VMS element in the fluid dynamics,
* It is extended to solve for the droplet dynamics, and surface tensions.
* for more information about the the governer equations and thier discretization, please find it in the below references:
* for more information about the governer equations and thier discretization, please find it in the below references:
* Alex Jarauta, Pavel Ryzhakov, Marc Secanell, Prashant R Waghmare, and Jordi Pons-Prats. Numerical study of droplet dynamics in a polymer electrolyte fuel cell gas channel using an embedded eulerian-lagrangian approach. Journal of Power Sources, 323:201–212, 2016.
*/

Expand Down Expand Up @@ -137,7 +137,7 @@ class SurfaceTension : public Element

//Constructors.

/// Default constuctor.
/// Default constructor.
/**
* @param NewId Index number of the new element (optional)
*/
Expand All @@ -163,7 +163,7 @@ class SurfaceTension : public Element
Element(NewId, pGeometry)
{}

/// Constuctor using geometry and properties.
/// Constructor using geometry and properties.
/**
* @param NewId Index of the new element
* @param pGeometry Pointer to a geometry object
Expand Down Expand Up @@ -237,7 +237,7 @@ class SurfaceTension : public Element
this->CalculateRightHandSide(rRightHandSideVector, rCurrentProcessInfo);
}

/// Returns a zero matrix of appropiate size (provided for compatibility with scheme)
/// Returns a zero matrix of appropriate size (provided for compatibility with scheme)
/**
* @param rLeftHandSideMatrix Local matrix, will be filled with zeros
* @param rCurrentProcessInfo Process info instance
Expand Down Expand Up @@ -629,7 +629,7 @@ class SurfaceTension : public Element
/* Projections of the elemental residual are computed with
* Newton-Raphson iterations of type M(lumped) dx = ElemRes - M(consistent) * x
*/
const double Weight = ConsistentMassCoef(Area); // Consistent mass matrix is Weigth * ( Ones(TNumNodes,TNumNodes) + Identity(TNumNodes,TNumNodes) )
const double Weight = ConsistentMassCoef(Area); // Consistent mass matrix is Weight * ( Ones(TNumNodes,TNumNodes) + Identity(TNumNodes,TNumNodes) )
// Carefully write results to nodal variables, to avoid parallelism problems
for (unsigned int i = 0; i < TNumNodes; ++i)
{
Expand All @@ -647,13 +647,13 @@ class SurfaceTension : public Element
this->GetGeometry()[i].FastGetSolutionStepValue(NODAL_AREA) += Area * N[i];

// Substract M(consistent)*x(i-1) from RHS
for(unsigned int j = 0; j < TNumNodes; ++j) // RHS -= Weigth * Ones(TNumNodes,TNumNodes) * x(i-1)
for(unsigned int j = 0; j < TNumNodes; ++j) // RHS -= Weight * Ones(TNumNodes,TNumNodes) * x(i-1)
{
for(unsigned int d = 0; d < TDim; ++d)
rMomRHS[d] -= Weight * this->GetGeometry()[j].FastGetSolutionStepValue(ADVPROJ)[d];
rMassRHS -= Weight * this->GetGeometry()[j].FastGetSolutionStepValue(DIVPROJ);
}
for(unsigned int d = 0; d < TDim; ++d) // RHS -= Weigth * Identity(TNumNodes,TNumNodes) * x(i-1)
for(unsigned int d = 0; d < TDim; ++d) // RHS -= Weight * Identity(TNumNodes,TNumNodes) * x(i-1)
rMomRHS[d] -= Weight * this->GetGeometry()[i].FastGetSolutionStepValue(ADVPROJ)[d];
rMassRHS -= Weight * this->GetGeometry()[i].FastGetSolutionStepValue(DIVPROJ);

Expand Down Expand Up @@ -1174,13 +1174,13 @@ class SurfaceTension : public Element
/// Add mass-like stabilization terms to LHS.
/**
* This function is only used in ASGS. For OSS, we avoid computing these
* terms, as they shoud cancel out with the dynamic part of the projection
* terms, as they should cancel out with the dynamic part of the projection
* (which is not computed either)
* @param rLHSMatrix Left hand side of the velocity-pressure system
* @param Density Density on integration point
* @param rAdvVel Advective velocity on integration point
* @param TauOne Stabilization parameter for momentum equation
* @param rShapeFunc Shape funcitions evaluated on integration point
* @param rShapeFunc Shape functions evaluated on integration point
* @param rShapeDeriv Shape function derivatives evaluated on integration point
* @param Weight Area (or volume) times integration point weight
*/
Expand Down Expand Up @@ -2620,7 +2620,7 @@ class SurfaceTension : public Element
/**
* @brief EquivalentStrainRate Calculate the second invariant of the strain rate tensor GammaDot = (2SijSij)^0.5.
*
* @note Our implementation of non-Newtonian consitutive models such as Bingham relies on this funcition being
* @note Our implementation of non-Newtonian consitutive models such as Bingham relies on this function being
* defined on all fluid elements.
*
* @param rDN_DX Shape function derivatives at the integration point.
Expand Down Expand Up @@ -2665,7 +2665,7 @@ class SurfaceTension : public Element
rAdvVel += rShapeFunc[iNode] * (rGeom[iNode].FastGetSolutionStepValue(VELOCITY, Step) - rGeom[iNode].FastGetSolutionStepValue(MESH_VELOCITY, Step));
}

/// Write the convective operator evaluated at this point (for each nodal funciton) to an array
/// Write the convective operator evaluated at this point (for each nodal function) to an array
/**
* Evaluate the convective operator for each node's shape function at an arbitrary point
* @param rResult: Output vector
Expand Down Expand Up @@ -2900,7 +2900,7 @@ class SurfaceTension : public Element
/**
* Unused, left to support derived classes. @see SurfaceTension::AddBTransCB
* @param rB Strain rate matrix
* @param rShapeDeriv Nodal shape funcion derivatives
* @param rShapeDeriv Nodal shape function derivatives
*/
void CalculateB( BoundedMatrix<double, (TDim * TNumNodes) / 2, TDim * TNumNodes >& rB,
const BoundedMatrix<double, TNumNodes, TDim >& rShapeDeriv);
Expand Down
2 changes: 1 addition & 1 deletion applications/ULFapplication/custom_elements/ulf_frac2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ class UlfFrac2D
//static array_1d<double,3> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
//static array_1d<double,2> ms_vel_gauss; //dimesion coincides with space dimension
//static array_1d<double,2> ms_vel_gauss; //dimension coincides with space dimension
//static array_1d<double,3> ms_temp_vec_np; //dimension = number of nodes
//static array_1d<double,3> ms_u_DN;

Expand Down
4 changes: 2 additions & 2 deletions applications/ULFapplication/custom_elements/ulf_frac3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ array_1d<double,6> ms_temp_vec;
array_1d<double,4> ms_temp_vec_np = ZeroVector(4); //dimension = number of nodes //
array_1d<double,3> ms_aux0 = ZeroVector(3); //dimension = number of space dimensions //
array_1d<double,4> ms_aux1 = ZeroVector(4); //dimension = number of nodes //
array_1d<double,3> ms_vel_gauss = ZeroVector(3); //dimesion coincides with space dimension//
array_1d<double,3> ms_vel_gauss = ZeroVector(3); //dimension coincides with space dimension//
array_1d<double,4> msN = ZeroVector(4);//
}
using namespace UlfFrac3D_auxiliaries;
Expand Down Expand Up @@ -610,7 +610,7 @@ void UlfFrac3D::PressureStep(MatrixType& rLeftHandSideMatrix, VectorType& rRight
array_1d<double,4> ms_temp_vec_np;// = ZeroVector(4); //dimension = number of nodes //
array_1d<double,3> ms_aux0;// = ZeroVector(3); //dimension = number of space dimensions //
array_1d<double,4> ms_aux1;// = ZeroVector(4); //dimension = number of nodes //
array_1d<double,3> ms_vel_gauss;// = ZeroVector(3); //dimesion coincides with space dimension//
array_1d<double,3> ms_vel_gauss;// = ZeroVector(3); //dimension coincides with space dimension//
array_1d<double,4> msN;// = ZeroVector(4);//

if(rRightHandSideVector.size() != 4)
Expand Down
2 changes: 1 addition & 1 deletion applications/ULFapplication/custom_elements/ulf_frac3d.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class UlfFrac3D
//static array_1d<double,3> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
//static array_1d<double,2> ms_vel_gauss; //dimesion coincides with space dimension
//static array_1d<double,2> ms_vel_gauss; //dimension coincides with space dimension
//static array_1d<double,3> ms_temp_vec_np; //dimension = number of nodes
//static array_1d<double,3> ms_u_DN;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ class UpdatedLagrangianFluid
static array_1d<double,3> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
static array_1d<double,2> ms_vel_gauss; //dimesion coincides with space dimension
static array_1d<double,2> ms_vel_gauss; //dimension coincides with space dimension
static array_1d<double,3> ms_temp_vec_np; //dimension = number of nodes
static array_1d<double,3> ms_u_DN;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ class UpdatedLagrangianFluid3D
static array_1d<double,4> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
static array_1d<double,3> ms_vel_gauss; //dimesion coincides with space dimension
static array_1d<double,3> ms_vel_gauss; //dimension coincides with space dimension
static array_1d<double,4> ms_temp_vec_np; //dimension = number of nodes
static array_1d<double,4> ms_u_DN;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class UpdatedLagrangianFluid3Dinc
static array_1d<double,4> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
static array_1d<double,3> ms_vel_gauss; //dimesion coincides with space dimension
static array_1d<double,3> ms_vel_gauss; //dimension coincides with space dimension
static array_1d<double,4> ms_temp_vec_np; //dimension = number of nodes
static array_1d<double,4> ms_u_DN;

Expand All @@ -242,7 +242,7 @@ class UpdatedLagrangianFluid3Dinc
static array_1d<double,3> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
static array_1d<double,2> ms_vel_gauss; //dimesion coincides with space dimension
static array_1d<double,2> ms_vel_gauss; //dimension coincides with space dimension
static array_1d<double,3> ms_temp_vec_np; //dimension = number of nodes
static array_1d<double,3> ms_u_DN;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class UpdatedLagrangianFluidInc
static array_1d<double,3> msN; //dimension = number of nodes
//static Matrix msDN_DX;
//static Matrix msMassFactors;
static array_1d<double,2> ms_vel_gauss; //dimesion coincides with space dimension
static array_1d<double,2> ms_vel_gauss; //dimension coincides with space dimension
static array_1d<double,3> ms_temp_vec_np; //dimension = number of nodes
static array_1d<double,3> ms_u_DN;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ namespace Kratos
/** Detail class definition.
calculate curvature for 2D and 3D.

curvature for 2D is calcualted based on equation (14) in the follwoing reference:
curvature for 2D is calculated based on equation (14) in the follwoing reference:
Jarauta A, Ryzhakov P, Secanell M, Waghmare PR, Pons-Prats J. Numerical study of droplet dynamics in a polymer electrolyte fuel cell gas channel using an embedded Eulerian-Lagrangian approach. Journal of Power Sources. 2016 Aug 15;323:201-12.

curvature for 3D is based on Mayer approach in the follwoing reference:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class MarkCloseNodesProcess
{

const double& X0 = in->X(); const double& Y0 = in->Y();
KRATOS_WATCH("ENTERED MARKING CLOSE NODES FUCNTION!");
KRATOS_WATCH("ENTERED MARKING CLOSE NODES FUNCTION!");

for( GlobalPointersVector< Node >::iterator i = in->GetValue(NEIGHBOUR_NODES).begin();
i != in->GetValue(NEIGHBOUR_NODES).end(); i++)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ class MassCalculateProcess
im->Calculate(NODAL_MASS,dummy,proc_info);
}

KRATOS_WATCH("Execute of Mass Calulate Process");



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ class PressureCalculateProcess
{
im->Calculate(PRESSURE,dummy,proc_info);
}
KRATOS_WATCH("Execute of Pressure Calulate Process");
/* //
if(mdomain_size == 2)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ class PressureCalculateProcessAxisym
{
im->Calculate(PRESSURE,dummy,proc_info);
}
KRATOS_WATCH("Execute of Pressure Calulate Process");
/* //
if(mdomain_size == 2)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ class MarkCloseNodesProcess

const double& X0 = in->X();
const double& Y0 = in->Y();
//KRATOS_WATCH("ENTERED MARKING CLOSE NODES FUCNTION!");

for( GlobalPointersVector< Node >::iterator i = in->GetValue(NEIGHBOUR_NODES).begin();
i != in->GetValue(NEIGHBOUR_NODES).end(); i++)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class ResidualBasedEliminationQuasiIncompressibleBuilderAndSolver

this->mEquationSystemSize = BaseType::mDofSet.size();

//throws an execption if there are no Degrees of freedom involved in the analysis
//throws an exception if there are no Degrees of freedom involved in the analysis
if (BaseType::mDofSet.size()==0)
KRATOS_THROW_ERROR(std::logic_error, "No degrees of freedom!", "");

Expand All @@ -309,7 +309,7 @@ class ResidualBasedEliminationQuasiIncompressibleBuilderAndSolver
{
KRATOS_TRY

//assing id to the nodes
//assign id to the nodes
unsigned int index = 0;
for(typename DofsArrayType::iterator i_dof = BaseType::mDofSet.begin() ; i_dof != BaseType::mDofSet.end() ; ++i_dof)
{
Expand Down Expand Up @@ -529,8 +529,6 @@ class ResidualBasedEliminationQuasiIncompressibleBuilderAndSolver
omp_destroy_lock(&lock_array[i]);
//KRATOS_WATCH("finished parallel building");

// //ensure that all the threads are syncronized here
// #pragma omp barrier
#endif

KRATOS_CATCH("")
Expand Down Expand Up @@ -972,8 +970,6 @@ class ResidualBasedEliminationQuasiIncompressibleBuilderAndSolver
omp_destroy_lock(&lock_array[i]);
//KRATOS_WATCH("finished parallel building");

// //ensure that all the threads are syncronized here
// #pragma omp barrier
#endif

KRATOS_CATCH("")
Expand Down Expand Up @@ -1064,7 +1060,6 @@ class ResidualBasedEliminationQuasiIncompressibleBuilderAndSolver
std::vector<int> indices;
indices.reserve(1000);

//KRATOS_WATCH("contruct matrix structure Mconsistent 0")

int total_nnz = 0;
for (typename NodesArrayType::iterator it=r_model_part.NodesBegin(); it!=r_model_part.NodesEnd(); ++it)
Expand Down Expand Up @@ -2118,7 +2113,7 @@ class ResidualBasedEliminationQuasiIncompressibleBuilderAndSolver
array_1d<double,3> N;
array_1d<double,3> aux0, aux1, aux2; //this are sized to 3 even in 2D!!

//reset the auxilliary vector
//reset the auxiliary vector

for (typename ModelPart::NodesContainerType::iterator it=model_part.NodesBegin(); it!=model_part.NodesEnd(); ++it)
{
Expand Down Expand Up @@ -2572,7 +2567,7 @@ class ResidualBasedEliminationQuasiIncompressibleBuilderAndSolver
//p_n1=(temp+dp);

//and now we multiply the result with the inverse of the lumped mass matrix
//we reutilize the auxilliary matrix temp
//we reutilize the auxiliary matrix temp

for (int ii=0; ii<size; ii++)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class LapModifiedLinearStrategy
new ResidualBasedEliminationBuilderAndSolver<TSparseSpace,TDenseSpace,TLinearSolver>(mpLinearSolver)
);

//set flag to start correcty the calculations
//set flag to start correctly the calculations
mSolutionStepIsInitialized = false;
mInitializeWasPerformed = false;

Expand Down Expand Up @@ -211,7 +211,7 @@ class LapModifiedLinearStrategy
//setting up the builder and solver
mpBuilderAndSolver = pNewBuilderAndSolver;

//set flag to start correcty the calculations
//set flag to start correctly the calculations
mSolutionStepIsInitialized = false;
mInitializeWasPerformed = false;

Expand Down Expand Up @@ -281,9 +281,9 @@ class LapModifiedLinearStrategy

//level of echo for the solving strategy
// 0 -> mute... no echo at all
// 1 -> printing time and basic informations
// 1 -> printing time and basic information
// 2 -> printing linear solver data
// 3 -> Print of debug informations:
// 3 -> Print of debug information:
// Echo of stiffness matrix, Dx, b...
void SetEchoLevel(int Level)
{
Expand Down Expand Up @@ -351,7 +351,7 @@ class LapModifiedLinearStrategy
mInitializeWasPerformed = true;
}

//prints informations about the current time
//prints information about the current time
if (BaseType::GetEchoLevel()!=0 && rank == 0)
{
std::cout << " " << std::endl;
Expand Down
Loading
Loading