From 3a9a4fd04a8ee9f45926f6d2564f74ac0f3224f5 Mon Sep 17 00:00:00 2001 From: tobias Date: Fri, 8 Nov 2019 14:54:45 +0100 Subject: [PATCH] Removed redunant command. --- src/dynap.f90 | 1 - src/mad_gcst.c | 4 +- tests/test-dynap/dynap.ref | 96 +++++++++++++++++++------------------- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/dynap.f90 b/src/dynap.f90 index 705a07faf..675b61d29 100644 --- 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 index 2b8c4112d..c37bc4c3b 100644 --- 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", diff --git a/tests/test-dynap/dynap.ref b/tests/test-dynap/dynap.ref index 93980cc4f..58c1ab8f1 100644 --- a/tests/test-dynap/dynap.ref +++ b/tests/test-dynap/dynap.ref @@ -1,51 +1,51 @@ @ NAME %05s "DYNAP" @ TYPE %05s "DYNAP" @ TITLE %08s "no-title" -@ ORIGIN %16s "5.04.01 Linux 64" -@ DATE %08s "31/08/18" -@ TIME %08s "16.43.08" -* DYNAPFRAC DKTRTURNS XEND PXEND YEND PYEND TEND PTEND WXMIN WXMAX WYMIN WYMAX WXYMIN WXYMAX SMEAR LYAPUNOV -$ %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le - 0 1024 0 0 0 0 0 0 1.255549317e-12 1.583780991e-12 1.252962327e-12 1.257054931e-12 2.509140394e-12 2.840414963e-12 0.003776572387 0 - 0 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 1.366501477e-12 2.509140394e-12 5.119951464e-10 1.980257512 0.002247025527 - 0 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 3.419777153e-11 2.509140394e-12 5.124411831e-10 1.980492754 0.002628475694 - 0 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 1.266163614e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.002696124207 - 0 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 2.528218911e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.00275328347 - 0 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 3.790802974e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.002871285615 - 0 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 4.716331004e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.001919035939 - 0 1024 0 0 0 0 0 0 1.042999964e-12 5.106784877e-10 1.10650686e-12 5.043356051e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.0004355345344 - 0 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 5.043356051e-10 2.509140394e-12 2.050805978e-09 1.99508242 0.002407288413 - 0 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 5.043356051e-10 2.509140394e-12 2.055264558e-09 1.995112021 0.002626273363 - 0 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 5.090518288e-10 2.509140394e-12 2.055264558e-09 1.995122612 0.002657044704 - 0 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 1.016234382e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.002675642671 - 0 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 1.523537284e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.002710174015 - 0 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 1.897537013e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.002817000291 - 0 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.0002973227647 - 0 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 4.641489466e-09 1.997830062 0.002512810606 - 0 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 4.655145035e-09 1.99783881 0.002655622463 - 0 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.00265438277 - 0 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.292850704e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.002659768123 - 0 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 3.442868019e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.002674629897 - 0 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 4.295826659e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.002810981059 - 0 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.0003400076202 - 0 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.318979015e-09 1.998790203 0.002328347067 - 0 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.347598486e-09 1.99879452 0.002618311669 - 0 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.002669886411 - 0 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.002652119271 - 0 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 6.142000832e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.00267318046 - 0 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 7.688153685e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.002706176534 - 0 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 8.254221239e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.0006843343962 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.313250026e-08 1.999234004 0.00283138264 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.317338236e-08 1.999236426 0.002586286379 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.317338236e-08 1.999238263 0.0026339268 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.317338236e-08 1.999238263 0.002648281255 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 9.614714565e-09 2.509140394e-12 1.317338236e-08 1.999238263 0.002663241013 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 1.210659553e-08 2.509140394e-12 1.317338236e-08 1.999238263 0.002612673143 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.317338236e-08 1.999238263 0.0008399405323 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.916149291e-08 1.999475219 0.002292301765 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.920414418e-08 1.999476412 0.002689353485 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.002636466525 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.00261930183 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.382824712e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.002679724031 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.75757398e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.00260721578 - 0 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.916004305e-08 2.509140394e-12 1.924480691e-08 1.999478511 0.0005034896044 +@ ORIGIN %16s "5.05.02 Linux 64" +@ DATE %08s "08/11/19" +@ TIME %08s "14.48.57" +* DKTRTURNS XEND PXEND YEND PYEND TEND PTEND WXMIN WXMAX WYMIN WYMAX WXYMIN WXYMAX SMEAR LYAPUNOV +$ %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le + 1024 0 0 0 0 0 0 1.255549317e-12 1.583780991e-12 1.252962327e-12 1.257054931e-12 2.509140394e-12 2.840414963e-12 0.003776572387 0 + 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 1.366501477e-12 2.509140394e-12 5.119951464e-10 1.980257512 0.002247025527 + 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 3.419777153e-11 2.509140394e-12 5.124411831e-10 1.980492754 0.002628475694 + 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 1.266163614e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.002696124207 + 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 2.528218911e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.00275328347 + 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 3.790802974e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.002871285615 + 1024 0 0 0 0 0 0 1.255549317e-12 5.106784877e-10 1.10650686e-12 4.716331004e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.001919035939 + 1024 0 0 0 0 0 0 1.042999964e-12 5.106784877e-10 1.10650686e-12 5.043356051e-10 2.509140394e-12 5.124411831e-10 1.980509651 0.0004355345344 + 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 5.043356051e-10 2.509140394e-12 2.050805978e-09 1.99508242 0.002407288413 + 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 5.043356051e-10 2.509140394e-12 2.055264558e-09 1.995112021 0.002626273363 + 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 5.090518288e-10 2.509140394e-12 2.055264558e-09 1.995122612 0.002657044704 + 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 1.016234382e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.002675642671 + 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 1.523537284e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.002710174015 + 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 1.897537013e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.002817000291 + 1024 0 0 0 0 0 0 1.042999964e-12 2.045458466e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 2.055264558e-09 1.995122612 0.0002973227647 + 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 4.641489466e-09 1.997830062 0.002512810606 + 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 4.655145035e-09 1.99783881 0.002655622463 + 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.030028702e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.00265438277 + 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 2.292850704e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.002659768123 + 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 3.442868019e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.002674629897 + 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 4.295826659e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.002810981059 + 1024 0 0 0 0 0 0 1.042999964e-12 4.629413273e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 4.655145035e-09 1.997845147 0.0003400076202 + 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.318979015e-09 1.998790203 0.002328347067 + 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.347598486e-09 1.99879452 0.002618311669 + 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.002669886411 + 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 4.600558854e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.002652119271 + 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 6.142000832e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.00267318046 + 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 7.688153685e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.002706176534 + 1024 0 0 0 0 0 0 1.042999964e-12 8.297302731e-09 1.10650686e-12 8.254221239e-09 2.509140394e-12 8.347598486e-09 1.998798032 0.0006843343962 + 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.313250026e-08 1.999234004 0.00283138264 + 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.317338236e-08 1.999236426 0.002586286379 + 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.317338236e-08 1.999238263 0.0026339268 + 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 8.254221239e-09 2.509140394e-12 1.317338236e-08 1.999238263 0.002648281255 + 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 9.614714565e-09 2.509140394e-12 1.317338236e-08 1.999238263 0.002663241013 + 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 1.210659553e-08 2.509140394e-12 1.317338236e-08 1.999238263 0.002612673143 + 1024 0 0 0 0 0 0 1.042999964e-12 1.309831574e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.317338236e-08 1.999238263 0.0008399405323 + 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.916149291e-08 1.999475219 0.002292301765 + 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.920414418e-08 1.999476412 0.002689353485 + 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.002636466525 + 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.306342647e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.00261930183 + 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.382824712e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.002679724031 + 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.75757398e-08 2.509140394e-12 1.920414418e-08 1.999477443 0.00260721578 + 1024 0 0 0 0 0 0 1.042999964e-12 1.911360408e-08 1.10650686e-12 1.916004305e-08 2.509140394e-12 1.924480691e-08 1.999478511 0.0005034896044