-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #146 from IBAMR/ibamr-0.15
IBAMR 0.15
- Loading branch information
Showing
6 changed files
with
127 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| diff --git a/src/solvers/petsc_linear_solver.C b/src/solvers/petsc_linear_solver.C | ||
| index 5096f6a..dd11e5d 100644 | ||
| --- a/src/solvers/petsc_linear_solver.C | ||
| +++ b/src/solvers/petsc_linear_solver.C | ||
| @@ -1567,7 +1567,6 @@ LinearConvergenceReason PetscLinearSolver<T>::get_converged_reason() const | ||
| case KSP_CONVERGED_ITS : return CONVERGED_ITS; | ||
| case KSP_CONVERGED_CG_NEG_CURVE : return CONVERGED_CG_NEG_CURVE; | ||
| case KSP_CONVERGED_CG_CONSTRAINED : return CONVERGED_CG_CONSTRAINED; | ||
| - case KSP_CONVERGED_STEP_LENGTH : return CONVERGED_STEP_LENGTH; | ||
| case KSP_CONVERGED_HAPPY_BREAKDOWN : return CONVERGED_HAPPY_BREAKDOWN; | ||
| case KSP_DIVERGED_NULL : return DIVERGED_NULL; | ||
| case KSP_DIVERGED_ITS : return DIVERGED_ITS; | ||
| diff --git a/src/solvers/petscdmlibmeshimpl.C b/src/solvers/petscdmlibmeshimpl.C | ||
| index f2e4179..552fa0a 100644 | ||
| --- a/src/solvers/petscdmlibmeshimpl.C | ||
| +++ b/src/solvers/petscdmlibmeshimpl.C | ||
| @@ -99,7 +99,8 @@ PetscErrorCode DMlibMeshSetSystem_libMesh(DM dm, NonlinearImplicitSystem & sys) | ||
| PetscValidHeaderSpecific(dm,DM_CLASSID,1); | ||
| PetscBool islibmesh; | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH,&islibmesh); | ||
| - if (!islibmesh) SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Got DM of type %s, not of type %s", ((PetscObject)dm)->type_name, DMLIBMESH); | ||
| + if (!islibmesh) | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
|
|
||
| if (dm->setupcalled) SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONGSTATE, "Cannot reset the libMesh system after DM has been set up."); | ||
| DM_libMesh * dlm = (DM_libMesh *)(dm->data); | ||
| @@ -159,7 +160,8 @@ PetscErrorCode DMlibMeshGetSystem_libMesh(DM dm, NonlinearImplicitSystem *& sys) | ||
| PetscValidHeaderSpecific(dm,DM_CLASSID,1); | ||
| PetscBool islibmesh; | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH,&islibmesh);CHKERRQ(ierr); | ||
| - if (!islibmesh) SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Got DM of type %s, not of type %s", ((PetscObject)dm)->type_name, DMLIBMESH); | ||
| + if (!islibmesh) | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
| DM_libMesh * dlm = (DM_libMesh *)(dm->data); | ||
| sys = dlm->sys; | ||
| PetscFunctionReturn(0); | ||
| @@ -176,7 +178,8 @@ PetscErrorCode DMlibMeshGetBlocks(DM dm, PetscInt * n, char *** blocknames) | ||
| PetscValidHeaderSpecific(dm,DM_CLASSID,1); | ||
| PetscBool islibmesh; | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH,&islibmesh); | ||
| - if (!islibmesh) SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Got DM of type %s, not of type %s", ((PetscObject)dm)->type_name, DMLIBMESH); | ||
| + if (!islibmesh) | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
| DM_libMesh * dlm = (DM_libMesh *)(dm->data); | ||
| PetscValidPointer(n,2); | ||
| *n = cast_int<unsigned int>(dlm->blockids->size()); | ||
| @@ -201,7 +204,8 @@ PetscErrorCode DMlibMeshGetVariables(DM dm, PetscInt * n, char *** varnames) | ||
| PetscBool islibmesh; | ||
| PetscInt i; | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH,&islibmesh); | ||
| - if (!islibmesh) SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Got DM of type %s, not of type %s", ((PetscObject)dm)->type_name, DMLIBMESH); | ||
| + if (!islibmesh) | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
| DM_libMesh * dlm = (DM_libMesh *)(dm->data); | ||
| PetscValidPointer(n,2); | ||
| *n = cast_int<unsigned int>(dlm->varids->size()); | ||
| @@ -487,7 +491,8 @@ PetscErrorCode DMlibMeshCreateFieldDecompositionDM(DM dm, PetscInt dnumber, Pets | ||
| PetscFunctionBegin; | ||
| PetscValidHeaderSpecific(dm,DM_CLASSID,1); | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH,&islibmesh); | ||
| - if (!islibmesh) SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Got DM of type %s, not of type %s", ((PetscObject)dm)->type_name, DMLIBMESH); | ||
| + if (!islibmesh) | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
| if (dnumber < 0) SETERRQ1(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Negative number %D of decomposition parts", dnumber); | ||
| PetscValidPointer(ddm,5); | ||
| DM_libMesh * dlm = (DM_libMesh *)(dm->data); | ||
| @@ -539,7 +544,8 @@ PetscErrorCode DMlibMeshCreateDomainDecompositionDM(DM dm, PetscInt dnumber, Pet | ||
| PetscFunctionBegin; | ||
| PetscValidHeaderSpecific(dm,DM_CLASSID,1); | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH,&islibmesh); | ||
| - if (!islibmesh) SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Got DM of type %s, not of type %s", ((PetscObject)dm)->type_name, DMLIBMESH); | ||
| + if (!islibmesh) | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
| if (dnumber < 0) SETERRQ1(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "Negative number %D of decomposition parts", dnumber); | ||
| PetscValidPointer(ddm,5); | ||
| DM_libMesh * dlm = (DM_libMesh *)(dm->data); | ||
| @@ -767,7 +773,7 @@ static PetscErrorCode DMCreateGlobalVector_libMesh(DM dm, Vec *x) | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH, &eq); CHKERRQ(ierr); | ||
|
|
||
| if (!eq) | ||
| - SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM of type %s, not of type %s", ((PetscObject)dm)->type, DMLIBMESH); | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
|
|
||
| if (!dlm->sys) | ||
| SETERRQ(PETSC_COMM_WORLD, PETSC_ERR_ARG_WRONGSTATE, "No libMesh system set for DM_libMesh"); | ||
| @@ -814,7 +820,7 @@ static PetscErrorCode DMCreateMatrix_libMesh(DM dm, Mat * A) | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH, &eq); CHKERRQ(ierr); | ||
|
|
||
| if (!eq) | ||
| - SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM of type %s, not of type %s", ((PetscObject)dm)->type, DMLIBMESH); | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
|
|
||
| if (!dlm->sys) | ||
| SETERRQ(PETSC_COMM_WORLD, PETSC_ERR_ARG_WRONGSTATE, "No libMesh system set for DM_libMesh"); | ||
| @@ -896,7 +902,7 @@ static PetscErrorCode DMSetUp_libMesh(DM dm) | ||
| ierr = PetscObjectTypeCompare((PetscObject)dm, DMLIBMESH, &eq); CHKERRQ(ierr); | ||
|
|
||
| if (!eq) | ||
| - SETERRQ2(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM of type %s, not of type %s", ((PetscObject)dm)->type, DMLIBMESH); | ||
| + SETERRQ(((PetscObject)dm)->comm, PETSC_ERR_ARG_WRONG, "DM has wrong type"); | ||
|
|
||
| if (!dlm->sys) | ||
| SETERRQ(PETSC_COMM_WORLD, PETSC_ERR_ARG_WRONGSTATE, "No libMesh system set for DM_libMesh"); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters