Skip to content

Commit b380e26

Browse files
committed
Removed debug statements
1 parent 22249f0 commit b380e26

4 files changed

Lines changed: 4 additions & 51 deletions

File tree

src/pmpo_MPMesh.cpp

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@ void MPMesh::calculateStrain(){
2323
auto solveStress = p_mesh->getMeshField<polyMPO::MeshF_SolveStress>();
2424

2525
bool isRotated = p_mesh->getRotatedFlag();
26-
27-
static int strain_count=0;
28-
strain_count ++;
29-
bool debug = false;
30-
if (strain_count < 3) debug = true;
31-
if (debug) printf("Strain count %d ===========\n", strain_count);
32-
26+
3327
auto setMPStrainRate = PS_LAMBDA(const int& elm, const int& mp, const int& mask){
3428
if(mask){
3529

@@ -58,7 +52,7 @@ void MPMesh::calculateStrain(){
5852
double v22 = 0.0;
5953
double uTanOverR = 0.0;
6054
double vTanOverR = 0.0;
61-
55+
6256
for (int i = 0; i < numVtx; i++){
6357
int iVertex = elm2VtxConn(elm, i+1)-1;
6458
v11 = v11 + MPsBasisGrads(mp, i*2 + 0) * velField(iVertex, 0);
@@ -67,17 +61,11 @@ void MPMesh::calculateStrain(){
6761
v22 = v22 + MPsBasisGrads(mp, i*2 + 1) * velField(iVertex, 1);
6862
uTanOverR = uTanOverR + MPsBasis(mp, i) * tanLatVertexRotatedOverRadius(iVertex, 0) * velField(iVertex, 0);
6963
vTanOverR = vTanOverR + MPsBasis(mp, i) * tanLatVertexRotatedOverRadius(iVertex, 0) * velField(iVertex, 1);
70-
if(debug && MPsAppID(mp)==4372){
71-
printf("Velocity %.15e %.15e \n", velField(iVertex, 0), velField(iVertex, 1));
72-
}
7364
}
65+
7466
MPsStrainRate(mp, 0) = v11 - vTanOverR;
7567
MPsStrainRate(mp, 1) = v22;
7668
MPsStrainRate(mp, 2) = 0.5*(v12 + v21 + uTanOverR);
77-
78-
if(debug && MPsAppID(mp)==4372){
79-
printf("Strain %.15e %.15e %.15e \n", MPsStrainRate(mp, 0), MPsStrainRate(mp, 1), MPsStrainRate(mp, 2));
80-
}
8169
}
8270
};
8371
p_MPs->parallel_for(setMPStrainRate, "setMPStrainRate");
@@ -97,26 +85,17 @@ void MPMesh::calculateStress(const int constitutive_relation){
9785
auto MPsIcePressure = p_MPs->getData<polyMPO::MPF_IcePressure>();
9886
auto MPsRepPressure = p_MPs->getData<polyMPO::MPF_ReplacementPressure>();
9987

100-
static int stress_count=0;
101-
stress_count ++;
102-
bool debug = false;
103-
if (stress_count < 3) debug = true;
104-
10588
auto setMPStress = PS_LAMBDA(const int& elm, const int& mp, const int& mask){
10689
if(mask){
10790
Vec3d strain_rate (MPsStrainRate(mp, 0), MPsStrainRate(mp, 1), MPsStrainRate(mp, 2));
10891
Vec3d stress(MPsStress(mp, 0), MPsStress(mp, 1), MPsStress(mp, 2));
10992

11093
if (constitutive_relation == 1)
111-
constitutive_evp(strain_rate, stress, MPsIcePressure(mp, 0), MPsRepPressure(mp, 0), MPsArea(mp, 0), elasticTimeStep, dampingTimescale);
94+
constitutive_evp(strain_rate, stress, MPsIcePressure(mp,0), MPsRepPressure(mp,0), MPsArea(mp,0), elasticTimeStep, dampingTimescale);
11295
else if(constitutive_relation == 3)
11396
constitutive_linear(strain_rate, stress);
11497
for (int m=0 ; m<3; m++)
11598
MPsStress(mp, m) = stress[m]*solveStress(elm);
116-
117-
if(debug && MPsAppID(mp)==4372){
118-
printf("Stress %.15e %.15e %.15e \n", MPsStress(mp, 0), MPsStress(mp, 1), MPsStress(mp, 2));
119-
}
12099
}
121100
};
122101
p_MPs->parallel_for(setMPStress, "setMPStress");
@@ -190,7 +169,6 @@ void MPMesh::calculateStressDivergence(){
190169
2 * tanLatVertexRotatedOverRadius(vID, 0) * w_vtx * MPsStress(mp, 2));
191170
Kokkos::atomic_add(&divUV_edge(vID, 1), - weight_grads(mp, i*2 + 1) * MPsStress(mp, 1) - weight_grads(mp, i*2 + 0) * MPsStress(mp, 2) +
192171
w_vtx * tanLatVertexRotatedOverRadius(vID, 0) * (MPsStress(mp, 0)- MPsStress(mp, 1)));
193-
194172
}
195173
}
196174
};
@@ -216,16 +194,6 @@ void MPMesh::calculateStressDivergence(){
216194
});
217195

