Skip to content
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

Fix: Extra Semicolons & In-Line Doxygen #1109

Merged
merged 1 commit into from
Jun 19, 2020
Merged
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
2 changes: 1 addition & 1 deletion Source/Diagnostics/Diagnostics.H
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public:
*/
virtual bool DoDump (int step, int i_buffer, bool force_flush=false) = 0;
/** Start a new iteration, i.e., dump has not been done yet. */
void NewIteration () {m_already_done = false;};
void NewIteration () {m_already_done = false;}
/** Perform necessary operations with user-defined diagnostic parameters
* to filter (coarsen, slice), compute (cell-center, back-transform),
* and flush the output data stored in buffers, m_mf_output.
Expand Down
4 changes: 2 additions & 2 deletions Source/Diagnostics/WarpXOpenPMD.H
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public:
WarpXParticleCounter(WarpXParticleContainer* pc);
unsigned long GetTotalNumParticles() {return m_Total;}

std::vector<unsigned long long> m_ParticleOffsetAtRank;;
std::vector<unsigned long long> m_ParticleSizeAtRank;;
std::vector<unsigned long long> m_ParticleOffsetAtRank;
std::vector<unsigned long long> m_ParticleSizeAtRank;
private:
/** get the offset in the overall particle id collection
*
Expand Down
8 changes: 4 additions & 4 deletions Source/Particles/ParticleCreation/FilterCopyTransform.H
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Index filterCopyTransformParticles (DstTile& dst, SrcTile& src, Index* mask, Ind
copy(dst_data, src_data, i, N*p_offsets[i] + dst_index + j);
transform(dst_data, src_data, i, N*p_offsets[i] + dst_index);
}
});
})

Gpu::streamSynchronize();
return num_added;
Expand Down Expand Up @@ -143,7 +143,7 @@ Index filterCopyTransformParticles (DstTile& dst, SrcTile& src, Index dst_index,
AMREX_HOST_DEVICE_FOR_1D(np, i,
{
p_mask[i] = filter(src_data, i);
});
})

return filterCopyTransformParticles<N>(dst, src, mask.dataPtr(), dst_index,
std::forward<CopyFunc>(copy),
Expand Down Expand Up @@ -235,7 +235,7 @@ Index filterCopyTransformParticles (DstTile& dst1, DstTile& dst2, SrcTile& src,
N*p_offsets[i] + dst1_index,
N*p_offsets[i] + dst2_index);
}
});
})

Gpu::streamSynchronize();
return num_added;
Expand Down Expand Up @@ -303,7 +303,7 @@ Index filterCopyTransformParticles (DstTile& dst1, DstTile& dst2, SrcTile& src,
AMREX_HOST_DEVICE_FOR_1D(np, i,
{
p_mask[i] = filter(src_data, i);
});
})

return filterCopyTransformParticles<N>(dst1, dst2, src, mask.dataPtr(),
dst1_index, dst2_index,
Expand Down
2 changes: 1 addition & 1 deletion Source/Particles/RigidInjectedParticleContainer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt,
);
} else {
amrex::Abort("Unknown particle pusher");
};
}

// Undo the push for particles not injected yet.
// It is assumed that PushP will only be called on the first and last steps
Expand Down
2 changes: 1 addition & 1 deletion Source/Particles/ShapeFactors.H
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
int compute_shape_factor(amrex::Real* const sx, amrex::Real xint)
{
return 0;
};
}

/**
* Compute shape factor and return index of leftmost cell where
Expand Down
2 changes: 1 addition & 1 deletion Source/Utils/CoarsenIO.H
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace CoarsenIO{
}
}
return c;
};
}

/**
* \brief Loops over the boxes of the coarsened MultiFab \c mf_dst and fills
Expand Down
2 changes: 1 addition & 1 deletion Source/Utils/CoarsenMR.H
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ namespace CoarsenMR{
}
}
return c;
};
}

/**
* \brief Loops over the boxes of the coarsened MultiFab \c mf_dst and fills
Expand Down
4 changes: 2 additions & 2 deletions Source/Utils/WarpXMovingWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir,
AMREX_PARALLEL_FOR_4D ( outbox, nc, i, j, k, n,
{
srcfab(i,j,k,n) = external_field;
});
})
} else if (useparser == true) {
// index type of the src mf
auto const& mf_IndexType = (tmpmf).ixType();
Expand Down Expand Up @@ -350,7 +350,7 @@ WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir,
AMREX_PARALLEL_FOR_4D ( dstBox, nc, i, j, k, n,
{
dstfab(i,j,k,n) = srcfab(i+shift.x,j+shift.y,k+shift.z,n);
});
})
}
}

Expand Down
2 changes: 1 addition & 1 deletion Source/Utils/WarpXUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void NullifyMF(amrex::MultiFab& mf, int lev, amrex::Real zmin, amrex::Real zmax)
#endif
if ( (z_gridpoint >= zmin) && (z_gridpoint < zmax) ) {
arr(i,j,k) = 0.;
};
}
}
);
}
Expand Down
4 changes: 2 additions & 2 deletions Source/WarpX.H
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ public:
WarpX ();
~WarpX ();

static std::string Version (); //! Version of WarpX executable
static std::string PicsarVersion (); //! Version of PICSAR dependency
static std::string Version (); //!< Version of WarpX executable
static std::string PicsarVersion (); //!< Version of PICSAR dependency

int Verbose () const { return verbose; }

Expand Down