Fix PETSC Warning

Recent PETSC versions request PETSC_NULLPTR instead of PETSC_NULL
halbux · Nov 22, 2024 · 6dff0c0 · 6dff0c0
1 parent ad7efc8
commit 6dff0c0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/expression/operation/sl.cpp b/src/expression/operation/sl.cpp
@@ -1813,7 +1813,7 @@ void sl::solve(mat A, vec b, vec sol, double& relrestol, int& maxnumit, std::str
 
     // Request to print the iteration information to the console:
     if (verbosity > 0)
-        KSPMonitorSet(*ksp, mykspmonitor, PETSC_NULL, PETSC_NULL);
+        KSPMonitorSet(*ksp, mykspmonitor, PETSC_NULLPTR, PETSC_NULLPTR);
 
     KSPSetFromOptions(*ksp);
 

diff --git a/src/formulation/rawmat.cpp b/src/formulation/rawmat.cpp
@@ -29,9 +29,9 @@ rawmat::~rawmat(void)
 
     if (ispetscinitialized == PETSC_TRUE)
     {
-        if (Amat != PETSC_NULL)
+        if (Amat != PETSC_NULLPTR)
             MatDestroy(&Amat);
-        if (Dmat != PETSC_NULL)
+        if (Dmat != PETSC_NULLPTR)
             MatDestroy(&Dmat);
         if (isitfactored) 
             KSPDestroy(&myksp);

diff --git a/src/formulation/rawmat.h b/src/formulation/rawmat.h
@@ -40,10 +40,10 @@ class rawmat
         // Ainds[i] is the index in Atotal of the ith index in A:
         indexmat Ainds, Dinds;
 
-        Mat Amat = PETSC_NULL, Dmat = PETSC_NULL;
+        Mat Amat = PETSC_NULLPTR, Dmat = PETSC_NULLPTR;
 
         // 'myksp' will store the factorization if it is to be reused:
-        KSP myksp = PETSC_NULL;
+        KSP myksp = PETSC_NULLPTR;
         bool factorizationreuse = false;
         bool isitfactored = false;
 

diff --git a/src/formulation/rawvec.cpp b/src/formulation/rawvec.cpp
@@ -120,7 +120,7 @@ rawvec::~rawvec(void)
     PetscBool ispetscinitialized;
     PetscInitialized(&ispetscinitialized);
 
-    if (ispetscinitialized == PETSC_TRUE && myvec != PETSC_NULL)
+    if (ispetscinitialized == PETSC_TRUE && myvec != PETSC_NULLPTR)
         VecDestroy(&myvec);
 }
 

diff --git a/src/formulation/rawvec.h b/src/formulation/rawvec.h
@@ -31,7 +31,7 @@ class rawvec : public std::enable_shared_from_this<rawvec>
 {
     private:
 
-        Vec myvec = PETSC_NULL;
+        Vec myvec = PETSC_NULLPTR;
         std::shared_ptr<dofmanager> mydofmanager = NULL;
 
 

diff --git a/src/mesh/petscmesh.cpp b/src/mesh/petscmesh.cpp
@@ -64,7 +64,7 @@ void petscmesh::extract(nodes& mynodes, elements& myelements, physicalregions& m
 {
     ///// Extract the node coordinates:
 
-    Vec coordvec = PETSC_NULL;
+    Vec coordvec = PETSC_NULLPTR;
     DMGetCoordinates(mypetscmesh, &coordvec);
 
     int numberofnodes;

diff --git a/src/resolution/eigenvalue.cpp b/src/resolution/eigenvalue.cpp
@@ -150,7 +150,7 @@ void eigenvalue::compute(int numeigenvaluestocompute, double targeteigenvaluemag
         PCSetType(pc, PCLU);
 
         PEPSTOARSetDetectZeros(pep,PETSC_TRUE);
-        PEPSetScale(pep, PEP_SCALE_SCALAR, PETSC_DECIDE, PETSC_NULL, PETSC_NULL, PETSC_DECIDE, PETSC_DECIDE);
+        PEPSetScale(pep, PEP_SCALE_SCALAR, PETSC_DECIDE, PETSC_NULLPTR, PETSC_NULLPTR, PETSC_DECIDE, PETSC_DECIDE);
 
         PCFactorSetMatSolverType(pc, universe::solvertype);
         PEPSetFromOptions(pep);