Merge pull request #853 from tpersson/fixDynAppModule

Removed redunant column for the dynap module
MethodicalAcceleratorDesign · Jan 21, 2020 · d0625c2 · d0625c2
2 parents 62ce08b + 3a9a4fd
commit d0625c2
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 51 deletions.
diff --git a/src/dynap.f90 b/src/dynap.f90
@@ -146,7 +146,6 @@ subroutine dynapfill()
   !   lyapunov  (real)    : interpolated Lyapunov exponent               * ghislain
   !----------------------------------------------------------------------*
 
-  call double_to_table_curr('dynap ', 'dynapfrac ', dynapfrac)
   call double_to_table_curr('dynap ', 'dktrturns ', dktrturns)
   call double_to_table_curr('dynap ', 'xend ',      xend )
   call double_to_table_curr('dynap ', 'pxend ',     pxend )

diff --git a/src/mad_gcst.c b/src/mad_gcst.c
@@ -725,14 +725,14 @@ const char* const trackloss_table_cols[] =
 
 const int dynap_table_types[] =
 {
-  2,2,2,2,2,
+  2,2,2,2,
   2,2,2,2,2,2,
   2,2,2,2,2
 };
 
 const char* const dynap_table_cols[] =
 {
-  "dynapfrac", "dktrturns", "xend", "pxend", "yend",
+  "dktrturns", "xend", "pxend", "yend",
   "pyend", "tend", "ptend", "wxmin", "wxmax", "wymin", "wymax",
   //"wxymin", "wxymax", "smear", "yapunov",
   "wxymin", "wxymax", "smear", "lyapunov",