Skip to content

Commit

Permalink
Everything agrees exactly now
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattsignorelli
mattsignorelli committed Mar 19, 2024
1 parent a25d52b commit 6a87b1f
Show file tree
Hide file tree
Showing 5 changed files with 177 additions and 97 deletions.
Binary file modified fpp-ptc-sandbox/code/CMakeFiles/z_fixed_point_matt-exe.dir/z_fixed_point_matt.f90.o
View file
Binary file not shown.
96 changes: 85 additions & 11 deletions fpp-ptc-sandbox/code/test.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,15 @@
2 -1182.869332744106 0.000000000000000 0 0 0 2 0 0 0 0
2 1703.066363119465 0.000000000000000 1 0 0 0 0 1 0 0
2 -14704.69590433775 0.000000000000000 0 1 0 0 0 1 0 0
2 -204.1852345062520 0.000000000000000 0 0 1 0 0 0 1 0
2 -2533.349985494835 0.000000000000000 0 0 0 1 0 0 1 0
2 -174.4812968827661 0.000000000000000 0 0 1 0 0 0 0 1
2 -2445.110745194537 0.000000000000000 0 0 0 1 0 0 0 1
2 -4194.801337247547 0.000000000000000 0 0 0 0 0 2 0 0
-12 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 -1366.249473494866 0.000000000000000 0 0 0 0 0 0 2 0
2 -2676.830080664099 0.000000000000000 0 0 0 0 0 0 1 1
2 -1339.158664692388 0.000000000000000 0 0 0 0 0 0 0 2
-19 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 132
*********************************************
Expand All @@ -35,8 +42,15 @@
2 -98.23555759097989 0.000000000000000 0 0 0 2 0 0 0 0
2 209.7886472900120 0.000000000000000 1 0 0 0 0 1 0 0
2 -1266.623856085018 0.000000000000000 0 1 0 0 0 1 0 0
2 -12.08575336032187 0.000000000000000 0 0 1 0 0 0 1 0
2 -218.7095964263391 0.000000000000000 0 0 0 1 0 0 1 0
2 -6.992729210851998 0.000000000000000 0 0 1 0 0 0 0 1
2 -221.5981119222337 0.000000000000000 0 0 0 1 0 0 0 1
2 -796.9563242855055 0.000000000000000 0 0 0 0 0 2 0 0
-12 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 -122.7969757863390 0.000000000000000 0 0 0 0 0 0 2 0
2 -258.0229174880976 0.000000000000000 0 0 0 0 0 0 1 1
2 -139.8123366079176 0.000000000000000 0 0 0 0 0 0 0 2
-19 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 131
*********************************************
Expand All @@ -45,13 +59,21 @@
NO = 2 NV = 8
1 -1.220171394189473 0.000000000000000 0 0 1 0 0 0 0 0
1 -2.691858899823284 0.000000000000000 0 0 0 1 0 0 0 0
1 -1.149136586317040 0.000000000000000 0 0 0 0 0 0 1 0
1 1.351373305858889 0.000000000000000 0 0 0 0 0 0 0 1
2 9.927917833035844 0.000000000000000 1 0 1 0 0 0 0 0
2 -197.1869859097834 0.000000000000000 0 1 1 0 0 0 0 0
2 238.2724438833439 0.000000000000000 1 0 0 1 0 0 0 0
2 -2294.166611465947 0.000000000000000 0 1 0 1 0 0 0 0
2 -282.2274189991648 0.000000000000000 0 0 1 0 0 1 0 0
2 -4606.707278447271 0.000000000000000 0 0 0 1 0 1 0 0
-8 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 267.1416842729033 0.000000000000000 1 0 0 0 0 0 1 0
2 -2456.175987138208 0.000000000000000 0 1 0 0 0 0 1 0
2 278.0712256022259 0.000000000000000 1 0 0 0 0 0 0 1
2 -2368.400910897125 0.000000000000000 0 1 0 0 0 0 0 1
2 -5125.574775763571 0.000000000000000 0 0 0 0 0 1 1 0
2 -5242.530386601160 0.000000000000000 0 0 0 0 0 1 0 1
-16 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 130
*********************************************
Expand All @@ -60,13 +82,21 @@
NO = 2 NV = 8
1 0.4061875597732836E-01 0.000000000000000 0 0 1 0 0 0 0 0
1 -0.7299466652505078 0.000000000000000 0 0 0 1 0 0 0 0
1 -0.9612412974873626 0.000000000000000 0 0 0 0 0 0 1 0
1 -1.187316140893003 0.000000000000000 0 0 0 0 0 0 0 1
2 -3.747709805215140 0.000000000000000 1 0 1 0 0 0 0 0
2 26.15717420081988 0.000000000000000 0 1 1 0 0 0 0 0
2 -22.13909200878496 0.000000000000000 1 0 0 1 0 0 0 0
2 252.0413117282635 0.000000000000000 0 1 0 1 0 0 0 0
2 81.47383674488093 0.000000000000000 0 0 1 0 0 1 0 0
2 501.9342017063263 0.000000000000000 0 0 0 1 0 1 0 0
-8 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 -22.61853325963915 0.000000000000000 1 0 0 0 0 0 1 0
2 260.5169072773043 0.000000000000000 0 1 0 0 0 0 1 0
2 -19.07388829631608 0.000000000000000 1 0 0 0 0 0 0 1
2 240.0152798768564 0.000000000000000 0 1 0 0 0 0 0 1
2 470.0452944646550 0.000000000000000 0 0 0 0 0 1 1 0
2 359.5007837091093 0.000000000000000 0 0 0 0 0 1 0 1
-16 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 129
*********************************************
Expand All @@ -85,8 +115,15 @@
2 2253.043202616152 0.000000000000000 0 0 0 2 0 0 0 0
2 -341.5697430284507 0.000000000000000 1 0 0 0 0 1 0 0
2 3647.308070702025 0.000000000000000 0 1 0 0 0 1 0 0
2 416.1635232168939 0.000000000000000 0 0 1 0 0 0 1 0
2 4666.881181348704 0.000000000000000 0 0 0 1 0 0 1 0
2 316.1987181971293 0.000000000000000 0 0 1 0 0 0 0 1
2 4318.248493058714 0.000000000000000 0 0 0 1 0 0 0 1
2 1980.046019588570 0.000000000000000 0 0 0 0 0 2 0 0
-13 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 2481.884393288187 0.000000000000000 0 0 0 0 0 0 2 0
2 4713.402033995113 0.000000000000000 0 0 0 0 0 0 1 1
2 2348.216203751688 0.000000000000000 0 0 0 0 0 0 0 2
-20 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 128
*********************************************
Expand All @@ -105,8 +142,15 @@
2 0.2253043202616153 0.000000000000000 0 0 0 2 0 0 0 0
2 -0.3415697430284508E-01 0.000000000000000 1 0 0 0 0 1 0 0
2 0.3647308070702026 0.000000000000000 0 1 0 0 0 1 0 0
2 0.4161635232168939E-01 0.000000000000000 0 0 1 0 0 0 1 0
2 0.4666881181348704 0.000000000000000 0 0 0 1 0 0 1 0
2 0.3161987181971294E-01 0.000000000000000 0 0 1 0 0 0 0 1
2 0.4318248493058714 0.000000000000000 0 0 0 1 0 0 0 1
2 0.1980046019588571 0.000000000000000 0 0 0 0 0 2 0 0
-13 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 0.2481884393288187 0.000000000000000 0 0 0 0 0 0 2 0
2 0.4713402033995113 0.000000000000000 0 0 0 0 0 0 1 1
2 0.2348216203751688 0.000000000000000 0 0 0 0 0 0 0 2
-20 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
No Spin Matrix
Quaternion
c_quaternion
Expand All @@ -128,8 +172,15 @@
2 131972.0592445905 0.000000000000000 0 0 0 2 0 0 0 0
2 200850.5750421095 0.000000000000000 1 0 0 0 0 1 0 0
2 -2120693.585024924 0.000000000000000 0 1 0 0 0 1 0 0
2 24025.34151980096 0.000000000000000 0 0 1 0 0 0 1 0
2 274215.8426298941 0.000000000000000 0 0 0 1 0 0 1 0
2 18503.42280827298 0.000000000000000 0 0 1 0 0 0 0 1
2 255273.7718133037 0.000000000000000 0 0 0 1 0 0 0 1
2 -2893560.299664241 0.000000000000000 0 0 0 0 0 2 0 0
-13 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 146005.5313028174 0.000000000000000 0 0 0 0 0 0 2 0
2 279466.7149828470 0.000000000000000 0 0 0 0 0 0 1 1
2 139164.6502876419 0.000000000000000 0 0 0 0 0 0 0 2
-20 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 117
*********************************************
Expand All @@ -138,13 +189,21 @@
NO = 2 NV = 8
1 -3.191056268011877 0.000000000000000 0 0 1 0 0 0 0 0
1 -2.026035053622455 0.000000000000000 0 0 0 1 0 0 0 0
1 -20.14011691348639 0.000000000000000 0 0 0 0 0 0 1 0
1 6.498871903691573 0.000000000000000 0 0 0 0 0 0 0 1
2 -373.6399767786319 0.000000000000000 1 0 1 0 0 0 0 0
2 3662.115862839186 0.000000000000000 0 1 1 0 0 0 0 0
2 -833.8054461746143 0.000000000000000 1 0 0 1 0 0 0 0
2 8966.170952045086 0.000000000000000 0 1 0 1 0 0 0 0
2 9571.416803739405 0.000000000000000 0 0 1 0 0 1 0 0
2 22199.26944655099 0.000000000000000 0 0 0 1 0 1 0 0
-8 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 366.9135124037190 0.000000000000000 1 0 0 0 0 0 1 0
2 -1861.815857895140 0.000000000000000 0 1 0 0 0 0 1 0
2 -1515.510350812197 0.000000000000000 1 0 0 0 0 0 0 1
2 11283.22326124266 0.000000000000000 0 1 0 0 0 0 0 1
2 -6443.807586158201 0.000000000000000 0 0 0 0 0 1 1 0
2 31379.32080076098 0.000000000000000 0 0 0 0 0 1 0 1
-16 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 116
*********************************************
Expand All @@ -163,8 +222,15 @@
2 150783.4504237102 0.000000000000000 0 0 0 2 0 0 0 0
2 -214310.0378054578 0.000000000000000 1 0 0 0 0 1 0 0
2 2250796.343231380 0.000000000000000 0 1 0 0 0 1 0 0
2 27573.87365635571 0.000000000000000 0 0 1 0 0 0 1 0
2 313367.3095897967 0.000000000000000 0 0 0 1 0 0 1 0
2 21005.14247210386 0.000000000000000 0 0 1 0 0 0 0 1
2 291447.6773817530 0.000000000000000 0 0 0 1 0 0 0 1
2 2752406.648365590 0.000000000000000 0 0 0 0 0 2 0 0
-13 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
2 167131.8555837717 0.000000000000000 0 0 0 0 0 0 2 0
2 318861.0210198262 0.000000000000000 0 0 0 0 0 0 1 1
2 159345.8538333209 0.000000000000000 0 0 0 0 0 0 0 2
-20 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0

