Import Geant4 11.2.0 source tree

source/geometry/solids/Boolean/include/G4BooleanSolid.hh

@@ -123,17 +123,19 @@ class G4BooleanSolid : public G4VSolid
     G4VSolid* fPtrSolidB = nullptr;
 
     G4double fCubicVolume = -1.0;
-      // Stored value of fCubicVolume 
+      // Cached value of fCubicVolume 
+    G4double fSurfaceArea = -1.0;
+      // Cached value of Surface Area
 
     static G4VBooleanProcessor* fExternalBoolProcessor;
       // External Boolean processor
 
   private:
 
-    G4int    fStatistics = 1000000;
+    G4int    fCubVolStatistics = 1000000;
+    G4int    fAreaStatistics = 1000000;
     G4double fCubVolEpsilon = 0.001;
     G4double fAreaAccuracy = -1;
-    G4double fSurfaceArea = -1.0;
 
     mutable G4bool fRebuildPolyhedron = false;
     mutable G4Polyhedron* fpPolyhedron = nullptr;

source/geometry/solids/Boolean/include/G4BooleanSolid.icc

@@ -30,7 +30,7 @@
 inline
 G4int G4BooleanSolid::GetCubVolStatistics() const
 {
-  return fStatistics;
+  return fCubVolStatistics;
 }
 
 inline
@@ -42,21 +42,21 @@ G4double G4BooleanSolid::GetCubVolEpsilon() const
 inline
 void G4BooleanSolid::SetCubVolStatistics(G4int st)
 {
-  fCubicVolume = -1.;
-  fStatistics = st;
+  if (st != fCubVolStatistics) { fCubicVolume = -1.; }
+  fCubVolStatistics = st;
 }
 
 inline    
 void G4BooleanSolid::SetCubVolEpsilon(G4double ep)
 {
-  fCubicVolume = -1.;
+  if (ep != fCubVolEpsilon) { fCubicVolume = -1.; }
   fCubVolEpsilon = ep;
 }
 
 inline
 G4int G4BooleanSolid::GetAreaStatistics() const
 {
-  return fStatistics;
+  return fAreaStatistics;
 }
 
 inline
@@ -68,14 +68,14 @@ G4double G4BooleanSolid::GetAreaAccuracy() const
 inline
 void G4BooleanSolid::SetAreaStatistics(G4int st)
 {
-  fSurfaceArea = -1.;
-  fStatistics = st;
+  if (st != fAreaStatistics) { fSurfaceArea = -1.; }
+  fAreaStatistics = st;
 }
 
 inline    
 void G4BooleanSolid::SetAreaAccuracy(G4double ep)
 {
-  fSurfaceArea = -1.;
+  if (ep != fAreaAccuracy) { fSurfaceArea = -1.; }
   fAreaAccuracy = ep;
 }
 
@@ -84,7 +84,7 @@ G4double G4BooleanSolid::GetSurfaceArea()
 {
   if(fSurfaceArea < 0.)
   {
-    fSurfaceArea = EstimateSurfaceArea(fStatistics,fAreaAccuracy);
+    fSurfaceArea = EstimateSurfaceArea(fAreaStatistics, fAreaAccuracy);
   }
   return fSurfaceArea;
 }