Skip to content

Commit

Permalink
Replace LIBMESH_CHKERR with LibmeshPetscCallA(PETSC_COMM...) (#28929)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmnobre
nmnobre committed Oct 31, 2024
1 parent eaa43d8 commit 6126898
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 65 deletions.
18 changes: 6 additions & 12 deletions framework/src/restart/DataIO.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,31 +713,25 @@ void
dataLoad(std::istream & stream, Vec & v, void * context)
{
PetscInt local_size;
auto ierr = VecGetLocalSize(v, &local_size);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_WORLD, VecGetLocalSize(v, &local_size));
PetscScalar * array;
ierr = VecGetArray(v, &array);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_WORLD, VecGetArray(v, &array));
for (PetscInt i = 0; i < local_size; i++)
dataLoad(stream, array[i], context);

ierr = VecRestoreArray(v, &array);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_WORLD, VecRestoreArray(v, &array));
}

template <>
void
dataStore(std::ostream & stream, Vec & v, void * context)
{
PetscInt local_size;
auto ierr = VecGetLocalSize(v, &local_size);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_WORLD, VecGetLocalSize(v, &local_size));
PetscScalar * array;
ierr = VecGetArray(v, &array);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_WORLD, VecGetArray(v, &array));
for (PetscInt i = 0; i < local_size; i++)
dataStore(stream, array[i], context);

ierr = VecRestoreArray(v, &array);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_WORLD, VecRestoreArray(v, &array));
}
89 changes: 36 additions & 53 deletions framework/src/utils/PetscSupport.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,13 @@ addPetscOptionsFromCommandline()
int argc;
char ** args;

auto ierr = PetscGetArgs(&argc, &args);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_WORLD, PetscGetArgs(&argc, &args));
#if PETSC_VERSION_LESS_THAN(3, 7, 0)
ierr = PetscOptionsInsert(&argc, &args, NULL);
LibmeshPetscCallA(PETSC_COMM_WORLD, PetscOptionsInsert(&argc, &args, NULL));
#else
ierr = PetscOptionsInsert(LIBMESH_PETSC_NULLPTR, &argc, &args, NULL);
LibmeshPetscCallA(PETSC_COMM_WORLD,
PetscOptionsInsert(LIBMESH_PETSC_NULLPTR, &argc, &args, NULL));
#endif
LIBMESH_CHKERR(ierr);
}
}

Expand All @@ -236,11 +235,10 @@ petscSetOptions(const PetscOptions & po,
FEProblemBase * const problem /*=nullptr*/)
{
#if PETSC_VERSION_LESS_THAN(3, 7, 0)
auto ierr = PetscOptionsClear();
LibmeshPetscCallA(PETSC_COMM_WORLD, PetscOptionsClear());
#else
auto ierr = PetscOptionsClear(LIBMESH_PETSC_NULLPTR);
LibmeshPetscCallA(PETSC_COMM_WORLD, PetscOptionsClear(LIBMESH_PETSC_NULLPTR));
#endif
LIBMESH_CHKERR(ierr);

setSolverOptions(solver_params);

Expand Down Expand Up @@ -1000,56 +998,47 @@ colorAdjacencyMatrix(PetscScalar * adjacency_matrix,
{
// Mat A will be a dense matrix from the incoming data structure
Mat A;
auto ierr = MatCreate(MPI_COMM_SELF, &A);
LIBMESH_CHKERR(ierr);
ierr = MatSetSizes(A, size, size, size, size);
LIBMESH_CHKERR(ierr);
ierr = MatSetType(A, MATSEQDENSE);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_SELF, MatCreate(PETSC_COMM_SELF, &A));
LibmeshPetscCallA(PETSC_COMM_SELF, MatSetSizes(A, size, size, size, size));
LibmeshPetscCallA(PETSC_COMM_SELF, MatSetType(A, MATSEQDENSE));
// PETSc requires a non-const data array to populate the matrix
ierr = MatSeqDenseSetPreallocation(A, adjacency_matrix);
LIBMESH_CHKERR(ierr);
ierr = MatAssemblyBegin(A, MAT_FINAL_ASSEMBLY);
LIBMESH_CHKERR(ierr);
ierr = MatAssemblyEnd(A, MAT_FINAL_ASSEMBLY);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_SELF, MatSeqDenseSetPreallocation(A, adjacency_matrix));
LibmeshPetscCallA(PETSC_COMM_SELF, MatAssemblyBegin(A, MAT_FINAL_ASSEMBLY));
LibmeshPetscCallA(PETSC_COMM_SELF, MatAssemblyEnd(A, MAT_FINAL_ASSEMBLY));

// Convert A to a sparse matrix
ierr = MatConvert(A,
MATAIJ,
#if PETSC_VERSION_LESS_THAN(3, 7, 0)
MAT_REUSE_MATRIX,
LibmeshPetscCallA(PETSC_COMM_SELF,
MatConvert(A,
MATAIJ,
MAT_REUSE_MATRIX,
&A));
#else
MAT_INPLACE_MATRIX,
LibmeshPetscCallA(PETSC_COMM_SELF,
MatConvert(A,
MATAIJ,
MAT_INPLACE_MATRIX,
&A));
#endif
&A);
LIBMESH_CHKERR(ierr);

ISColoring iscoloring;
MatColoring mc;
ierr = MatColoringCreate(A, &mc);
LIBMESH_CHKERR(ierr);
ierr = MatColoringSetType(mc, coloring_algorithm);
LIBMESH_CHKERR(ierr);
ierr = MatColoringSetMaxColors(mc, static_cast<PetscInt>(colors));
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_SELF, MatColoringCreate(A, &mc));
LibmeshPetscCallA(PETSC_COMM_SELF, MatColoringSetType(mc, coloring_algorithm));
LibmeshPetscCallA(PETSC_COMM_SELF, MatColoringSetMaxColors(mc, static_cast<PetscInt>(colors)));

