Skip to content

Commit

Permalink
Undo some changes, add new ones
Browse files Browse the repository at this point in the history
  • Loading branch information
eebasso committed Dec 14, 2023
1 parent e26cd6e commit 0794622
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 22 deletions.
2 changes: 2 additions & 0 deletions Src/Base/AMReX_FBI.H
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ FabArray<FAB>::FB_unpack_recv_buffer_cuda_graph (const FB& TheFB, int dcomp, int
}

#endif /* __CUDACC__ */

template <class FAB>
template <typename BUF>
void
Expand Down Expand Up @@ -892,6 +893,7 @@ FabArray<FAB>::unpack_recv_buffer_gpu (FabArray<FAB>& dst, int dcomp, int ncomp,
}

#endif /* AMREX_USE_GPU */

template <class FAB>
template <typename BUF>
void
Expand Down
17 changes: 9 additions & 8 deletions Src/Base/AMReX_Geometry.H
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@
#include <map>

namespace amrex {
/**
* \class Geometry
* \brief Rectangular problem domain geometry.
*
* This class describes problem domain and coordinate system for
* RECTANGULAR problem domains. Since the problem domain is RECTANGULAR,
* periodicity is meaningful.
*/

class MultiFab;
class DistributionMapping;
class BoxArray;
Expand Down Expand Up @@ -66,6 +59,14 @@ public:
int coord;
};

/**
* \class Geometry
* \brief Rectangular problem domain geometry.
*
* This class describes problem domain and coordinate system for
* RECTANGULAR problem domains. Since the problem domain is RECTANGULAR,
* periodicity is meaningful.
*/
class Geometry
:
public CoordSys
Expand Down
28 changes: 15 additions & 13 deletions Src/Base/AMReX_MultiFabUtil.H
Original file line number Diff line number Diff line change
Expand Up @@ -637,12 +637,13 @@ void average_down (const FabArray<FAB>& S_fine, FabArray<FAB>& S_crse,



/**
* \brief Returns part of a norm based on two MultiFabs
* The MultiFabs MUST have the same underlying BoxArray.
* The function f is applied elementwise as f(x(i,j,k,n),y(i,j,k,n))
* inside the summation (subject to a valid mask entry pf(mask(i,j,k,n)
*/
/**
* \brief Returns part of a norm based on two MultiFabs.
*
* The MultiFabs MUST have the same underlying BoxArray.
* The function f is applied elementwise as f(x(i,j,k,n),y(i,j,k,n))
* inside the summation (subject to a valid mask entry pf(mask(i,j,k,n)
*/
template <typename F>
Real
NormHelper (const MultiFab& x, int xcomp,
Expand Down Expand Up @@ -695,13 +696,14 @@ NormHelper (const MultiFab& x, int xcomp,
return sm;
}

/**
* \brief Returns part of a norm based on three MultiFabs
* The MultiFabs MUST have the same underlying BoxArray.
* The Predicate pf is used to test the mask
* The function f is applied elementwise as f(x(i,j,k,n),y(i,j,k,n))
* inside the summation (subject to a valid mask entry pf(mask(i,j,k,n)
*/
/**
* \brief Returns part of a norm based on three MultiFabs
*
* The MultiFabs MUST have the same underlying BoxArray.
* The Predicate pf is used to test the mask
* The function f is applied elementwise as f(x(i,j,k,n),y(i,j,k,n))
* inside the summation (subject to a valid mask entry pf(mask(i,j,k,n)
*/
template <typename MMF, typename Pred, typename F>
Real
NormHelper (const MMF& mask,
Expand Down
1 change: 1 addition & 0 deletions Src/Base/Parser/AMReX_Parser_Y.H
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ double parser_get_number (struct parser_node* node);
void parser_set_number (struct parser_node* node, double v);
bool parser_node_equal (struct parser_node* a, struct parser_node* b);
/*******************************************************************/

template <typename T>
AMREX_GPU_HOST_DEVICE AMREX_NO_INLINE
T parser_math_exp (T a) { return std::exp(a); }
Expand Down
1 change: 0 additions & 1 deletion Src/Particle/AMReX_ParticleTransformation.H
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,6 @@ int filterAndTransformParticles (DstTile1& dst1, DstTile2& dst2, const SrcTile&
* \param p predicate function - particles will be copied if p returns true
* \param src_start the offset at which to start reading particles from src
* \param dst_start the offset at which to start writing particles to dst
* \param n the number of particles to apply the operation to
*
*/
template <typename DstTile, typename SrcTile, typename Pred, typename F, typename Index,
Expand Down

0 comments on commit 0794622

Please sign in to comment.