Geant4 Cross Reference

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


  1 // *******************************************      1 // ********************************************************************
  2 // * License and Disclaimer                         2 // * License and Disclaimer                                           *
  3 // *                                                3 // *                                                                  *
  4 // * The  Geant4 software  is  copyright of th      4 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  5 // * the Geant4 Collaboration.  It is provided      5 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  6 // * conditions of the Geant4 Software License      6 // * conditions of the Geant4 Software License,  included in the file *
  7 // * LICENSE and available at  http://cern.ch/      7 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  8 // * include a list of copyright holders.           8 // * include a list of copyright holders.                             *
  9 // *                                                9 // *                                                                  *
 10 // * Neither the authors of this software syst     10 // * Neither the authors of this software system, nor their employing *
 11 // * institutes,nor the agencies providing fin     11 // * institutes,nor the agencies providing financial support for this *
 12 // * work  make  any representation or  warran     12 // * work  make  any representation or  warranty, express or implied, *
 13 // * regarding  this  software system or assum     13 // * regarding  this  software system or assume any liability for its *
 14 // * use.  Please see the license in the file      14 // * use.  Please see the license in the file  LICENSE  and URL above *
 15 // * for the full disclaimer and the limitatio     15 // * for the full disclaimer and the limitation of liability.         *
 16 // *                                               16 // *                                                                  *
 17 // * This  code  implementation is the result      17 // * This  code  implementation is the result of  the  scientific and *
 18 // * technical work of the GEANT4 collaboratio     18 // * technical work of the GEANT4 collaboration.                      *
 19 // * By using,  copying,  modifying or  distri     19 // * By using,  copying,  modifying or  distributing the software (or *
 20 // * any work based  on the software)  you  ag     20 // * any work based  on the software)  you  agree  to acknowledge its *
 21 // * use  in  resulting  scientific  publicati     21 // * use  in  resulting  scientific  publications,  and indicate your *
 22 // * acceptance of all terms of the Geant4 Sof     22 // * acceptance of all terms of the Geant4 Software license.          *
 23 // *******************************************     23 // ********************************************************************
 24 //                                                 24 //
 25 // G4ModifiedMidpoint implementation               25 // G4ModifiedMidpoint implementation
 26 //                                                 26 //
 27 // Author: Dmitry Sorokin, Google Summer of Co     27 // Author: Dmitry Sorokin, Google Summer of Code 2016
 28 // Supervision: John Apostolakis, CERN             28 // Supervision: John Apostolakis, CERN
 29 // -------------------------------------------     29 // --------------------------------------------------------------------
 30                                                    30 
 31 #include "G4ModifiedMidpoint.hh"                   31 #include "G4ModifiedMidpoint.hh"
 32 #include "G4FieldUtils.hh"                         32 #include "G4FieldUtils.hh"
 33                                                    33 
 34 using namespace field_utils;                       34 using namespace field_utils;
 35                                                    35 
 36 G4ModifiedMidpoint::G4ModifiedMidpoint( G4Equa     36 G4ModifiedMidpoint::G4ModifiedMidpoint( G4EquationOfMotion* equation,
 37                                         G4int      37                                         G4int nvar, G4int steps )
 38   : fEquation(equation), fnvar(nvar), fsteps(s     38   : fEquation(equation), fnvar(nvar), fsteps(steps)
 39 {                                                  39 {
 40   if (nvar <= 0)                                   40   if (nvar <= 0)
 41   {                                                41   {
 42     G4Exception("G4ModifiedMidpoint::G4Modifie     42     G4Exception("G4ModifiedMidpoint::G4ModifiedMidpoint()",
 43                 "GeomField0002", FatalExceptio     43                 "GeomField0002", FatalException,
 44                 "Invalid number of variables;      44                 "Invalid number of variables; must be greater than zero!");
 45   }                                                45   }
 46 }                                                  46 }
 47                                                    47 
 48 void G4ModifiedMidpoint::DoStep( const G4doubl     48 void G4ModifiedMidpoint::DoStep( const G4double yIn[], const G4double dydyIn[],
 49                                  G4double yOut     49                                  G4double yOut[], G4double hstep) const
 50 {                                                  50 {
 51   G4double y0[G4FieldTrack::ncompSVEC];            51   G4double y0[G4FieldTrack::ncompSVEC];
 52   G4double y1[G4FieldTrack::ncompSVEC];            52   G4double y1[G4FieldTrack::ncompSVEC];
 53   G4double yTemp[G4FieldTrack::ncompSVEC];         53   G4double yTemp[G4FieldTrack::ncompSVEC];
 54   setValue(yIn, Value1D::LabTime, y0, y1, yTem     54   setValue(yIn, Value1D::LabTime, y0, y1, yTemp, yOut);
 55                                                    55 
 56   G4double dydx[G4FieldTrack::ncompSVEC];          56   G4double dydx[G4FieldTrack::ncompSVEC];
 57                                                    57 
 58   const G4double h = hstep / fsteps;               58   const G4double h = hstep / fsteps;
 59   const G4double h2 = 2 * h;                       59   const G4double h2 = 2 * h;
 60                                                    60 
 61   // y1 = yIn + h * dydx                           61   // y1 = yIn + h * dydx
 62   //                                               62   //
 63   for (G4int i = 0; i < fnvar; ++i)                63   for (G4int i = 0; i < fnvar; ++i)
 64   {                                                64   {
 65     y1[i] = yIn[i] + h * dydyIn[i];                65     y1[i] = yIn[i] + h * dydyIn[i];
 66   }                                                66   }
 67                                                    67 
 68   fEquation->RightHandSide(y1, dydx);              68   fEquation->RightHandSide(y1, dydx);
 69                                                    69 
 70   copy(y0, yIn);                                   70   copy(y0, yIn);
 71                                                    71 
 72   // general step                                  72   // general step
 73   // yTemp = y1; y1 = y0 + h2 * dydx; y0 = yTe     73   // yTemp = y1; y1 = y0 + h2 * dydx; y0 = yTemp
 74   //                                               74   //
 75   for (G4int i = 1; i < fsteps; ++i)               75   for (G4int i = 1; i < fsteps; ++i)
 76   {                                                76   {
 77     copy(yTemp, y1);                               77     copy(yTemp, y1);
 78     for (G4int j = 0; j < fnvar; ++j)              78     for (G4int j = 0; j < fnvar; ++j)
 79     {                                              79     {
 80       y1[j] = y0[j] + h2 * dydx[j];                80       y1[j] = y0[j] + h2 * dydx[j];
 81     }                                              81     }
 82     copy(y0, yTemp);                               82     copy(y0, yTemp);
 83                                                    83 
 84     fEquation->RightHandSide(y1, dydx);            84     fEquation->RightHandSide(y1, dydx);
 85   }                                                85   }
 86                                                    86 
 87   // last step                                     87   // last step
 88   // yOut = 0.5 * (y0 + y1 + h * dydx)             88   // yOut = 0.5 * (y0 + y1 + h * dydx)
 89   //                                               89   //
 90   for (G4int i = 0; i < fnvar; ++i)                90   for (G4int i = 0; i < fnvar; ++i)
 91   {                                                91   {
 92     yOut[i] = 0.5 * (y0[i] + y1[i] + h * dydx[     92     yOut[i] = 0.5 * (y0[i] + y1[i] + h * dydx[i]);
 93   }                                                93   }
 94 }                                                  94 }
 95                                                    95 
 96 void G4ModifiedMidpoint::DoStep( const G4doubl     96 void G4ModifiedMidpoint::DoStep( const G4double yIn[], const G4double dydxIn[],
 97                            G4double yOut[], G4     97                            G4double yOut[], G4double hstep, G4double yMid[],
 98                            G4double derivs[][G     98                            G4double derivs[][G4FieldTrack::ncompSVEC]) const
 99 {                                                  99 {
100   G4double y0[G4FieldTrack::ncompSVEC];           100   G4double y0[G4FieldTrack::ncompSVEC];
101   G4double y1[G4FieldTrack::ncompSVEC];           101   G4double y1[G4FieldTrack::ncompSVEC];
102   G4double yTemp[G4FieldTrack::ncompSVEC];        102   G4double yTemp[G4FieldTrack::ncompSVEC];
103   setValue(yIn, Value1D::LabTime, y0, y1, yTem    103   setValue(yIn, Value1D::LabTime, y0, y1, yTemp, yMid, yOut);
104                                                   104 
105   const G4double h = hstep / fsteps;              105   const G4double h = hstep / fsteps;
106   const G4double h2 = 2 * h;                      106   const G4double h2 = 2 * h;
107                                                   107 
108   // y0 = yIn                                     108   // y0 = yIn
109   copy(y0, yIn);                                  109   copy(y0, yIn);
110                                                   110 
111   // y1 = y0 + h * dydx                           111   // y1 = y0 + h * dydx
112   for (G4int i = 0; i < fnvar; ++i)               112   for (G4int i = 0; i < fnvar; ++i)
113   {                                               113   {
114     y1[i] = y0[i] + h * dydxIn[i];                114     y1[i] = y0[i] + h * dydxIn[i];
115   }                                               115   }
116                                                   116 
117   // result of first step already gives approx    117   // result of first step already gives approximation
118   // at the center of the interval                118   // at the center of the interval
119   //                                              119   //
120   if(fsteps == 2)                                 120   if(fsteps == 2)
121   {                                               121   {
122     copy(yMid, y1);                               122     copy(yMid, y1);
123   }                                               123   }
124                                                   124 
125   fEquation->RightHandSide(y1, derivs[0]);        125   fEquation->RightHandSide(y1, derivs[0]);
126                                                   126 
127   // general step                                 127   // general step
128   // yTemp = y1; y1 = y0 + h2 * dydx; y0 = yTe    128   // yTemp = y1; y1 = y0 + h2 * dydx; y0 = yTemp
129   //                                              129   //
130   for (G4int i = 1; i < fsteps; ++i)              130   for (G4int i = 1; i < fsteps; ++i)
131   {                                               131   {
132     copy(yTemp, y1);                              132     copy(yTemp, y1);
133     for (G4int j = 0; j < fnvar; ++j)             133     for (G4int j = 0; j < fnvar; ++j)
134     {                                             134     {
135       y1[j] = y0[j] + h2 * derivs[i-1][j];        135       y1[j] = y0[j] + h2 * derivs[i-1][j];
136     }                                             136     }
137     copy(y0, yTemp);                              137     copy(y0, yTemp);
138                                                   138 
139     // save approximation at the center of the    139     // save approximation at the center of the interval
140     if(i == fsteps / 2 - 1 )                      140     if(i == fsteps / 2 - 1 )
141     {                                             141     {
142       copy(yMid, y1);                             142       copy(yMid, y1);
143     }                                             143     }
144                                                   144 
145     fEquation->RightHandSide(y1, derivs[i]);      145     fEquation->RightHandSide(y1, derivs[i]);
146   }                                               146   }
147                                                   147 
148   // last step                                    148   // last step
149   // yOut = 0.5 * (y0 + y1 + h * dydx)            149   // yOut = 0.5 * (y0 + y1 + h * dydx)
150   //                                              150   //
151   for (G4int i = 0; i < fnvar; ++i)               151   for (G4int i = 0; i < fnvar; ++i)
152   {                                               152   {
153     yOut[i] = 0.5 * (y0[i] + y1[i] + h * deriv    153     yOut[i] = 0.5 * (y0[i] + y1[i] + h * derivs[fsteps-1][i]);
154   }                                               154   }
155 }                                                 155 }
156                                                   156 
157 void G4ModifiedMidpoint::copy(G4double dst[],     157 void G4ModifiedMidpoint::copy(G4double dst[], const G4double src[]) const
158 {                                                 158 {
159   std::memcpy(dst, src, sizeof(G4double) * fnv    159   std::memcpy(dst, src, sizeof(G4double) * fnvar);
160 }                                                 160 }
161                                                   161