Skip to content

Commit fe06f1a

Browse files
committed
PR Changes 1
1 parent 4fae88e commit fe06f1a

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

src/pmpo_MPMesh.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,7 @@ void MPMesh::push(){
339339
else
340340
p_MPs->rebuild(); //rebuild pumi-pic
341341
p_MPs->updateMPElmID(); //update mpElm IDs slices
342-
reconstructSlices();
343-
342+
reconstructSlices();
344343
}
345344
while (anyIsMigrating);
346345

src/pmpo_MPMesh_assembly.hpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ void MPMesh::assemblyVtx1() {
150150
//Solve Ax=b for each vertex
151151
Kokkos::View<double*[vec4d_nEntries]> VtxCoeffs("VtxCoeffs", p_mesh->getNumVertices());
152152
Kokkos::parallel_for("solving Ax=b", numVtx, KOKKOS_LAMBDA(const int vtx){
153-
154153
Vec4d v0 = {VtxMatrices(vtx,0,0), VtxMatrices(vtx,0,1), VtxMatrices(vtx,0,2), VtxMatrices(vtx,0,3)};
155154
Vec4d v1 = {VtxMatrices(vtx,1,0), VtxMatrices(vtx,1,1), VtxMatrices(vtx,1,2), VtxMatrices(vtx,1,3)};
156155
Vec4d v2 = {VtxMatrices(vtx,2,0), VtxMatrices(vtx,2,1), VtxMatrices(vtx,2,2), VtxMatrices(vtx,2,3)};
@@ -165,18 +164,8 @@ void MPMesh::assemblyVtx1() {
165164
CholeskySolve4d_UnitRHS(A_regularized, coeff);
166165
for (int i=0; i<vec4d_nEntries; i++)
167166
VtxCoeffs(vtx,i)=coeff[i];
168-
169167
});
170168

171-
/*
172-
Kokkos::fence(); // Ensures synchronization
173-
cudaError_t err = cudaGetLastError();
174-
if (err != cudaSuccess) {
175-
std::cerr << "CUDA error: " << cudaGetErrorString(err) << std::endl;
176-
}
177-
assert(cudaDeviceSynchronize() == cudaSuccess);
178-
*/
179-
180169
//Reconstruct
181170
auto reconstruct = PS_LAMBDA(const int& elm, const int& mp, const int& mask) {
182171
if(mask) { //if material point is 'active'/'enabled'
@@ -205,7 +194,6 @@ void MPMesh::assemblyVtx1() {
205194
for(int k=0; k<numEntries; k++)
206195
meshField(vtx, k) = reconVals(vtx,k);
207196
});
208-
209197
}
210198

211199
template <MeshFieldIndex meshFieldIndex>

src/pmpo_materialPoints.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,7 @@ class MaterialPoints {
215215
auto tgtPosXYZ = MPs->get<MPF_Tgt_Pos_XYZ>();
216216
auto rotLatLonIncr = MPs->get<MPF_Rot_Lat_Lon_Incr>();
217217

218-
auto is_rotated = getRotatedFlag();
219-
218+
auto is_rotated = getRotatedFlag();
220219
auto updateRotLatLon = PS_LAMBDA(const int& elm, const int& mp, const int& mask){
221220
if(mask){
222221
auto rotLat = curPosRotLatLon(mp,0) + rotLatLonIncr(mp,0); // phi

0 commit comments

Comments
 (0)