Skip to content

Commit

Permalink
Merge pull request #27813 from lindsayad/petsc-stack-fixes
Browse files Browse the repository at this point in the history 
Petsc stack fixes
  • Loading branch information
@lindsayad
lindsayad authored Jun 7, 2024
2 parents 822597b + 07f72be commit d03f861
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 101 deletions.
88 changes: 44 additions & 44 deletions framework/src/utils/PetscDMMoose.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ DMMooseValidityCheck(DM dm)
"Got DM of type %s, not of type %s",
((PetscObject)dm)->type_name,
DMMOOSE);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -159,7 +159,7 @@ DMMooseGetContacts(DM dm,
contact_names.push_back(it.second);
displaced.push_back((*dmm->_contact_displaced)[it.second]);
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -178,7 +178,7 @@ DMMooseGetUnContacts(DM dm,
uncontact_names.push_back(it.second);
displaced.push_back((*dmm->_uncontact_displaced)[it.second]);
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -192,7 +192,7 @@ DMMooseGetSides(DM dm, std::vector<std::string> & side_names)
DM_Moose * dmm = (DM_Moose *)dm->data;
for (const auto & it : *(dmm->_side_ids))
side_names.push_back(it.first);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -206,7 +206,7 @@ DMMooseGetUnSides(DM dm, std::vector<std::string> & side_names)
DM_Moose * dmm = (DM_Moose *)dm->data;
for (const auto & it : *(dmm->_unside_ids))
side_names.push_back(it.first);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -220,7 +220,7 @@ DMMooseGetBlocks(DM dm, std::vector<std::string> & block_names)
DM_Moose * dmm = (DM_Moose *)dm->data;
for (const auto & it : *(dmm->_block_ids))
block_names.push_back(it.first);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -234,7 +234,7 @@ DMMooseGetVariables(DM dm, std::vector<std::string> & var_names)
DM_Moose * dmm = (DM_Moose *)(dm->data);
for (const auto & it : *(dmm->_var_ids))
var_names.push_back(it.first);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -251,7 +251,7 @@ DMMooseSetNonlinearSystem(DM dm, NonlinearSystemBase & nl)
"Cannot reset the NonlinearSystem after DM has been set up.");
DM_Moose * dmm = (DM_Moose *)(dm->data);
dmm->_nl = &nl;
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -268,7 +268,7 @@ DMMooseSetName(DM dm, const std::string & dm_name)
"Cannot reset the MOOSE DM name after DM has been set up.");
DM_Moose * dmm = (DM_Moose *)(dm->data);
*dmm->_name = dm_name;
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -286,7 +286,7 @@ DMMooseSetParentDM(DM dm, DM_Moose * parent)

DM_Moose * dmm = (DM_Moose *)(dm->data);
dmm->_parent = parent;
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand Down Expand Up @@ -317,7 +317,7 @@ DMMooseSetVariables(DM dm, const std::set<std::string> & vars)
}

