fmk - fixing define

zhuminjie · Nov 12, 2021 · 7e09614 · 7e09614
1 parent dba6384
commit 7e09614
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 15 deletions.
diff --git a/SRC/analysis/integrator/ArcLength.cpp b/SRC/analysis/integrator/ArcLength.cpp
@@ -1012,12 +1012,6 @@ ArcLength::computeSensitivities(void)
 //opserr<<"computeSensitivities : start"<<endln;
    // Zero out the old right-hand side of the SOE
    theSOE->zeroB();
-   if (this == 0) {
-      opserr << "ERROR SensitivityAlgorithm::computeSensitivities() -";
-      opserr << "the SensitivityIntegrator is NULL\n";
-      return -1;
-   }
-
 
    // Form the part of the RHS which are indepent of parameter
    this->formIndependentSensitivityRHS();

diff --git a/SRC/analysis/integrator/DisplacementControl.cpp b/SRC/analysis/integrator/DisplacementControl.cpp
@@ -1018,12 +1018,6 @@ DisplacementControl::computeSensitivities(void)
 
   // Zero out the old right-hand side of the SOE
   theSOE->zeroB();
-  if (this == 0) {
-    opserr << "ERROR SensitivityAlgorithm::computeSensitivities() -";
-    opserr << "the SensitivityIntegrator is NULL\n";
-    return -1;
-  }
-
 
   // Form the part of the RHS which are indepent of parameter
   this->formIndependentSensitivityRHS();

diff --git a/SRC/analysis/numberer/DOF_Numberer.cpp b/SRC/analysis/numberer/DOF_Numberer.cpp
@@ -108,7 +108,7 @@ DOF_Numberer::numberDOF(int lastDOF_Group)
 	return -1;
     }
 
-    if ((theGraphNumberer == 0)) {
+    if (theGraphNumberer == 0) {
 	opserr << "WARNING DOF_Numberer::numberDOF - ";
 	opserr << "subclasses must provide own implementation\n";
 	return -2;

diff --git a/SRC/database/FileDatastore.cpp b/SRC/database/FileDatastore.cpp
@@ -764,7 +764,7 @@ FileDatastore::recvMatrix(int dataTag, int commitTag,
 
   if (pos < fileEnd) {
     theStream->read(data, stepSize);
-    if ((*(theIntData.dbTag) == dataTag)) {
+    if (*(theIntData.dbTag) == dataTag) {
       found = true;
       pos += stepSize;
     } 

diff --git a/SRC/system_of_eqn/linearSOE/sparseGEN/PFEMSolver_Umfpack.h b/SRC/system_of_eqn/linearSOE/sparseGEN/PFEMSolver_Umfpack.h
@@ -24,7 +24,7 @@
 
 
 #ifndef PFEMSolverUmfpack_h
-#define PFEMSolver_Umfpack_h
+#define PFEMSolverUmfpack_h
 
 // File: ~/system_of_eqn/linearSOE/sparseGEN/PFEMSolver_Umfpack.h
 //