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.

Sign up for GitHub

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

Jump to bottom

Progress on 3D - domain_indirect_neighbors #277

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Progress on 3D - domain_indirect_neighbors #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9adb255
Feature 3D: add 3d version of indirect exchange
hannesbrandt Sep 19, 2023
9e13d68
Feature 3d: minor changes to documentation of indirect exchange
hannesbrandt Sep 19, 2023
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
143 changes: 62 additions & 81 deletions src/forestclaw2d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1828,10 +1828,6 @@ struct fclaw2d_domain_indirect
fclaw2d_domain_exchange_t *e;
};

/* These static functions are unused in 3D as long as the 3D case is not
* implemented.
*/
#ifndef P4_TO_P8
static void
indirect_encode (p4est_ghost_t * ghost, int mpirank,
int *rproc, int *rpatchno)
Expand Down Expand Up @@ -1863,38 +1859,40 @@ indirect_match (int *pi,
FCLAW_ASSERT (rpatchno != NULL && rfaceno != NULL);

*rproc = pi;
*rblockno = pi + 2;
*rpatchno = pi + 3;
*rfaceno = pi + 5;
*rblockno = pi + P4EST_HALF;
*rpatchno = pi + P4EST_HALF + 1;
*rfaceno = pi + P4EST_CHILDREN + 1; /* P4EST_CHILDREN == 2 * P4EST_HALF */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please can you use P4EST_CHILDREN only if referring to the volumetric refinement? In this code, it seems more to the point to write pi + P4EST_HALF + 1 + P4EST_HALF.

}
#endif


fclaw2d_domain_indirect_t *
fclaw2d_domain_indirect_begin (fclaw2d_domain_t * domain)
{
#ifndef P4_TO_P8
int num_exc;
int neall, nb, ne, np;
int face;
int *pbdata, *pi;
int *rproc, *rblockno, *rpatchno, *rfaceno;
int face_info_size;
size_t data_size;
int sf;
fclaw2d_block_t *block;
fclaw2d_domain_indirect_t *ind;
fclaw2d_patch_relation_t prel;
p4est_wrap_t *wrap = (p4est_wrap_t *) domain->pp;
p4est_ghost_t *ghost = p4est_wrap_get_ghost (wrap);

num_exc = domain->num_exchange_patches;
data_size = P4EST_FACES * 6 * sizeof (int);
face_info_size = 2 + P4EST_CHILDREN; /* P4EST_CHILDREN == 2 * P4EST_HALF */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above, this identity should not be used. P4EST_HALF should be used when referring to small face neighbors, and P4EST_CHILDREN when referring to children. Thanks for the good work!

data_size = P4EST_FACES * face_info_size * sizeof (int);

/* allocate internal state for this operation */
ind = FCLAW_ALLOC_ZERO (fclaw2d_domain_indirect_t, 1);
ind->domain = domain;
ind->e = fclaw2d_domain_allocate_before_exchange (domain, data_size);

/* loop through exchange patches and fill their neighbor information */
pbdata = pi = FCLAW_ALLOC (int, num_exc * P4EST_FACES * 6);
pbdata = pi = FCLAW_ALLOC (int, num_exc * P4EST_FACES * face_info_size);
for (neall = 0, nb = 0; nb < domain->num_blocks; ++nb)
{
block = domain->blocks + nb;
Expand All @@ -1917,19 +1915,24 @@ fclaw2d_domain_indirect_begin (fclaw2d_domain_t * domain)
&rproc[0], &rpatchno[0]);
if (prel == FCLAW2D_PATCH_HALFSIZE)
{
indirect_encode
(ghost, domain->mpirank, &rproc[1], &rpatchno[1]);
for (sf = 1; sf < P4EST_HALF; sf++)
{
indirect_encode
(ghost, domain->mpirank, &rproc[sf],
&rpatchno[sf]);
}
*rfaceno |= 1 << 26;
}
else if (prel == FCLAW2D_PATCH_DOUBLESIZE)
{
*rfaceno |= 1 << 27;
}
pi += 6;
pi += face_info_size;
}
}
}
FCLAW_ASSERT ((int) (pi - pbdata) == neall * P4EST_FACES * 6);
FCLAW_ASSERT ((int) (pi - pbdata) ==
neall * P4EST_FACES * face_info_size);
FCLAW_ASSERT (neall == num_exc);

/* post messages */
Expand All @@ -1940,19 +1943,11 @@ fclaw2d_domain_indirect_begin (fclaw2d_domain_t * domain)
FCLAW_FREE (pbdata);

return ind;
#else
FCLAW_ASSERT (domain != NULL);

/* The 3D case is currently not implemented. */

return NULL;
#endif
}

