Skip to content

Commit

Permalink
Corrected some typos in the source code comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@wenqing
wenqing committed Nov 26, 2018
1 parent 1aa5157 commit f847391
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 82 deletions.
2 changes: 1 addition & 1 deletion FEM/problem.cpp
View file
Expand Up @@ -1787,7 +1787,7 @@ const std::string& Problem::getGeoObjName() const

/*-------------------------------------------------------------------------
GeoSys - Function: LiquidFlow
Task: Similate liquid flow
Task: Simulate liquid flow
Return: error
Programming:
07/2008 WW Extract from LOPTimeLoop_PCS();
Expand Down
2 changes: 1 addition & 1 deletion FEM/problem.h
View file
Expand Up @@ -69,7 +69,7 @@ class Problem
/**
* Get the name of the project. The name is used by GEOLIB::GEOObjects
* to access the geometric data.
* @return the name to acces geometric data
* @return the name to access geometric data
*/
const std::string& getGeoObjName() const;

Expand Down
38 changes: 19 additions & 19 deletions FEM/rf_msp_new.cpp
View file
Expand Up @@ -64,7 +64,7 @@ double TemperatureUnitOffset()
FEMLib-Method:
Task: OBJ read function
Programing:
08/2004 OK Implementation for fuild properties
08/2004 OK Implementation for fluid properties
08/2004 WW Modification for solid properties
12/2005 WW Creep properties
**************************************************************************/
Expand Down Expand Up @@ -1280,7 +1280,7 @@ double CSolidProperties::CalulateValue(const Matrix* data, const double x) const
return 0.0;