// Petsc normally colors by distance two (neighbors of neighbors), we just want one
ierr = MatColoringSetDistance(mc, 1);
LIBMESH_CHKERR(ierr);
ierr = MatColoringSetFromOptions(mc);
LIBMESH_CHKERR(ierr);
ierr = MatColoringApply(mc, &iscoloring);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_SELF, MatColoringSetDistance(mc, 1));
LibmeshPetscCallA(PETSC_COMM_SELF, MatColoringSetFromOptions(mc));
LibmeshPetscCallA(PETSC_COMM_SELF, MatColoringApply(mc, &iscoloring));

PetscInt nn;
IS * is;
#if PETSC_RELEASE_LESS_THAN(3, 12, 0)
ierr = ISColoringGetIS(iscoloring, &nn, &is);
LibmeshPetscCallA(PETSC_COMM_SELF, ISColoringGetIS(iscoloring, &nn, &is));
#else
ierr = ISColoringGetIS(iscoloring, PETSC_USE_POINTER, &nn, &is);
LibmeshPetscCallA(PETSC_COMM_SELF, ISColoringGetIS(iscoloring, PETSC_USE_POINTER, &nn, &is));
#endif
LIBMESH_CHKERR(ierr);

if (nn > static_cast<PetscInt>(colors))
throw std::runtime_error("Not able to color with designated number of colors");
Expand All @@ -1058,25 +1047,19 @@ colorAdjacencyMatrix(PetscScalar * adjacency_matrix,
{
PetscInt isize;
const PetscInt * indices;
ierr = ISGetLocalSize(is[i], &isize);
LIBMESH_CHKERR(ierr);
ierr = ISGetIndices(is[i], &indices);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_SELF, ISGetLocalSize(is[i], &isize));
LibmeshPetscCallA(PETSC_COMM_SELF, ISGetIndices(is[i], &indices));
for (int j = 0; j < isize; j++)
{
mooseAssert(indices[j] < static_cast<PetscInt>(vertex_colors.size()), "Index out of bounds");
vertex_colors[indices[j]] = i;
}
ierr = ISRestoreIndices(is[i], &indices);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_SELF, ISRestoreIndices(is[i], &indices));
}

ierr = MatDestroy(&A);
LIBMESH_CHKERR(ierr);
ierr = MatColoringDestroy(&mc);
LIBMESH_CHKERR(ierr);
ierr = ISColoringDestroy(&iscoloring);
LIBMESH_CHKERR(ierr);
LibmeshPetscCallA(PETSC_COMM_SELF, MatDestroy(&A));
LibmeshPetscCallA(PETSC_COMM_SELF, MatColoringDestroy(&mc));
LibmeshPetscCallA(PETSC_COMM_SELF, ISColoringDestroy(&iscoloring));
}

void
Expand Down

0 comments on commit 6126898

Please sign in to comment.