dmm->_vars = new std::set<std::string>(std::move(processed_vars));
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -334,7 +334,7 @@ DMMooseSetBlocks(DM dm, const std::set<std::string> & blocks)
if (dmm->_blocks)
delete dmm->_blocks;
dmm->_blocks = new std::set<std::string>(blocks);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -351,7 +351,7 @@ DMMooseSetSides(DM dm, const std::set<std::string> & sides)
if (dmm->_sides)
delete dmm->_sides;
dmm->_sides = new std::set<std::string>(sides);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -368,7 +368,7 @@ DMMooseSetUnSides(DM dm, const std::set<std::string> & unsides)
if (dmm->_unsides)
delete dmm->_unsides;
dmm->_unsides = new std::set<std::string>(unsides);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -385,7 +385,7 @@ DMMooseSetUnSideByVar(DM dm, const std::set<std::string> & unside_by_var)
if (dmm->_unside_by_var)
delete dmm->_unside_by_var;
dmm->_unside_by_var = new std::set<std::string>(unside_by_var);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand Down Expand Up @@ -417,7 +417,7 @@ DMMooseSetContacts(DM dm,
dmm->_contacts->insert(contacts[i]);
dmm->_contact_displaced->insert(std::make_pair(contacts[i], displaced[i]));
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand Down Expand Up @@ -450,7 +450,7 @@ DMMooseSetUnContacts(DM dm,
dmm->_uncontacts->insert(uncontacts[i]);
dmm->_uncontact_displaced->insert(std::make_pair(uncontacts[i], displaced[i]));
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -463,7 +463,7 @@ DMMooseGetNonlinearSystem(DM dm, NonlinearSystemBase *& nl)
CHKERRQ(ierr);
DM_Moose * dmm = (DM_Moose *)(dm->data);
nl = dmm->_nl;
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand Down Expand Up @@ -504,7 +504,7 @@ DMMooseSetSplitNames(DM dm, const std::vector<std::string> & split_names)
(*dmm->_splits)[name] = info;
dmm->_splitlocs->insert(std::make_pair(name, i));
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -527,7 +527,7 @@ DMMooseGetSplitNames(DM dm, std::vector<std::string> & split_names)
unsigned int sloc = lit.second;
split_names[sloc] = sname;
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand All @@ -538,7 +538,7 @@ DMMooseGetEmbedding_Private(DM dm, IS * embedding)

PetscFunctionBegin;
if (!embedding)
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
if (!dmm->_embedding)
{
// The rules interpreting the coexistence of blocks (un)sides/(un)contacts are these
Expand Down Expand Up @@ -870,7 +870,7 @@ DMMooseGetEmbedding_Private(DM dm, IS * embedding)
CHKERRQ(ierr);
*embedding = dmm->_embedding;

return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand All @@ -886,7 +886,7 @@ DMCreateFieldDecomposition_Moose(

/* Only called after DMSetUp(). */
if (!dmm->_splitlocs)
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
*len = dmm->_splitlocs->size();
if (namelist)
{
Expand Down Expand Up @@ -1014,7 +1014,7 @@ DMCreateFieldDecomposition_Moose(
split_size_sum,
dmm->_nl->nonlinearSolver()->system().get_system_matrix().local_m());

return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand All @@ -1030,7 +1030,7 @@ DMCreateDomainDecomposition_Moose(
*outerislist = LIBMESH_PETSC_NULLPTR; /* FIX: allow mesh-based overlap. */
ierr = DMCreateFieldDecomposition_Moose(dm, len, namelist, innerislist, dmlist);
CHKERRQ(ierr);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -1102,7 +1102,7 @@ DMMooseFunction(DM dm, Vec x, Vec r)
mooseError(err.str());
}
R.close();
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand All @@ -1114,7 +1114,7 @@ SNESFunction_DMMoose(SNES, Vec x, Vec r, void * ctx)
PetscFunctionBegin;
ierr = DMMooseFunction(dm, x, r);
CHKERRQ(ierr);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -1196,7 +1196,7 @@ DMMooseJacobian(DM dm, Vec x, Mat jac, Mat pc)
}
the_pc.close();
Jac.close();
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand All @@ -1208,7 +1208,7 @@ SNESJacobian_DMMoose(SNES, Vec x, Mat jac, Mat pc, void * ctx)
PetscFunctionBegin;
ierr = DMMooseJacobian(dm, x, jac, pc);
CHKERRQ(ierr);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand All @@ -1235,7 +1235,7 @@ DMVariableBounds_Moose(DM dm, Vec xl, Vec xu)
else
SETERRQ(
((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "No bounds calculation in this Moose object");
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -1285,7 +1285,7 @@ DMCreateGlobalVector_Moose(DM dm, Vec * x)
ierr = VecSetDM(*x, dm);
CHKERRQ(ierr);
#endif
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -1342,7 +1342,7 @@ DMCreateMatrix_Moose(DM dm, Mat * A)
* settings made here. */
ierr = MatSetUp(*A);
CHKERRQ(ierr);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -1475,7 +1475,7 @@ DMView_Moose(DM dm, PetscViewer viewer)
else
SETERRQ(PETSC_COMM_SELF, PETSC_ERR_SUP, "Non-ASCII viewers are not supported");

return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand All @@ -1498,7 +1498,7 @@ DMMooseGetMeshBlocks_Private(DM dm, std::set<subdomain_id_type> & blocks)
blocks.insert(elem->subdomain_id());
// Some subdomains may only live on other processors
mesh.comm().set_union(blocks);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -1757,7 +1757,7 @@ DMSetUp_Moose_Pre(DM dm)
}
ierr = PetscObjectSetName((PetscObject)dm, name.c_str());
CHKERRQ(ierr);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -1771,7 +1771,7 @@ DMMooseReset(DM dm)
ierr = PetscObjectTypeCompare((PetscObject)dm, DMMOOSE, &ismoose);
CHKERRQ(ierr);
if (!ismoose)
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
if (!dmm->_nl)
SETERRQ(PETSC_COMM_WORLD, PETSC_ERR_ARG_WRONGSTATE, "No Moose system set for DM_Moose");
ierr = ISDestroy(&dmm->_embedding);
Expand All @@ -1788,7 +1788,7 @@ DMMooseReset(DM dm)
}
}
dm->setupcalled = PETSC_FALSE;
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -1851,7 +1851,7 @@ DMSetUp_Moose(DM dm)
ierr = DMSetVariableBounds(dm, DMVariableBounds_Moose);
CHKERRQ(ierr);
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

#if !PETSC_VERSION_LESS_THAN(3, 18, 0)
Expand Down Expand Up @@ -2236,7 +2236,7 @@ DMSetFromOptions_Moose(PetscOptions * /*options*/, DM dm) // >= 3.6.0
ierr = DMSetUp_Moose_Pre(dm);
CHKERRQ(ierr); /* Need some preliminary set up because, strangely enough, DMView() is called in
DMSetFromOptions(). */
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

static PetscErrorCode
Expand Down Expand Up @@ -2291,7 +2291,7 @@ DMDestroy_Moose(DM dm)
CHKERRQ(ierr);
ierr = PetscFree(dm->data);
CHKERRQ(ierr);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -2308,7 +2308,7 @@ DMCreateMoose(MPI_Comm comm, NonlinearSystemBase & nl, const std::string & dm_na
CHKERRQ(ierr);
ierr = DMMooseSetName(*dm, dm_name);
CHKERRQ(ierr);
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

EXTERN_C_BEGIN
Expand Down Expand Up @@ -2370,7 +2370,7 @@ DMCreate_Moose(DM dm)
dm->ops->view = DMView_Moose;
dm->ops->setfromoptions = DMSetFromOptions_Moose;
dm->ops->setup = DMSetUp_Moose;
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}
EXTERN_C_END

Expand Down Expand Up @@ -2425,7 +2425,7 @@ SNESUpdateDMMoose(SNES snes, PetscInt iteration)
ierr = PCDestroy(&pc);
CHKERRQ(ierr);
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}

PetscErrorCode
Expand All @@ -2441,5 +2441,5 @@ DMMooseRegisterAll()
CHKERRQ(ierr);
DMMooseRegisterAllCalled = PETSC_TRUE;
}
return PETSC_SUCCESS;
PetscFunctionReturn(PETSC_SUCCESS);
}
Loading

0 comments on commit d03f861

Please sign in to comment.