Changeset 1347 for trunk/source/processes/hadronic/models/abrasion

Timestamp:

Dec 22, 2010, 3:52:27 PM (15 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/hadronic/models/abrasion

Files:

• History (modified) (1 diff)
• src/G4NuclearAbrasionGeometry.cc (modified) (3 diffs)
• src/G4WilsonAbrasionModel.cc (modified) (5 diffs)

trunk/source/processes/hadronic/models/abrasion/History

@@ -14 +14 @@
      ---------------------------------------------------------------
 
+12-Nov-2010, Dennis Wright                  (had-abrasion-V09-03-01)
+--------------------------------------------------------------------
+- G4WilsonAbrasionModel.cc : initialize r0sq in ctor (CoVerity)
+- G4NuclearAbrasionGeometry::GetExcitationEnergyOfTarget :
+   fix memory leak by deleting revAbrasionGeometry  (CoVerity)
+
 08-Sep-2010, Gunter Folger                  (had-abrasion-V09-03-00)
+--------------------------------------------------------------------
 - G4WilsonAbrasionModel.cc: remove several unused #includes
 

trunk/source/processes/hadronic/models/abrasion/src/G4NuclearAbrasionGeometry.cc

@@ -194 +194 @@
   return Es;
 }
-//////////////////////////////////////////////////////////////////////////////////////
-//
+
+
 G4double G4NuclearAbrasionGeometry::GetExcitationEnergyOfTarget ()
 {
-//
-//
-// This member function declares a new G4NuclearAbrasionGeometry object but with the
-// projectile and target exchanged to determine the values for F and P.  Determination
-// of the excess surface area and excitation energy is as above.
-//
-  G4NuclearAbrasionGeometry *revAbrasionGeometry =
+  // This member function declares a new G4NuclearAbrasionGeometry object 
+  // but with the projectile and target exchanged to determine the values
+  // for F and P.  Determination of the excess surface area and excitation
+  // energy is as above.
+
+  G4NuclearAbrasionGeometry* revAbrasionGeometry =
     new G4NuclearAbrasionGeometry(AT, AP, r);
   G4double F1 = revAbrasionGeometry->F();
@@ -212 +211 @@
   Es = 0.95 * MeV * 4.0 * pi * rT*rT/fermi/fermi *
        (1.0+P1-std::pow(1.0-F1,2.0/3.0));
+
 //  if (rP < rT && r < rT-rP)
-  if ((r-rT)/rP < rth)
-  {
+  if ((r-rT)/rP < rth) {
     G4double omega = 0.0;
     if      (AT < 12.0)  omega = 1500.0;
@@ -225 +224 @@
   else if (Es > B * AT)
     Es = B * AT;
+
+  delete revAbrasionGeometry;
+
   return Es;
 }
-////////////////////////////////////////////////////////////////////////////////
-//

trunk/source/processes/hadronic/models/abrasion/src/G4WilsonAbrasionModel.cc

@@ -34 +34 @@
 // ********************************************************************
 //
-// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // MODULE:              G4WilsonAbrasionModel.cc
@@ -45 +45 @@
 // Contract:            17191/03/NL/LvH
 //
-// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // CHANGE HISTORY
@@ -72 +72 @@
 // Additional clauses have been included in
 //    G4WilsonAbrasionModel::GetNucleonInducedExcitation
-// Previously it was possible to get sqrt of negative number as Wilson algorithm
-// not properly defined if either:
+// Previously it was possible to get sqrt of negative number as Wilson
+// algorithm not properly defined if either:
 //    rT > rP && rsq < rTsq - rPsq) or (rP > rT && rsq < rPsq - rTsq)
 //
-// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-////////////////////////////////////////////////////////////////////////////////
-//
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+///////////////////////////////////////////////////////////////////////////////
+
 #include "G4WilsonAbrasionModel.hh"
 #include "G4WilsonRadius.hh"
@@ -99 +99 @@
 #include "G4IonTable.hh"
 #include "globals.hh"
-////////////////////////////////////////////////////////////////////////////////
-//
+
+
 G4WilsonAbrasionModel::G4WilsonAbrasionModel (G4bool useAblation1)
   :G4HadronicInteraction("G4WilsonAbrasion")
 {
-//
-//
-// Send message to stdout to advise that the G4Abrasion model is being used.
-//
+  // Send message to stdout to advise that the G4Abrasion model is being used.
   PrintWelcomeMessage();
-//
-//
-// Set the default verbose level to 0 - no output.
-//
+
+  // Set the default verbose level to 0 - no output.
   verboseLevel = 0;
   useAblation  = useAblation1;
-//
-//
-// No de-excitation handler has been supplied - define the default handler.
-//
+
+  // No de-excitation handler has been supplied - define the default handler.
+
   theExcitationHandler  = new G4ExcitationHandler;
   theExcitationHandlerx = new G4ExcitationHandler;
@@ -146 +140 @@
     theExcitationHandlerx->SetMaxAandZForFermiBreakUp(12, 6);
   }
-//
-//
-// Set the minimum and maximum range for the model (despite nomanclature, this
-// is in energy per nucleon number).  
-//
+
+  // Set the minimum and maximum range for the model (despite nomanclature,
+  // this is in energy per nucleon number).  
+
   SetMinEnergy(70.0*MeV);
   SetMaxEnergy(10.1*GeV);
   isBlocked = false;
-//
-//
-// npK, when mutiplied by the nuclear Fermi momentum, determines the range of
-// momentum over which the secondary nucleon momentum is sampled.
-//
-  npK              = 5.0;
-  B                = 10.0 * MeV;
-  third            = 1.0 / 3.0;
-  fradius          = 0.99;
-  conserveEnergy   = false;
+
+  // npK, when mutiplied by the nuclear Fermi momentum, determines the range of
+  // momentum over which the secondary nucleon momentum is sampled.
+
+  r0sq = 0.0;
+  npK = 5.0;
+  B = 10.0 * MeV;
+  third = 1.0 / 3.0;
+  fradius = 0.99;
+  conserveEnergy = false;
   conserveMomentum = true;
 }
-////////////////////////////////////////////////////////////////////////////////
-//
+
+
 G4WilsonAbrasionModel::G4WilsonAbrasionModel (G4ExcitationHandler *aExcitationHandler)
 {