Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4SimpleRunge.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /geometry/magneticfield/src/G4SimpleRunge.cc (Version 11.3.0) and /geometry/magneticfield/src/G4SimpleRunge.cc (Version 6.1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                    <<   3 // * DISCLAIMER                                                       *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th <<   5 // * The following disclaimer summarizes all the specific disclaimers *
  6 // * the Geant4 Collaboration.  It is provided <<   6 // * of contributors to this software. The specific disclaimers,which *
  7 // * conditions of the Geant4 Software License <<   7 // * govern, are listed with their locations in:                      *
  8 // * LICENSE and available at  http://cern.ch/ <<   8 // *   http://cern.ch/geant4/license                                  *
  9 // * include a list of copyright holders.      << 
 10 // *                                                9 // *                                                                  *
 11 // * Neither the authors of this software syst     10 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     11 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     12 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     13 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file  <<  14 // * use.                                                             *
 16 // * for the full disclaimer and the limitatio << 
 17 // *                                               15 // *                                                                  *
 18 // * This  code  implementation is the result  <<  16 // * This  code  implementation is the  intellectual property  of the *
 19 // * technical work of the GEANT4 collaboratio <<  17 // * GEANT4 collaboration.                                            *
 20 // * By using,  copying,  modifying or  distri <<  18 // * By copying,  distributing  or modifying the Program (or any work *
 21 // * any work based  on the software)  you  ag <<  19 // * based  on  the Program)  you indicate  your  acceptance of  this *
 22 // * use  in  resulting  scientific  publicati <<  20 // * statement, and all its terms.                                    *
 23 // * acceptance of all terms of the Geant4 Sof << 
 24 // *******************************************     21 // ********************************************************************
 25 //                                                 22 //
 26 // G4SimpleRunge implementation                << 
 27 //                                                 23 //
 28 // Created: W.Wander <wwc@mit.edu>, 12/09/1997 <<  24 // $Id: G4SimpleRunge.cc,v 1.9 2003/11/05 16:31:49 japost Exp $
                                                   >>  25 // GEANT4 tag $Name: geant4-06-00-patch-01 $
                                                   >>  26 //
                                                   >>  27 //  Simple Runge:
                                                   >>  28 //
                                                   >>  29 //        x_1 = x_0 + h * ( dx( t_0+h/2, x_0 + h/2 * dx( t_0, x_0) ) )
                                                   >>  30 //
                                                   >>  31 // Second order solver.
                                                   >>  32 // Takes the derivative at a position to be assumed at the middle of the
                                                   >>  33 // Step and adds it to the current position.
                                                   >>  34 //
                                                   >>  35 //
                                                   >>  36 //  W.Wander <wwc@mit.edu> 12/09/97 
 29 // -------------------------------------------     37 // -------------------------------------------------------------------
 30                                                    38 
 31 #include "G4SimpleRunge.hh"                        39 #include "G4SimpleRunge.hh"
 32 #include "G4ThreeVector.hh"                        40 #include "G4ThreeVector.hh"
 33                                                    41 
 34 //////////////////////////////////////////////     42 ////////////////////////////////////////////////////////////////
 35 //                                                 43 //
 36 // Constructor                                     44 // Constructor
 37 //                                             <<  45 
 38 G4SimpleRunge::G4SimpleRunge(G4EquationOfMotio     46 G4SimpleRunge::G4SimpleRunge(G4EquationOfMotion* EqRhs, G4int numberOfVariables)
 39   : G4MagErrorStepper(EqRhs, numberOfVariables     47   : G4MagErrorStepper(EqRhs, numberOfVariables),
 40     fNumberOfVariables(numberOfVariables)          48     fNumberOfVariables(numberOfVariables)
 41 {                                                  49 {
 42                                                    50    
 43    unsigned int noVariables= std::max(numberOf     51    unsigned int noVariables= std::max(numberOfVariables,
 44                                       GetNumbe <<  52           GetNumberOfStateVariables()); 
 45                                              /     53                                              // To deal with Time >= 7+1 
 46    dydxTemp = new G4double[noVariables] ;          54    dydxTemp = new G4double[noVariables] ;
 47    yTemp    = new G4double[noVariables] ;          55    yTemp    = new G4double[noVariables] ;
 48 }                                                  56 }
 49                                                    57 
                                                   >>  58 
 50 //////////////////////////////////////////////     59 /////////////////////////////////////////////////////////////////
 51 //                                                 60 //
 52 // Destructor                                      61 // Destructor
 53 //                                             <<  62 
 54 G4SimpleRunge::~G4SimpleRunge()                    63 G4SimpleRunge::~G4SimpleRunge()
 55 {                                                  64 {
 56    delete [] dydxTemp;                         <<  65    delete[] dydxTemp;
 57    delete [] yTemp;                            <<  66    delete[] yTemp;
 58 }                                                  67 }
 59                                                    68 
 60 //////////////////////////////////////////////     69 //////////////////////////////////////////////////////////////////
 61 //                                                 70 //
 62 // DumbStepper                                 << 
 63 //                                                 71 //
                                                   >>  72 
 64 void                                               73 void
 65 G4SimpleRunge::DumbStepper( const G4double  yI     74 G4SimpleRunge::DumbStepper( const G4double  yIn[],
 66                             const G4double  dy <<  75           const G4double  dydx[],
 67                                   G4double  h, <<  76                 G4double  h,
 68                                    G4double  y <<  77           G4double  yOut[])
 69 {                                                  78 {
 70   // Initialise time to t0, needed when it is      79   // Initialise time to t0, needed when it is not updated by the integration.
 71   //                                           <<  80   yTemp[7] = yOut[7] = yIn[7];   //  Better to set it to NaN;  // TODO
 72   yTemp[7] = yOut[7] = yIn[7];                 <<  81 
                                                   >>  82   G4int i;
 73                                                    83 
 74   for( G4int i = 0; i < fNumberOfVariables; ++ <<  84   for( i = 0; i < fNumberOfVariables; i++ ) 
 75   {                                                85   {
 76     yTemp[i] = yIn[i] + 0.5 * h*dydx[i] ;          86     yTemp[i] = yIn[i] + 0.5 * h*dydx[i] ;
 77   }                                                87   }
 78                                                    88   
 79   RightHandSide(yTemp,dydxTemp);                   89   RightHandSide(yTemp,dydxTemp);
 80                                                    90   
 81   for( G4int i = 0; i < fNumberOfVariables; ++ <<  91   for( i = 0; i < fNumberOfVariables; i++ ) 
 82   {                                                92   {
 83     yOut[i] = yIn[i] + h * ( dydxTemp[i] );        93     yOut[i] = yIn[i] + h * ( dydxTemp[i] );
 84   }                                                94   }
 85 }                                                  95 }  
 86                                                    96