1. 18 Apr, 2012 2 commits
  2. 17 Apr, 2012 9 commits
    • adelmann's avatar
      In OPAL several different TRACK's can performed within one simulation (does... · 06df9215
      adelmann authored
      In OPAL several different TRACK's can performed within one simulation (does not hold for OPAL-cycl yet) this together with 
      the restart capabilities calls for a delicate logic.
      
      Different tracks, looks like: 
      
      .....
      
      TRACK, LINE= Injector, BEAM=beam1, MAXSTEPS=100, DT=1.0e-12, ZSTOP=0.14;  
       RUN, METHOD = "PARALLEL-T", BEAM = beam1, FIELDSOLVER = Fs1, DISTRIBUTION = Dist1;
      ENDTRACK;
      
      TRACK,LINE= Injector, BEAM=beam1, MAXSTEPS=50, DT=1.0e-11, ZSTOP=0.20;
       RUN, METHOD = "PARALLEL-T", BEAM=beam1, FIELDSOLVER=Fs1;
      ENDTRACK;
      STOP;
      
      A run with the arguments -restart -1 will continue a track from the last dump in the h5 file. Other the from the last track will
      at the moment certainly fail in the general case. 
      
      Changes: 
      
      - The h5 attribute TrackStep is not longer available anymore. Two new attributes: LocalTrackStep and GlobalTrackStep are introduced instead.
      
      - LocalTrackStep refers to the track step in a track command (0 ... 99 and 0... 49 in teh above example), where the GlobalTrackStep is the 
      accumulated number of steps i.e. 0 ... 149, shown in OPAL's screen output. Both local and global track steps are also written into the h5 file 
      in order to properly restart the simulation.
      
      - The PartBunch object has get/set and increment functions:
      
          inline void setGlobalTrackStep(long long n) {globalTrackStep_m = n;}
          inline long long getGlobalTrackStep() const {return globalTrackStep_m;}
      
          inline void setLocalTrackStep(long long n) {localTrackStep_m = n;}
          inline long long getLocalTrackStep() const {return localTrackStep_m;}
          inline void incLocalTrackStep() {localTrackStep_m++; globalTrackStep_m++;)
      
              
      - In OPAL-cyc getTrackStep is replace by getLocalTrackStep assuming we only have one TRACK in the simulation.
      
      - In the ParallelTTracker at the end of the main loop (in execute()) obsolet code is removed (cleanup monitors etc.)
        
      For details see the diff :-)
      
      Still some work todo: 
      
      a) Need to remove: setLastStep in ParallelTTracker.cpp and in general
      
          getInstance()->getLastStep()
          getInstance()->getRestartStep() maybe not!
      
      b) The get/set and increment functions could very well be in an other class!
      
      c) ParallelPlate tests are broken but maybe also because of other changes need to fix this 
         together with Chuang and Achim
      
      d) Make sure the restart works in OPAL-cycl we do not have yet a regression test for that.
      
      06df9215
    • Matthias Toggweiler's avatar
      Cleanup for CYCL · 7af55a0b
      Matthias Toggweiler authored
          - simplify checkNumPart
          - clean up function initDistInGlobalFrame
                - correct indentation
                - move AUTO mode stuff down where meanR is calculated already
          - referenceR is not used in Tracker_MTS body, so remove it
      7af55a0b
    • Matthias Toggweiler's avatar
      Deal with plugin elements in every substep of MTS tracking · 6d4e0374
      Matthias Toggweiler authored
          - Needed to add member variables turnnumber_m, eta_m
      6d4e0374
    • Jianjun Yang's avatar
      fix re-defining of flagNeedUpdate · 4c9326af
      Jianjun Yang authored
      4c9326af
    • kraus's avatar
      Merge branch 'develop' into svn: more pretty printing; change variable names... · 3cd7067d
      kraus authored
      Merge branch 'develop' into svn: more pretty printing; change variable names to comply with (unfortunately missing) coding style (Use descriptive names)
      3cd7067d
    • Jianjun Yang's avatar
      d5a52cbb
    • kraus's avatar
      Merge branch 'develop' into svn: willfully breaking Scan-1 test; the first... · 25a6f40f
      kraus authored
      Merge branch 'develop' into svn: willfully breaking Scan-1 test; the first track starts with step 0 and so should the following tracks in a scan
      25a6f40f
    • kraus's avatar
      Merge branch 'develop' into svn: fixing Scan-1 test. Interestingly this has... · f8ef93df
      kraus authored
      Merge branch 'develop' into svn: fixing Scan-1 test. Interestingly this has nothing to do with any of the changes of yesterday, still the test was broken today but not before
      f8ef93df
    • kraus's avatar
      Merge branch 'develop' into svn: field assignment seems to be VERY delicate... · b523e797
      kraus authored
      Merge branch 'develop' into svn: field assignment seems to be VERY delicate about Indices and optimization
      
      o explain why this merge is necessary,
      b523e797
  3. 16 Apr, 2012 3 commits
  4. 15 Apr, 2012 1 commit
  5. 13 Apr, 2012 3 commits
  6. 12 Apr, 2012 4 commits
  7. 11 Apr, 2012 4 commits
  8. 10 Apr, 2012 1 commit
    • Matthias Toggweiler's avatar
      Changed MTS variant for OPAL-CYCL · 7f504ec2
      Matthias Toggweiler authored
          - Different splitting allows any positive integer for MTSSUBSTEPS option
          - Requires still one space charge solve per step, but one additional
            solve before main loop. Therefore, extract code to function
            evaluateSpaceCharge
          - TODO: correct location of bunch injection code?
      7f504ec2
  9. 08 Apr, 2012 1 commit
  10. 07 Apr, 2012 1 commit
  11. 06 Apr, 2012 2 commits
  12. 05 Apr, 2012 9 commits