Geant4 Cross Reference

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


                                                   >>   1 // This code implementation is the intellectual property of
                                                   >>   2 // the GEANT4 collaboration.
  1 //                                                  3 //
  2 // ******************************************* <<   4 // By copying, distributing or modifying the Program (or any work
  3 // * License and Disclaimer                    <<   5 // based on the Program) you indicate your acceptance of this statement,
  4 // *                                           <<   6 // and all its terms.
  5 // * The  Geant4 software  is  copyright of th << 
  6 // * the Geant4 Collaboration.  It is provided << 
  7 // * conditions of the Geant4 Software License << 
  8 // * LICENSE and available at  http://cern.ch/ << 
  9 // * include a list of copyright holders.      << 
 10 // *                                           << 
 11 // * Neither the authors of this software syst << 
 12 // * institutes,nor the agencies providing fin << 
 13 // * work  make  any representation or  warran << 
 14 // * regarding  this  software system or assum << 
 15 // * use.  Please see the license in the file  << 
 16 // * for the full disclaimer and the limitatio << 
 17 // *                                           << 
 18 // * This  code  implementation is the result  << 
 19 // * technical work of the GEANT4 collaboratio << 
 20 // * By using,  copying,  modifying or  distri << 
 21 // * any work based  on the software)  you  ag << 
 22 // * use  in  resulting  scientific  publicati << 
 23 // * acceptance of all terms of the Geant4 Sof << 
 24 // ******************************************* << 
 25 //                                                  7 //
 26 // G4MagErrorStepper implementation            <<   8 // $Id: G4MagErrorStepper.cc,v 1.8 2000/11/01 15:15:53 gcosmo Exp $
                                                   >>   9 // GEANT4 tag $Name: geant4-03-01 $
 27 //                                                 10 //
 28 // Author: W.Wander <wwc@mit.edu>, 09.12.1997  << 
 29 // ------------------------------------------- << 
 30                                                << 
 31 #include "G4MagErrorStepper.hh"                    11 #include "G4MagErrorStepper.hh"
                                                   >>  12 #include "G4ThreeVector.hh"
 32 #include "G4LineSection.hh"                        13 #include "G4LineSection.hh"
 33                                                    14 
 34 G4MagErrorStepper::~G4MagErrorStepper()            15 G4MagErrorStepper::~G4MagErrorStepper()
 35 {                                                  16 {
 36    delete [] yMiddle;                          <<  17    delete[] yMiddle;
 37    delete [] dydxMid;                          <<  18    delete[] dydxMid;
 38    delete [] yInitial;                         <<  19    delete[] yInitial;
 39    delete [] yOneStep;                         <<  20    delete[] yOneStep;
 40 }                                                  21 }
 41                                                    22 
 42 void G4MagErrorStepper::Stepper( const G4doubl <<  23 void
 43                                  const G4doubl <<  24 G4MagErrorStepper::Stepper( const G4double yInput[],
 44                                        G4doubl <<  25                 const G4double dydx[],
 45                                        G4doubl <<  26                       G4double hstep,
 46                                        G4doubl <<  27                       G4double yOutput[],
                                                   >>  28                       G4double yError []      )
 47 {                                                  29 {  
 48    const G4int nvar = GetNumberOfVariables();  <<  30    const G4int nvar = this->GetNumberOfVariables() ;
 49    const G4int maxvar = GetNumberOfStateVariab << 
 50                                                    31 
                                                   >>  32    G4int i;
 51    // correction for Richardson Extrapolation.     33    // correction for Richardson Extrapolation.
 52    //                                          << 
 53    G4double  correction = 1. / ( (1 << Integra     34    G4double  correction = 1. / ( (1 << IntegratorOrder()) -1 );
 54                                                    35    
 55    //  Saving yInput because yInput and yOutpu     36    //  Saving yInput because yInput and yOutput can be aliases for same array
 56    //                                          <<  37 
 57    for(G4int i=0; i<nvar; ++i)                 <<  38    for(i=0;i<nvar;i++) yInitial[i]=yInput[i];
 58    {                                           << 
 59      yInitial[i]=yInput[i];                    << 
 60    }                                           << 
 61    yInitial[7] = yInput[7]; // Copy the time i << 
 62    yMiddle[7] = yInput[7];  // Copy the time f << 
 63    yOneStep[7] = yInput[7]; // As it contribut << 
 64    // yOutput[7] = yInput[7];  // -> dumb step << 
 65                                                << 
 66    for(G4int i=nvar; i<maxvar; ++i)            << 
 67    {                                           << 
 68      yOutput[i]=yInput[i];                     << 
 69    }                                           << 
 70    // yError[7] = 0.0;                         << 
 71                                                    39 
 72    G4double halfStep = hstep * 0.5;                40    G4double halfStep = hstep * 0.5; 
 73                                                    41 
 74    // Do two half steps                            42    // Do two half steps
 75    //                                          <<  43 
 76    DumbStepper  (yInitial,  dydx,   halfStep,      44    DumbStepper  (yInitial,  dydx,   halfStep, yMiddle);
 77    RightHandSide(yMiddle, dydxMid);                45    RightHandSide(yMiddle, dydxMid);    
 78    DumbStepper  (yMiddle, dydxMid, halfStep, y     46    DumbStepper  (yMiddle, dydxMid, halfStep, yOutput); 
 79                                                    47 
 80    // Store midpoint, chord calculation            48    // Store midpoint, chord calculation
 81    //                                          <<  49 
 82    fMidPoint = G4ThreeVector( yMiddle[0],  yMi     50    fMidPoint = G4ThreeVector( yMiddle[0],  yMiddle[1],  yMiddle[2]); 
 83                                                    51 
 84    // Do a full Step                               52    // Do a full Step
 85    //                                          << 
 86    DumbStepper(yInitial, dydx, hstep, yOneStep     53    DumbStepper(yInitial, dydx, hstep, yOneStep);
 87    for(G4int i=0; i<nvar; ++i)                 <<  54    for(i=0;i<nvar;i++) {
 88    {                                           << 
 89       yError [i] = yOutput[i] - yOneStep[i] ;      55       yError [i] = yOutput[i] - yOneStep[i] ;
 90       yOutput[i] += yError[i]*correction ;     <<  56       yOutput[i] += yError[i]*correction ;  // Provides accuracy increased
 91         // Provides accuracy increased by 1 or <<  57                                             // by 1 order via the 
                                                   >>  58                                             // Richardson Extrapolation  
 92    }                                               59    }
 93                                                    60 
 94    fInitialPoint = G4ThreeVector( yInitial[0],     61    fInitialPoint = G4ThreeVector( yInitial[0], yInitial[1], yInitial[2]); 
 95    fFinalPoint   = G4ThreeVector( yOutput[0],      62    fFinalPoint   = G4ThreeVector( yOutput[0],  yOutput[1],  yOutput[2]); 
 96                                                    63 
 97    return;                                     <<  64    return ;
 98 }                                                  65 }
 99                                                    66 
100 G4double G4MagErrorStepper::DistChord() const  <<  67 
                                                   >>  68 
                                                   >>  69 G4double
                                                   >>  70 G4MagErrorStepper::DistChord() const 
101 {                                                  71 {
102   // Estimate the maximum distance from the cu     72   // Estimate the maximum distance from the curve to the chord
103   //                                               73   //
104   // We estimate this using the distance of th <<  74   //  We estimate this using the distance of the midpoint to 
105   // chord (the line between                   <<  75   //  chord (the line between 
106   //                                               76   // 
107   // Method below is good only for angle devia <<  77   //  Method below is good only for angle deviations < 2 pi, 
108   // This restriction should not a problem for <<  78   //   This restriction should not a problem for the Runge cutta methods, 
109   // which generally cannot integrate accurate <<  79   //   which generally cannot integrate accurately for large angle deviations.
110                                                << 
111   G4double distLine, distChord;                    80   G4double distLine, distChord; 
112                                                    81 
113   if (fInitialPoint != fFinalPoint)            <<  82   if (fInitialPoint != fFinalPoint) {
114   {                                            <<  83      distLine= G4LineSection::Distline( fMidPoint, fInitialPoint, fFinalPoint );
115      distLine = G4LineSection::Distline(fMidPo <<  84      // This is a class method that gives distance of Mid 
116        // This is a class method that gives di <<  85      //  from the Chord between the Initial and Final points.
117        // from the Chord between the Initial a << 
118                                                    86 
119      distChord = distLine;                         87      distChord = distLine;
120   }                                            <<  88   }else{
121   else                                         << 
122   {                                            << 
123      distChord = (fMidPoint-fInitialPoint).mag     89      distChord = (fMidPoint-fInitialPoint).mag();
124   }                                                90   }
125                                                    91 
126   return distChord;                                92   return distChord;
127 }                                                  93 }
                                                   >>  94  
128                                                    95