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

Mixed Int Sstruct #1202

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Mixed Int Sstruct #1202

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
fd821da
Fixes for mixed int build for sstruct.
waynemitchell Jan 7, 2025
bc12855
One more fix
waynemitchell Jan 9, 2025
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
16 changes: 8 additions & 8 deletions src/sstruct_mv/sstruct_grid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,15 +446,15 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
MPI_Comm comm = hypre_SStructGridComm(grid);
HYPRE_Int ndim = hypre_SStructGridNDim(grid);
HYPRE_Int nparts = hypre_SStructGridNParts(grid);
HYPRE_Int local_size = hypre_SStructGridLocalSize(grid);
HYPRE_BigInt local_size = (HYPRE_BigInt) hypre_SStructGridLocalSize(grid);
hypre_BoxManager ***managers;
hypre_SStructBoxManInfo info_obj;
hypre_SStructPGrid *pgrid;
HYPRE_Int nvars;
hypre_StructGrid *sgrid;
hypre_Box *bounding_box;

HYPRE_Int offsets[2];
HYPRE_BigInt offsets[2];

hypre_SStructBoxManInfo *entry_info;

Expand All @@ -468,11 +468,11 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )

hypre_Box *ghostbox, *box;
HYPRE_Int * num_ghost;
HYPRE_Int ghoffsets[2];
HYPRE_Int ghlocal_size = hypre_SStructGridGhlocalSize(grid);
HYPRE_BigInt ghoffsets[2];
HYPRE_BigInt ghlocal_size = (HYPRE_BigInt) hypre_SStructGridGhlocalSize(grid);

HYPRE_Int info_size;
HYPRE_Int box_offset, ghbox_offset;
HYPRE_BigInt box_offset, ghbox_offset;

/*------------------------------------------------------
* Build box manager info for grid boxes
Expand All @@ -483,12 +483,12 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )

/*find offset and ghost offsets */
{
HYPRE_Int scan_recv;
HYPRE_BigInt scan_recv;

/* offsets */

hypre_MPI_Scan(
&local_size, &scan_recv, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
&local_size, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
/* first point in my range */
offsets[0] = scan_recv - local_size;
/* first point in next proc's range */
Expand All @@ -498,7 +498,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )

/* ghost offsets */
hypre_MPI_Scan(
&ghlocal_size, &scan_recv, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
&ghlocal_size, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
/* first point in my range */
ghoffsets[0] = scan_recv - ghlocal_size;
/* first point in next proc's range */
Expand Down
3 changes: 2 additions & 1 deletion src/sstruct_mv/sstruct_matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,8 @@ hypre_SStructUMatrixInitialize( hypre_SStructMatrix *matrix )
hypre_SStructStencil *stencil;
HYPRE_Int *split;
HYPRE_Int nvars;
HYPRE_Int nrows, rowstart, nnzs ;
HYPRE_Int nrows, nnzs ;
HYPRE_BigInt rowstart;
HYPRE_Int part, var, entry, b, m, mi;
HYPRE_Int *row_sizes;
HYPRE_Int max_row_size;
Expand Down