218196
pumipic::RecordTime("Stress_Divergence_Reconstruction" + std::to_string(self), timer.seconds());
219-
220-
static int strain_count=0;
221-
strain_count ++;
222-
if (strain_count >= 3) return;
223-
224-
Kokkos::parallel_for("debug_rec", numVertices, KOKKOS_LAMBDA(const int vtx){
225-
if(vtx ==45028)
226-
printf("Reconstructed SD %.15e %.15e \n", stressDivergence(vtx, 0), stressDivergence(vtx, 1));
227-
});
228-
229197
}
230198

231199
void MPMesh::calcBasis() {

src/pmpo_MPMesh_assembly.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,6 @@ void MPMesh::assemblyVtx1(){
384384
communicate_and_take_halo_contributions(meshField, numVertices, numEntries, 1, 1);
385385
}
386386
pumipic::RecordTime("Communicate Field Values" + std::to_string(self), timer.seconds());
387-
388-
//Debugging
389-
Kokkos::parallel_for("debug_rec", numVertices, KOKKOS_LAMBDA(const int iVertex){
390-
if(iVertex ==45028)
391-
printf("Reconstructed velocity for strain rate %.15e %.15e \n", meshField(iVertex, 0), meshField(iVertex, 1));
392-
});
393-
394387
}
395388

396389
//Start Communication routine

src/pmpo_materialPoints.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,6 @@ class MaterialPoints {
264264
MPsStress(mp,0) = stress_prev[0] * (1 - MPsStressMetric(mp, 1)) + 2 * MPsStressMetric(mp, 1) * stress_prev[2];
265265
MPsStress(mp,1) = stress_prev[1] + 2*MPsStressMetric(mp, 0) * stress_prev[2];
266266
MPsStress(mp,2) = stress_prev[2] + MPsStressMetric(mp, 0) * (stress_prev[0] - stress_prev[1]);
267-
268-
if(mpAppID(mp)==4372){
269-
printf("Current Position %.15e %.15e %.15e \n", curPosXYZ(mp, 0), curPosXYZ(mp, 1), curPosXYZ(mp, 2));
270-
printf("Final Position %.15e %.15e %.15e \n", tgtPosXYZ(mp, 0), tgtPosXYZ(mp, 1), tgtPosXYZ(mp, 2));
271-
printf("Final Velocity %.15e %.15e \n", velMPs(mp, 0), velMPs(mp, 1));
272-
273-
}
274267
}
275268
};
276269
ps::parallel_for(MPs, updateRotLatLon,"updateRotationalLatitudeLongitude");

src/pmpo_wachspressBasis.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ void sphericalInterpolation(MPMesh& mpMesh){
3434
double mpValue = 0.0;
3535
for(int i=1; i<= numVtx; i++){
3636
mpValue += meshField(elm2VtxConn(elm,i)-1,entry)*MPsBasis(mp,i-1);
37-
//if(MPsAppID(mp) == 4372) printf("Vertex %d F %.15e \n", elm2VtxConn(elm,i)-1, meshField(elm2VtxConn(elm,i)-1,entry) );
3837
}
3938
mpField(mp,entry) = mpValue;
4039
}

0 commit comments

Comments
 (0)