/* These static functions are unused in 3D as long as the 3D case is not
* implemented.
*/
#ifndef P4_TO_P8
static uint64_t
pli_make_key (int p, int rpatchno)
{
Expand Down Expand Up @@ -2025,13 +2020,11 @@ indirect_decode (sc_hash_t * pli_hash, uint64_t * pli_keys,

return good;
}
#endif

void
fclaw2d_domain_indirect_end (fclaw2d_domain_t * domain,
fclaw2d_domain_indirect_t * ind)
{
#ifndef P4_TO_P8
int ndgp;
int good, good2;
int p, ng;
Expand All @@ -2042,6 +2035,8 @@ fclaw2d_domain_indirect_end (fclaw2d_domain_t * domain,
int face;
int *rproc, *rblockno, *rpatchno, *rfaceno;
int *pi;
int face_info_size;
int sf;
uint64_t *pli_keys, *plik;
sc_hash_t *pli_hash;
p4est_wrap_t *wrap = (p4est_wrap_t *) domain->pp;
Expand Down Expand Up @@ -2081,6 +2076,7 @@ fclaw2d_domain_indirect_end (fclaw2d_domain_t * domain,
fclaw2d_domain_ghost_exchange_end (domain, ind->e);

/* go through ghosts a second time, now working on received data */
face_info_size = 2 + P4EST_CHILDREN; /* P4EST_CHILDREN == 2 * P4EST_HALF */
for (ng = 0, p = 0; p < domain->mpisize; ++p)
{
for (; ng < (int) ghost->proc_offsets[p + 1]; ++ng)
Expand All @@ -2104,27 +2100,35 @@ fclaw2d_domain_indirect_end (fclaw2d_domain_t * domain,
(0 <= rpatchno[0] && rpatchno[0] < ndgp));
if (*rfaceno & (1 << 26))
{
/* check second of two halfsize neighbors */
FCLAW_ASSERT (rproc[1] != p);
good2 = indirect_decode (pli_hash, pli_keys,
domain->mpisize, domain->mpirank,
&rproc[1], &rpatchno[1]);
good = good || good2;
FCLAW_ASSERT ((rproc[1] == -1 && rpatchno[1] == -1) ||
(0 <= rpatchno[1] && rpatchno[1] < ndgp));
/* check remaining of P4EST_HALF halfsize neighbors */
for (sf = 1; sf < P4EST_HALF; sf++)
{
FCLAW_ASSERT (rproc[sf] != p);
good2 = indirect_decode (pli_hash, pli_keys,
domain->mpisize,
domain->mpirank, &rproc[sf],
&rpatchno[sf]);
good = good || good2;
FCLAW_ASSERT ((rproc[sf] == -1 && rpatchno[sf] == -1)
|| (0 <= rpatchno[sf]
&& rpatchno[sf] < ndgp));
}
}

/* no match on this face; we pretend a boundary situation */
if (!good)
{
FCLAW_ASSERT (rproc[0] == -1);
FCLAW_ASSERT (rpatchno[0] == -1);
rproc[1] = rpatchno[1] = -1;
for (sf = 1; sf < P4EST_HALF; sf++)
{
rproc[sf] = rpatchno[sf] = -1;
}
*rfaceno &= ~(3 << 26);
}

/* move to the next face data item */
pi += 6;
pi += face_info_size;
}
}
}
Expand All @@ -2136,27 +2140,18 @@ fclaw2d_domain_indirect_end (fclaw2d_domain_t * domain,

/* now we allow queries on the ghost data */
ind->ready = 1;
#else
FCLAW_ASSERT (domain != NULL);

/* The 3D case is currently not implemented. That is why we assert on ind
* beging NULL as it is currently always returned by
* fclaw3d_domain_indirect_begin.
*/
FCLAW_ASSERT (ind == NULL);
#endif
}

fclaw2d_patch_relation_t
fclaw2d_domain_indirect_neighbors (fclaw2d_domain_t * domain,
fclaw2d_domain_indirect_t * ind,
int ghostno, int faceno, int rproc[2],
int *rblockno, int rpatchno[2],
int *rfaceno)
int ghostno, int faceno,
int rproc[P4EST_HALF], int *rblockno,
int rpatchno[P4EST_HALF], int *rfaceno)
{
#ifndef P4_TO_P8
int *pi;
int *grproc, *grblockno, *grpatchno, *grfaceno;
int sf;
fclaw2d_patch_relation_t prel;

FCLAW_ASSERT (ind != NULL && ind->ready);
Expand All @@ -2166,7 +2161,7 @@ fclaw2d_domain_indirect_neighbors (fclaw2d_domain_t * domain,
FCLAW_ASSERT (0 <= faceno && faceno < P4EST_FACES);

/* check the type of neighbor situation */
pi = (int *) ind->e->ghost_data[ghostno] + 6 * faceno;
pi = (int *) ind->e->ghost_data[ghostno] + (2 + P4EST_CHILDREN) * faceno;
indirect_match (pi, &grproc, &grblockno, &grpatchno, &grfaceno);
*rblockno = *grblockno;
FCLAW_ASSERT (0 <= *rblockno && *rblockno < domain->num_blocks);
Expand All @@ -2177,10 +2172,11 @@ fclaw2d_domain_indirect_neighbors (fclaw2d_domain_t * domain,
if (grproc[0] == -1)
{
/* optimize for the most likely case */
FCLAW_ASSERT (grproc[0] == -1 && grpatchno[0] == -1);
FCLAW_ASSERT (grproc[1] == -1 && grpatchno[1] == -1);
rproc[0] = rpatchno[0] = -1;
rproc[1] = rpatchno[1] = -1;
for (sf = 0; sf < P4EST_HALF; sf++)
{
FCLAW_ASSERT (grproc[sf] == -1 && grpatchno[sf] == -1);
rproc[sf] = rpatchno[sf] = -1;
}
return FCLAW2D_PATCH_BOUNDARY;
}
else
Expand All @@ -2203,10 +2199,11 @@ fclaw2d_domain_indirect_neighbors (fclaw2d_domain_t * domain,
}

/* aslign the remaining output values */
rproc[0] = grproc[0];
rproc[1] = grproc[1];
rpatchno[0] = grpatchno[0];
rpatchno[1] = grpatchno[1];
for (sf = 0; sf < P4EST_HALF; sf++)
{
rproc[sf] = grproc[sf];
rpatchno[sf] = grpatchno[sf];
}
#ifdef FCLAW_ENABLE_DEBUG
if (rproc[0] != -1)
{
Expand All @@ -2215,47 +2212,31 @@ fclaw2d_domain_indirect_neighbors (fclaw2d_domain_t * domain,
FCLAW_ASSERT (0 <= rpatchno[0] &&
rpatchno[0] < domain->num_ghost_patches);
}
if (prel == FCLAW2D_PATCH_HALFSIZE && rproc[1] != -1)
for (sf = 1; sf < P4EST_HALF; sf++)
{
FCLAW_ASSERT (0 <= rproc[1] && rproc[1] < domain->mpisize);
FCLAW_ASSERT (rproc[1] != domain->mpirank);
FCLAW_ASSERT (0 <= rpatchno[1] &&
rpatchno[1] < domain->num_ghost_patches);
if (prel == FCLAW2D_PATCH_HALFSIZE && rproc[sf] != -1)
{
FCLAW_ASSERT (0 <= rproc[sf] && rproc[sf] < domain->mpisize);
FCLAW_ASSERT (rproc[sf] != domain->mpirank);
FCLAW_ASSERT (0 <= rpatchno[sf] &&
rpatchno[sf] < domain->num_ghost_patches);
}
}
#endif

/* and return */
return prel;
#else
/* Since the 3D case is currently not implemented it is not valid to call
* this function.
*/
SC_ABORT_NOT_REACHED ();

/* This code has no meaning. It is never reached. */
return FCLAW2D_PATCH_BOUNDARY;
#endif
}

void
fclaw2d_domain_indirect_destroy (fclaw2d_domain_t * domain,
fclaw2d_domain_indirect_t * ind)
{
#ifndef P4_TO_P8
FCLAW_ASSERT (ind != NULL && ind->ready);
FCLAW_ASSERT (domain == ind->domain);

fclaw2d_domain_free_after_exchange (domain, ind->e);
FCLAW_FREE (ind);
#else
FCLAW_ASSERT (domain != NULL);

/* The 3D case is currently not implemented. That is why we assert on ind
* beging NULL as it is currently always returned by
* fclaw3d_domain_indirect_begin.
*/
FCLAW_ASSERT (ind == NULL);
#endif
}

void
Expand Down
6 changes: 3 additions & 3 deletions src/forestclaw3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ void fclaw3d_domain_indirect_end (fclaw3d_domain_t * domain,
* \param [in] faceno Number of the ghost patch's face to look across.
* \param [out] rproc Processor number of neighbor patches. Exception 1:
* If the neighbor is a bigger patch, rproc[1] contains
* the number of the small patch as one of two half faces,
* the number of the small patch as one of four half faces,
* but only if the neighbor fits the above criteria.
* Exception 2: For non-indirect patches, set it to -1.
* \param [out] rblockno The number of the neighbor block.
Expand All @@ -1075,8 +1075,8 @@ void fclaw3d_domain_indirect_end (fclaw3d_domain_t * domain,
fclaw3d_patch_relation_t
fclaw3d_domain_indirect_neighbors (fclaw3d_domain_t * domain,
fclaw3d_domain_indirect_t * ind,
int ghostno, int faceno, int rproc[2],
int *rblockno, int rpatchno[2],
int ghostno, int faceno, int rproc[4],
int *rblockno, int rpatchno[4],
int *rfaceno);

/** Destroy all context data for indirect ghost neighbor patches.
Expand Down
Loading