Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4SimpleHeum.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/G4SimpleHeum.cc (Version 11.3.0) and /geometry/magneticfield/src/G4SimpleHeum.cc (Version 8.3.p1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 // G4SimpleHeum implementation                 << 
 27 //                                                 26 //
 28 // Created: W.Wander <wwc@mit.edu>, 12/09/1997 <<  27 // $Id: G4SimpleHeum.cc,v 1.8 2006/06/29 18:24:51 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-08-03-patch-01 $
                                                   >>  29 //
                                                   >>  30 //  Simple Heum:
                                                   >>  31 //        x_1 = x_0 + h *
                                                   >>  32 //                1/4 * dx(t0,x0)  +
                                                   >>  33 //                3/4 * dx(t0+2/3*h, x0+2/3*h*(dx(t0+h/3,x0+h/3*dx(t0,x0)))) 
                                                   >>  34 //
                                                   >>  35 // Third order solver.
                                                   >>  36 //
                                                   >>  37 //  W.Wander <wwc@mit.edu> 12/09/97 
 29 // -------------------------------------------     38 // -------------------------------------------------------------------
 30                                                    39 
 31 #include "G4SimpleHeum.hh"                         40 #include "G4SimpleHeum.hh"
 32 #include "G4ThreeVector.hh"                        41 #include "G4ThreeVector.hh"
 33                                                    42 
 34 //////////////////////////////////////////////     43 ///////////////////////////////////////////////////////////////////////////
 35 //                                                 44 //
 36 // Constructor                                     45 // Constructor
 37 //                                             <<  46 
 38 G4SimpleHeum::G4SimpleHeum(G4EquationOfMotion* <<  47 G4SimpleHeum::G4SimpleHeum(G4EquationOfMotion *EqRhs, G4int num_variables): 
 39   : G4MagErrorStepper(EqRhs, num_variables),   <<  48   G4MagErrorStepper(EqRhs, num_variables),
 40     fNumberOfVariables(num_variables)          <<  49   fNumberOfVariables(num_variables)
 41 {                                                  50 {
 42   dydxTemp  = new G4double[fNumberOfVariables]     51   dydxTemp  = new G4double[fNumberOfVariables] ; 
 43   dydxTemp2 = new G4double[fNumberOfVariables]     52   dydxTemp2 = new G4double[fNumberOfVariables] ;
 44   yTemp     = new G4double[fNumberOfVariables]     53   yTemp     = new G4double[fNumberOfVariables] ; 
 45   yTemp2    = new G4double[fNumberOfVariables]     54   yTemp2    = new G4double[fNumberOfVariables] ;
 46 }                                                  55 }
 47                                                    56 
                                                   >>  57 
 48 //////////////////////////////////////////////     58 //////////////////////////////////////////////////////////////////////////
 49 //                                                 59 //
 50 // Destructor                                      60 // Destructor
 51 //                                             <<  61 
 52 G4SimpleHeum::~G4SimpleHeum()                      62 G4SimpleHeum::~G4SimpleHeum()
 53 {                                                  63 {
 54   delete [] dydxTemp;                          <<  64   delete[] dydxTemp;
 55   delete [] dydxTemp2;                         <<  65   delete[] dydxTemp2;
 56   delete [] yTemp;                             <<  66   delete[] yTemp;
 57   delete [] yTemp2;                            <<  67   delete[] yTemp2;
 58 }                                                  68 }
 59                                                    69 
                                                   >>  70 
 60 //////////////////////////////////////////////     71 //////////////////////////////////////////////////////////////////////
 61 //                                                 72 //
 62 // DumbStepper                                 << 
 63 //                                                 73 //
                                                   >>  74 
 64 void                                               75 void
 65 G4SimpleHeum::DumbStepper( const G4double yIn[ <<  76 G4SimpleHeum::DumbStepper( const G4double  yIn[],
 66                            const G4double dydx <<  77          const G4double  dydx[],
 67                                  G4double h,   <<  78                G4double  h,
 68                                  G4double yOut <<  79          G4double  yOut[])
 69 {                                                  80 {
 70   for( G4int i = 0; i < fNumberOfVariables; ++ <<  81   //  const G4int nvar = 6 ;
                                                   >>  82 
                                                   >>  83   G4int i;
                                                   >>  84 
                                                   >>  85   for( i = 0; i < fNumberOfVariables; i++ ) 
 71   {                                                86   {
 72     yTemp[i] = yIn[i] + (1.0/3.0) * h *  dydx[     87     yTemp[i] = yIn[i] + (1.0/3.0) * h *  dydx[i] ;
 73   }                                                88   }
 74                                                    89   
 75   RightHandSide(yTemp,dydxTemp);                   90   RightHandSide(yTemp,dydxTemp);
 76                                                    91 
 77   for( G4int i = 0; i < fNumberOfVariables; ++ <<  92   for( i = 0; i < fNumberOfVariables; i++ ) 
 78   {                                                93   {
 79     yTemp2[i] = yIn[i] + (2.0/3.0) * h * dydxT     94     yTemp2[i] = yIn[i] + (2.0/3.0) * h * dydxTemp[i] ;
 80   }                                                95   }
 81                                                    96 
 82   RightHandSide(yTemp2,dydxTemp2);                 97   RightHandSide(yTemp2,dydxTemp2);
 83                                                    98 
 84   for( G4int i = 0; i < fNumberOfVariables; ++ <<  99   for( i = 0; i < fNumberOfVariables; i++ ) 
 85   {                                               100   {
 86     yOut[i] = yIn[i] + h * (0.25 * dydx[i] + 0 << 101     yOut[i] = yIn[i] + h * ( 0.25 * dydx[i] +
                                                   >> 102            0.75 * dydxTemp2[i]);
 87   }                                               103   }
 88                                                   104       
 89   if ( fNumberOfVariables == 12 ) { NormaliseP << 105   // NormaliseTangentVector( yOut );           
 90 }                                                 106 }  
 91                                                   107