const int Size = data->Rows();
// If given varial is not in the range of data
// If the given variable is not in the range of data
if (x < (*data)(0, 0))
Val = (*data)(0, 1);
else if (x >= (*data)(Size - 1, 0))
Expand Down Expand Up @@ -2469,7 +2469,7 @@ void CSolidProperties::CalculateTransformMatrixFromNormalVector(const int Dimens
double CSolidProperties::GetAngleCoefficent_DP(const double Angle)
{
double val = 0.0;
// Input as a coefficent
// Input as a coefficient
if (Angle < 0.0)
val = fabs(Angle);
else // Input as a dialatant angle
Expand All @@ -2483,13 +2483,13 @@ double CSolidProperties::GetAngleCoefficent_DP(const double Angle)
}
return val;
}
// WW. 09/02. Cumpute yield coefficient, beta
// WW. 09/02. Compute yield coefficient, beta
// For plane strain
// al = 6.0*c*cos(a)/sqrt(3)/(3-sin(a))
double CSolidProperties::GetYieldCoefficent_DP(const double Angle)
{
double val = 0.0;
// Input as a coefficent
// Input as a coefficient
if (Angle < 0.0 || Angle < MKleinsteZahl)
val = 1.0;
else // Input as a dialatant angle
Expand Down Expand Up @@ -2573,7 +2573,7 @@ void CSolidProperties::CalculateCoefficent_HOEKBROWN() // WX: 02.2011
ROCKFLOW - Funktion: StressIntegrationDP
Aufgabe:
Computing the stresses at a point and return the plastical status of this
Computing the stresses at a point and return the plastic status of this
point (Return mapping method)
Formalparameter: (E: Eingabe; R: Rueckgabe; X: Beides)
Expand All @@ -2592,7 +2592,7 @@ void CSolidProperties::CalculateCoefficent_HOEKBROWN() // WX: 02.2011
const int Update : Indicator to store the stress or not.
Ergebnis:
- double* - Deviatoric effetive stresses, s11,s22,s12,s33
- double* - Deviatoric effective stresses, s11,s22,s12,s33
Programmaenderungen:
09/2002 WW Erste Version
Expand Down Expand Up @@ -4913,7 +4913,7 @@ int CSolidProperties::DirectStressIntegrationMOHR(const int GPiGPj, ElementValue
return yield;
}

// WX: calculte prin. stress and direc.
// WX: calculate prin. stress and direc.
void CSolidProperties::CalPrinStrDir(double* stress, double* prin_str, double* prin_dir, int Dim)
{
int i, j, p, q, u, w, t, s, l;
Expand Down Expand Up @@ -5433,7 +5433,7 @@ void CSolidProperties::AllocateMemoryforSYS()
{
d2G_dSdS = new Matrix(6, 6);
d2G_dSdM = new Matrix(6, 4);
// Stresses, 0-5, xi, 6-10, mat, 11-17, plastci multiplier, 18.
// Stresses, 0-5, xi, 6-10, mat, 11-17, plastic multiplier, 18.
LocalJacobi = new Matrix(19, 19);
inv_Jac = new Matrix(18, 18);
sumA_Matrix = new Matrix(18, 6);
Expand Down Expand Up @@ -5466,7 +5466,7 @@ void CSolidProperties::ResizeMatricesSYS(const int Dim)
ROCKFLOW - Funktion: CSolidProperties::CalStress_and_TangentialMatrix_SYS
Aufgabe:
Using the substteping techniques to compute the integral of stresses and
Using the substepping techniques to compute the integral of stresses and
the consistent tangential matrix.
(Weimar's model)
Expand All @@ -5482,7 +5482,7 @@ void CSolidProperties::ResizeMatricesSYS(const int Dim)
1: Save Gauss points values
Ergebnis:
- double* - Deviatoric effetive stresses, s11,s22,s12,s33
- double* - Deviatoric effective stresses, s11,s22,s12,s33
Programmaenderungen:
04/2003 WW Erste Version
Expand Down Expand Up @@ -6633,7 +6633,7 @@ void CSolidProperties::dG__dStress_dStress(const double* DevS, const double* Rot
Aufgabe:
Computing the second derivatives of the plastic potential with respect to
stresses and with recpect to material parameters (Weimar's model)
stresses and with respect to material parameters (Weimar's model)
Formalparameter: (E: Eingabe; R: Rueckgabe; X: Beides)
E :
Expand Down Expand Up @@ -6925,7 +6925,7 @@ void CSolidProperties::Gauss_Back(const int DimE, Matrix& AA, double* rhs, int*
ROCKFLOW - Funktion: CSolidProperties::CalStress_and_TangentialMatrix_CC
Aufgabe:
Computing the stresses at Gauss point and return the plastical status of this
Computing the stresses at Gauss point and return the plastic status of this
point. Plastic model: Cam-Clay.
(Explicit integration of elastic model)
Expand All @@ -6939,7 +6939,7 @@ void CSolidProperties::Gauss_Back(const int DimE, Matrix& AA, double* rhs, int*
values
Ergebnis:
- double* - Deviatoric effetive stresses, s11,s22,s12,s33
- double* - Deviatoric effective stresses, s11,s22,s12,s33
Programmaenderungen:
11/2003 WW Erste Version
Expand Down Expand Up @@ -7411,10 +7411,10 @@ void CSolidProperties::CalStress_and_TangentialMatrix_CC(const int GPiGPj, const
values
Ergebnis:
- double* - Deviatoric effetive stresses, s11,s22,s12,s33
- double* - Deviatoric effective stresses, s11,s22,s12,s33
Programmaenderungen:
06/2008 WW Programming
06/2008 WW Programing
**************************************************************************/
void CSolidProperties::CalStress_and_TangentialMatrix_CC_SubStep(const int GPiGPj, const ElementValue_DM* ele_val,
double* dStrain, Matrix* Dep, const int Update)
Expand Down Expand Up @@ -7891,7 +7891,7 @@ void CSolidProperties::CleanTrBuffer_HL_ODS()
}
/**************************************************************************
FEMLib-Method:
Task: Caculate increment of strain induced by HL creep model
Task: Calculate increment of strain induced by HL creep model
Programing:
10/2008 UJG/WW
last modified:
Expand Down Expand Up @@ -7921,7 +7921,7 @@ void CSolidProperties::CalcYoungs_SVV(const double strain_v)
}
/**************************************************************************
FEMLib-Method:
Task: Caculate increment of strain induced by HL creep model
Task: Calculate increment of strain induced by HL creep model
Programing:
10/2008 UJG/WW
last modified:
Expand Down Expand Up @@ -8350,7 +8350,7 @@ double TensorMutiplication2(const double* s1, const double* s2, const int Dim)

/**************************************************************************
GeoSys: Norm of stress
06/2008 WW Programming
06/2008 WW Programing
**************************************************************************/
double StressNorm(const double* s, const int Dim)
Expand Down
72 changes: 11 additions & 61 deletions FEM/rf_pcs.h
View file
Expand Up @@ -367,15 +367,7 @@ class CRFProcess : public ProcessInfo
Problem* getProblemObjectPointer() const;
std::string geo_type; // OK
std::string geo_type_name; // OK
//....................................................................
// 2-MSH
//....................................................................
// 3-TIM
//....................................................................
// 4-IC
//....................................................................
// 5-BC
// WW

std::vector<CBoundaryConditionNode*> bc_node_value;
std::vector<CBoundaryCondition*> bc_node; // WW
#if !defined(USE_PETSC) // && !defined(other parallel libs)//03.3012. WW
Expand All @@ -388,7 +380,6 @@ class CRFProcess : public ProcessInfo
void UpdateTransientBC(); // WW/CB
void UpdateTransientST(); // WW/CB...BG
//....................................................................
// 6-ST
// Node values from sourse/sink or Neumann BC. WW
std::vector<CNodeValue*> st_node_value; // WW
// Contains only pointers to CSourceTerm (held by st_vector).
Expand All @@ -412,28 +403,13 @@ class CRFProcess : public ProcessInfo

FiniteElement::CFiniteElementStd* getLinearFEMAssembler() { return fem; }

//....................................................................
// 7-MFP
//....................................................................
// 8-MSP
//....................................................................
// 9-MMP
int GetContinnumType() const { return continuum; }
// const int number_continuum=1;
std::vector<double> continuum_vector;
//....................................................................
// 10-MCP
//....................................................................
// 11-OUT

void WriteSolution(); // WW
void ReadSolution(); // WW
//....................................................................
// 12-NUM
//....................................................................
// 13-ELE
//----------------------------------------------------------------------
// Methods
//....................................................................
// Construction / destruction
CRFProcess(void);
void Create(void);
Expand All @@ -444,39 +420,15 @@ class CRFProcess : public ProcessInfo
std::ios::pos_type Read(std::ifstream*);
void PCSReadConfigurations();
void Write(std::fstream*);
//....................................................................
// 1-GEO
//....................................................................
// 2-MSH
//....................................................................
// 3-TIM
//....................................................................
// 4-IC
//....................................................................
// 5-BC

void SetBC(); // OK
void WriteBC(); // 15.01.2008. WW
//....................................................................

void SetBoundaryConditionAndSourceTerm();

//....................................................................
// 7-MFP
//....................................................................
// 8-MSP
//....................................................................
// 9-MMP
//....................................................................
// 10-MCP
//....................................................................
// 11-OUT
void WriteAllVariables(); // OK
//....................................................................
// 12-NUM
//....................................................................
// 13-ELE
//....................................................................
// 14-CPL

void SetCPL(); // OK8 OK4310
//....................................................................
// 15-EQS
Expand Down Expand Up @@ -686,18 +638,18 @@ class CRFProcess : public ProcessInfo
//---WW
CFiniteElementStd* GetAssember() { return fem; }
void AllocateLocalMatrixMemory();
virtual void GlobalAssembly(); // Make as a virtul function. //10.09.201l. WW
virtual void GlobalAssembly(); // Make as a virtual function. //10.09.201l. WW
/// For all PDEs excluding that for deformation. 24.11.2010l. WW
void GlobalAssembly_std(const bool is_mixed_order, bool Check2D3D = false);
/// Assemble EQS for deformation process.
virtual void GlobalAssembly_DM(){};
#if defined(NEW_EQS) && defined(JFNK_H2M)
/// Jacobian free methid to calculate J*v.
/// Jacobian free method to calculate J*v.
// 11.08.2010.
void Jacobian_Multi_Vector_JFNK(double* v = NULL, double* Jv = NULL);
/// Recovery du from the temporary vector.
void Recovery_du_JFNK(); // 02.11.2010.
/// Line serach for Newton method.
/// Line search for Newton method.
double LineSearch(); // 10.12.2010.
/// Force term control for inexact Newton method. 01.2011.
bool ForceTermCriterion(double* Jdx, const int num_iteration);
Expand Down Expand Up @@ -792,7 +744,7 @@ class CRFProcess : public ProcessInfo
inline void setBC_danymic_problems();
inline void setST_danymic_problems();
inline void setIC_danymic_problems();
// Extropolate Gauss point values to node values. WW
// Extrapolate Gauss point values to node values. WW
void Extropolation_GaussValue();
void Extropolation_MatValue(); // WW
// WW. 05.2009
Expand All @@ -816,8 +768,6 @@ class CRFProcess : public ProcessInfo
// Remove argument. WW
void CalcSecondaryVariables(bool initial = false);
void MMPCalcSecondaryVariablesRichards(int timelevel, bool update);
// WW Reomve int timelevel, bool update
// WW

void CalcSecondaryVariablesTNEQ(); // HS
void CalcSecondaryVariablesTES(); // HS
Expand Down Expand Up @@ -895,7 +845,7 @@ class CRFProcess : public ProcessInfo
/// Initialize the RHS array of the system of equations with the previous solution.
void InitializeRHS_with_u0(const bool quad = false); // in rf_pcs1.cpp

/// Initialize the unknows of equations with existing solutions within a index range.
/// Initialize the unknowns of equations with existing solutions within a index range.
void initializeRHS_with_u0(const int min_id, const int max_id); // in rf_pcs1.cpp
#endif

Expand Down Expand Up @@ -935,7 +885,7 @@ extern void PCSDestroyAllProcesses(void);

extern CRFProcess* PCSGet(const std::string&);
/**
* Function searchs in the global pcs_vector for a process with the process type pcs_type.
* Function searches in the global pcs_vector for a process with the process type pcs_type.
* @param pcs_type process type
* @return a pointer the the appropriate process or NULL (if not found)
*/
Expand All @@ -951,7 +901,7 @@ extern int PCSGetPCSIndex(const std::string&, const std::string&);
extern CRFProcess* PCSGet(const std::string&, const std::string&);

/**
* Function searchs in the global pcs_vector for a process
* Function searches in the global pcs_vector for a process
* with the process type pcs_type and the primary function name
* pv_name
* @param pcs_type the process type
Expand Down

0 comments on commit f847391

Please sign in to comment.