Import Geant4 5.0.0 source tree

source/geometry/magneticfield/src/G4SimpleRunge.cc

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4SimpleRunge.cc,v 1.4 2001/07/11 09:59:13 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4SimpleRunge.cc,v 1.6 2002/11/29 23:17:16 japost Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //  Simple Runge:
 //
@@ -49,8 +49,12 @@ G4SimpleRunge::G4SimpleRunge(G4Mag_EqRhs *EqRhs, G4int numberOfVariables)
   : G4MagErrorStepper(EqRhs, numberOfVariables),
     fNumberOfVariables(numberOfVariables)
 {
-   dydxTemp = new G4double[fNumberOfVariables] ;
-   yTemp    = new G4double[fNumberOfVariables] ;
+   
+   unsigned int noVariables= G4std::max(numberOfVariables,
+					GetNumberOfStateVariables()); 
+                                             // To deal with Time >= 7+1 
+   dydxTemp = new G4double[noVariables] ;
+   yTemp    = new G4double[noVariables] ;
 }
 
 
@@ -60,10 +64,10 @@ G4SimpleRunge::G4SimpleRunge(G4Mag_EqRhs *EqRhs, G4int numberOfVariables)
 
 G4SimpleRunge::~G4SimpleRunge()
 {
-   ;
+   delete[] dydxTemp;
+   delete[] yTemp;
 }
 
-
 //////////////////////////////////////////////////////////////////
 //
 //
@@ -74,7 +78,9 @@ G4SimpleRunge::DumbStepper( const G4double  yIn[],
 			          G4double  h,
 			 	  G4double  yOut[])
 {
-  //  const G4int nvar = 6 ;
+  // Initialise time to t0, needed when it is not updated by the integration.
+  yTemp[7] = yOut[7] = yIn[7];   //  Better to set it to NaN;  // TODO
+
   G4int i;
 
   for( i = 0; i < fNumberOfVariables; i++ ) 
@@ -89,7 +95,5 @@ G4SimpleRunge::DumbStepper( const G4double  yIn[],
     yOut[i] = yIn[i] + h * ( dydxTemp[i] );
   }
 
-  // NormaliseTangentVector( yOut );           
-  
   return ;
 }