Skip to content

Commit 50c0cd7

Browse files
committed
Style: Changed formatting
1 parent ae39688 commit 50c0cd7

66 files changed

Lines changed: 524 additions & 857 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

applications/solvers/solidFoam/Make/options

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ EXE_INC = \
44
-I$(PWD)/../../../src/models/lnInclude \
55
-I$(LIB_SRC)/finiteVolume/lnInclude \
66
-I$(LIB_SRC)/meshTools/lnInclude \
7-
8-
97

108
EXE_LIBS = \
119
-L$(FOAM_USER_LIBBIN) \
@@ -14,4 +12,4 @@ EXE_LIBS = \
1412
-lModels \
1513
-L$(FOAM_LIBBIN) \
1614
-lfiniteVolume \
17-
-lmeshTools
15+
-lmeshTools

applications/solvers/solidFoam/compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ printf "\n\n........................................\n"
44
printf "Compiling solidFoam solver\n"
55
printf "........................................\n\n"
66

7-
wclean && wmake
7+
wclean && wmake

applications/solvers/solidFoam/createFields.H

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
volScalarField Up_time (model.Up_nonLinear());
124124

125125

126-
127126
//-----------------------------------------------------------------------------------
128127
// Gradients
129128
//-----------------------------------------------------------------------------------
@@ -161,7 +160,6 @@
161160
grad.gradient(P, PxGrad, PyGrad, PzGrad);
162161

163162

164-
165163
//-----------------------------------------------------------------------------------
166164
// Reconstruction
167165
//-----------------------------------------------------------------------------------
@@ -201,7 +199,6 @@
201199
// Riemann solver
202200
//-----------------------------------------------------------------------------------
203201

204-
205202
// Contact linear momentum
206203
surfaceVectorField lmC
207204
(
@@ -240,23 +237,19 @@
240237
// Constrained class
241238
interpolationSchemes interpolate(mesh);
242239

243-
244240
// Cell averaged linear momentum
245241
volVectorField lmR (interpolate.surfaceToCell(lmC));
246242

247-
248243
// Local gradient of cell averaged linear momentum
249244
volTensorField lmRgrad (grad.localGradient(lmR, lmC, AvCinv));
250245

251-
252246
// Constrained fluxes
253247
interpolate.volToPoint(lmR, lmRgrad, lmN);
254248
#include "strongBCs.H"
255249
lmN.correctBoundaryConditions();
256250
interpolate.pointToSurface(lmN, lmC);
257251

258252

259-
260253
//-----------------------------------------------------------------------------------
261254
// Angular momentum
262255
//-----------------------------------------------------------------------------------

applications/solvers/solidFoam/gEqns.H

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@ if (angularMomentumConservation == "yes")
66
AM.AMconservation( rhsLm, rhsLm1, rhsAm, RKstage);
77
}
88

9-
109
// Update coordinates
1110
x += deltaT * (lm/rho);
1211
xF += deltaT * (lmC/rho);
1312
xN += deltaT * (lmN/rho);
1413

15-
1614
// Update linear momentum
1715
lm += deltaT * rhsLm;
1816

19-
2017
// Update deformation gradient tensor
21-
F += deltaT * fvc::surfaceIntegrate( (lmC/rho) * Sf );
22-
23-
18+
F += deltaT * fvc::surfaceIntegrate( (lmC/rho) * Sf );

applications/solvers/solidFoam/meshData.H

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
// Point Mesh (pMesh)
66
pointMesh pMesh(mesh);
77

8-
98
// Material face area
109
const surfaceScalarField& magSf (mesh.magSf());
1110

12-
1311
// Material face area normal vector
1412
const surfaceVectorField& Sf (mesh.Sf());
1513

16-
14+
1715
//----------------------------------------------------------------------
1816
// Mesh coordinates
1917
//----------------------------------------------------------------------
@@ -40,7 +38,6 @@
4038
xN.primitiveFieldRef() = mesh.points();
4139

4240

43-
4441
// Material nodal coordinates
4542
pointVectorField xN_0
4643
(
@@ -57,7 +54,6 @@
5754
surfaceVectorField xF = mesh.Cf();
5855

5956

60-
6157
//----------------------------------------------------------------------
6258
// Normals
6359
//----------------------------------------------------------------------
@@ -70,8 +66,6 @@
7066
);
7167

7268

73-
74-
7569
// EDGE TO POINT CONNECTIVITY (edges)
7670
//-----------------------------------
7771
const edgeList& edges = mesh.edges();
@@ -105,8 +99,6 @@
10599
}
106100