1, NO = 2, NV = 8, INA = 115
*********************************************
Expand All @@ -173,11 +239,19 @@
NO = 2 NV = 8
1 3.182453908469467 0.000000000000000 0 0 1 0 0 0 0 0
1 4.804881836701737 0.000000000000000 0 0 0 1 0 0 0 0
1 6.235106883934428 0.000000000000000 0 0 0 0 0 0 1 0
1 -20.98460331136047 0.000000000000000 0 0 0 0 0 0 0 1
2 190.8466307684579 0.000000000000000 1 0 1 0 0 0 0 0
2 -2008.197369521775 0.000000000000000 0 1 1 0 0 0 0 0
2 -1054.625871508693 0.000000000000000 1 0 0 1 0 0 0 0
2 9311.675359821953 0.000000000000000 0 1 0 1 0 0 0 0
2 -5135.705491792440 0.000000000000000 0 0 1 0 0 1 0 0
2 22191.15371385749 0.000000000000000 0 0 0 1 0 1 0 0
-8 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
No Stochastic Radiation
2 1089.078732220138 0.000000000000000 1 0 0 0 0 0 1 0
2 -10192.45065936512 0.000000000000000 0 1 0 0 0 0 1 0
2 -1911.160341034982 0.000000000000000 1 0 0 0 0 0 0 1
2 16623.14398953132 0.000000000000000 0 1 0 0 0 0 0 1
2 -29619.98368677524 0.000000000000000 0 0 0 0 0 1 1 0
2 41004.71849081112 0.000000000000000 0 0 0 0 0 1 0 1
-16 0.000000000000000 0.000000000000000 0 0 0 0 0 0 0 0
No Stochastic Radiation
4 changes: 2 additions & 2 deletions fpp-ptc-sandbox/code/z_fixed_point_matt.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ program example

k1=0.36d0
k2l= 1.2d0
!vkick(1)=morph(1.d0.mono.7)!+1.d-4
!vkick(2)=morph(1.d0.mono.8) !+.23d0
vkick(1)=morph(1.d0.mono.7)!+1.d-4
vkick(2)=morph(1.d0.mono.8) !+.23d0
c_%ndpt=0

closed_orbit=0
Expand Down
Binary file modified fpp-ptc-sandbox/production/bin/z_fixed_point_matt
View file
Binary file not shown.
Loading

0 comments on commit 6a87b1f

Please sign in to comment.