107101

108-
109-
110102
// BOUNDARY PATCHES
111103
//-----------------
112104

@@ -117,7 +109,6 @@
117109
const label& symmetricZpatchID = bm.findPatchID("symmetricZ");
118110

119111

120-
121112
// A INVERSE FOR CALCULATION OF GRADIENT (Ainv)
122113
//---------------------------------------------
123114

@@ -129,12 +120,8 @@
129120
);
130121

131122

132-
133-
134123
// Ainv FOR CALCULATION OF GRADIENT FROM CONTACT VALUES (AvCinv)
135124
//--------------------------------------------------------------
136125

137126
// Initialise AvCinv
138-
volTensorField AvCinv(Ainv);
139-
140-
127+
volTensorField AvCinv(Ainv);

applications/solvers/solidFoam/riemannSolver.H

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
//-------------------------
2-
// ACOUSTIC RIEMANN SOLVER
3-
//-------------------------
4-
5-
1+
// Acoustic Riemann solver
62
lmC = 0.5*(lm_M+lm_P) + ( 0.5 * ((nCn/fvc::interpolate(Up)) + (iMnCn/fvc::interpolate(Us))) & (t_P-t_M) );
73
tC = 0.5*(t_M+t_P) + ( 0.5 * ((fvc::interpolate(Up)*nCn) + (fvc::interpolate(Us)*iMnCn)) & (lm_P-lm_M) );
84

@@ -22,6 +18,7 @@ if( Pstream::parRun() )
2218

2319
forAll(mesh.boundary(), patchID)
2420
{
21+
// Riemann solver for inter-processor boundaries
2522
if (mesh.boundary()[patchID].coupled())
2623
{
2724
vectorField lm_nei = lm.boundaryField()[patchID].patchNeighbourField();
@@ -78,8 +75,7 @@ if( Pstream::parRun() )
7875
}
7976

8077

81-
82-
78+
// Compute boundary values
8379
lm_b.correctBoundaryConditions();
8480
t_b.correctBoundaryConditions();
8581

applications/solvers/solidFoam/solidFoam.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ int main(int argc, char *argv[])
9696
return 0;
9797
}
9898

99-
// ************************************************************************* //
99+
// ************************************************************************* //

applications/solvers/solidFoam/strongBCs.H

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@
6464
lmN[nodeID] = iMnCn_ & lmN[nodeID];
6565
}
6666
}
67-
}
67+
}
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
//-----------------------------------------------------------------------------------
32
// Deformation dependent properties
43
//-----------------------------------------------------------------------------------
@@ -8,13 +7,11 @@
87
nCn = n*n;
98
iMnCn = (tensor::I)-(nCn);
109

11-
1210
// Strain measures
1311
Finv = inv(F);
1412
H = det(F)*Finv.T();
1513
J = det(F);
1614

17-
1815
// Wave speeds
1916
Up_time = model.Up_nonLinear();
2017

@@ -25,7 +22,6 @@
2522
P = model.piola();
2623

2724

28-
2925
//-----------------------------------------------------------------------------------
3026
// Linear reconstruction
3127
//-----------------------------------------------------------------------------------
@@ -34,23 +30,20 @@
3430
grad.gradient(lm, lmGrad);
3531
grad.gradient(P, PxGrad, PyGrad, PzGrad);
3632

37-
3833
// Reconstruction
3934
grad.reconstruct( lm, lmGrad, lm_M, lm_P );
4035
grad.reconstruct( P, PxGrad, PyGrad, PzGrad, P_M, P_P) ;
4136
t_M = P_M & N;
4237
t_P = P_P & N;
4338

4439

45-
4640
//-----------------------------------------------------------------------------------
4741
// Riemann solver
4842
//-----------------------------------------------------------------------------------
4943

5044
#include "riemannSolver.H"
5145

5246

53-
5447
//-----------------------------------------------------------------------------------
5548
// Constrained approach
5649
//-----------------------------------------------------------------------------------
@@ -62,10 +55,5 @@
6255
#include "strongBCs.H"
6356
lmN.correctBoundaryConditions();
6457

65-
6658
// Constrained fluxes
67-
interpolate.pointToSurface(lmN, lmC);
68-
69-
70-
71-
59+
interpolate.pointToSurface(lmN, lmC);

applications/utilities/initialConditions/initialConditions.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ int main(int argc, char *argv[])
107107
return 0;
108108
}
109109

110-
// ************************************************************************* //
110+
// ************************************************************************* //

0 commit comments

Comments
 (0)