Skip to content

Commit

Permalink
Print statements
Browse files Browse the repository at this point in the history
  • Loading branch information
@hombit
hombit committed May 28, 2024
1 parent 1e1bc08 commit e83c91f
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 40 deletions.
7 changes: 7 additions & 0 deletions cpp/src/freddi_state.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,13 @@ const vecd& FreddiState::Sigma() {
}
opt_str_.Sigma = std::move(x);
}

std::cout << "Sigma values: [";
for (const auto& value : *opt_str_.Sigma) {
std::cout << value << " ";
}
std::cout << "]" << std::endl;

return *opt_str_.Sigma;
}

Expand Down
2 changes: 1 addition & 1 deletion python/test/data/generate_test_data.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ $FREDDI --prefix=lambdas --lambda=8000 --lambda=5000 --lambda=3000
$FREDDI --prefix=passbands --time=10 --tau=1 --passband=passbands/Swift_B.dat --passband=passbands/Swift_V.dat

# https://github.com/hombit/freddi/issues/66
$FREDDI --prefix=issue66 --Mx=9.4 --period=1.116 --Mopt=2.5 --alpha=0.23 --colourfactor=1.7 --inclination=20.7 --time=35 --tau=1 --distance=9.1 --Mdisk0=2.70002635e+25 --Cirr=1.5e-4 --kerr=0.4 --rout=0.7 --opacity=Kramers --initialcond=powerF --powerorder=1.4
$FREDDI --prefix=issue66 --Mx=9.4 --period=1.116 --Mopt=2.5 --alpha=0.23 --colourfactor=1.7 --inclination=20.7 --time=35 --tau=1 --distance=9.1 --Mdisk0=2.70002635e+25 --Cirr=1.5e-4 --kerr=0.4 --rout=0.7 --opacity=Kramers --initialcond=powerF --powerorder=1.4 --fulldata
78 changes: 39 additions & 39 deletions python/test/data/issue66.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Cirr=0.00015
# Cirrcold=0
# F0=2e+38
# Mdisk0=2.70003e+25
# Mdisk0=2.70002635e+25
# Mdotout=0
# Mopt=2.5
# Mx=9.4
Expand Down Expand Up @@ -50,7 +50,7 @@
# opacity=Kramers
# period=1.116
# powerorder=1.4
# precision=6
# precision=12
# prefix=issue66
# rochelobefill=1
# rout=0.7
Expand All @@ -63,41 +63,41 @@
### Derived values
# alpha_cold = 0.023
# Tidal radius = 0.7 Rsun
# ISCO radius = 6.40522e+06 cm
# ISCO radius = 6405219.88777 cm
# tau = 1 days
0 4.09369e+17 2.70002e+25 0.7 2536.27 0.00015 0.0705364 26274.4 4312.85 0.000726515 0.472321 1.21665e+37 2.76145e+37 2.29731e-09 5.21425e-09
1 1.45508e+19 2.5754e+25 0.7 2097.42 0.00015 0.0677224 24743.5 10424.1 0.0325243 1.15327 7.68579e+38 9.81545e+38 1.45125e-07 1.85338e-07
2 1.59576e+19 2.43807e+25 0.7 1891.58 0.00015 0.0662398 23892.8 10608.5 0.0404357 1.18019 8.49203e+38 1.07644e+39 1.60349e-07 2.03257e-07
3 1.583e+19 2.3017e+25 0.7 1744.89 0.00015 0.065104 23235.1 10541.5 0.0442428 1.17782 8.41872e+38 1.06783e+39 1.58964e-07 2.01631e-07
4 1.51171e+19 2.17141e+25 0.7 1626.71 0.00015 0.0641328 22669.9 10381.7 0.0460063 1.16433 8.00986e+38 1.01974e+39 1.51244e-07 1.9255e-07
5 1.41875e+19 2.04911e+25 0.7 1525.53 0.00015 0.0632563 22159.4 10183.2 0.0466789 1.146 7.47819e+38 9.57036e+38 1.41205e-07 1.8071e-07
6 1.32096e+19 1.93522e+25 0.7 1435.94 0.00015 0.0624412 21686.1 9970.64 0.0467759 1.12572 6.9209e+38 8.91074e+38 1.30682e-07 1.68255e-07
7 1.22588e+19 1.82953e+25 0.7 1355.06 0.00015 0.0616704 21240.7 9755.82 0.0465748 1.10489 6.38117e+38 8.26934e+38 1.20491e-07 1.56144e-07
8 1.13658e+19 1.73153e+25 0.7 1281.21 0.00015 0.0609342 20818 9544.39 0.0462229 1.0842 5.87646e+38 7.66698e+38 1.10961e-07 1.4477e-07
9 1.05408e+19 1.64065e+25 0.7 1213.3 0.00015 0.0602273 20415 9338.97 0.0457982 1.06396 5.41222e+38 7.11042e+38 1.02195e-07 1.34261e-07
10 9.78414e+18 1.55628e+25 0.7 1150.57 0.00015 0.0595459 20029.3 9140.63 0.0453417 1.04433 4.98847e+38 6.60002e+38 9.41936e-08 1.24623e-07
11 9.09243e+18 1.47789e+25 0.7 1092.42 0.00015 0.0588879 19659.6 8949.71 0.0448749 1.02536 4.60291e+38 6.13342e+38 8.69133e-08 1.15813e-07
12 8.4606e+18 1.40494e+25 0.7 1038.39 0.00015 0.0582513 19304.5 8766.16 0.044409 1.00707 4.25243e+38 5.70721e+38 8.02955e-08 1.07765e-07
13 7.88329e+18 1.33696e+25 0.7 988.101 0.00015 0.0576349 18963.2 8589.76 0.04395 0.98943 3.93376e+38 5.31778e+38 7.42784e-08 1.00412e-07
14 7.35527e+18 1.27354e+25 0.7 941.2 0.00015 0.0570375 18634.7 8420.2 0.0435006 0.972429 3.64375e+38 4.9616e+38 6.88022e-08 9.36862e-08
15 6.87173e+18 1.21429e+25 0.7 897.395 0.00015 0.0564579 18318.2 8257.15 0.0430622 0.956037 3.37948e+38 4.63542e+38 6.38123e-08 8.75271e-08
16 6.42828e+18 1.15887e+25 0.7 856.424 0.00015 0.0558954 18013.2 8100.28 0.0426352 0.940225 3.13835e+38 4.33628e+38 5.92592e-08 8.18788e-08
17 6.02099e+18 1.10695e+25 0.7 818.053 0.00015 0.055349 17719 7949.26 0.0422197 0.924965 2.91801e+38 4.06154e+38 5.50986e-08 7.6691e-08
18 5.64635e+18 1.05827e+25 0.7 782.071 0.00015 0.0548181 17434.9 7803.79 0.0418154 0.910228 2.71637e+38 3.80882e+38 5.12913e-08 7.19192e-08
19 5.30124e+18 1.01256e+25 0.7 748.291 0.00015 0.0543019 17160.5 7663.56 0.041422 0.895989 2.53158e+38 3.57602e+38 4.7802e-08 6.75234e-08
20 4.98287e+18 9.69595e+24 0.7 716.539 0.00015 0.0537997 16895.2 7528.31 0.0410392 0.882223 2.36199e+38 3.36126e+38 4.45998e-08 6.34682e-08
21 4.68875e+18 9.29167e+24 0.7 686.662 0.00015 0.0533109 16638.7 7397.77 0.0406665 0.868906 2.20614e+38 3.16286e+38 4.16569e-08 5.97219e-08
22 4.41666e+18 8.91085e+24 0.7 658.519 0.00015 0.052835 16390.4 7271.71 0.0403035 0.856016 2.06271e+38 2.97932e+38 3.89486e-08 5.62563e-08
23 4.16462e+18 8.55177e+24 0.7 631.983 0.00015 0.0523713 16150.1 7149.9 0.0399498 0.843533 1.93055e+38 2.8093e+38 3.64531e-08 5.30459e-08
24 3.93085e+18 8.21284e+24 0.7 606.936 0.00015 0.0519195 15917.2 7032.13 0.0396052 0.831438 1.80862e+38 2.65161e+38 3.41507e-08 5.00683e-08
25 3.71375e+18 7.89263e+24 0.7 583.272 0.00015 0.0514789 15691.4 6918.2 0.0392691 0.819712 1.69598e+38 2.50516e+38 3.20239e-08 4.73031e-08
26 3.51189e+18 7.58983e+24 0.7 560.895 0.00015 0.0510492 15472.5 6807.93 0.0389413 0.808339 1.59181e+38 2.369e+38 3.00569e-08 4.4732e-08
27 3.32399e+18 7.30323e+24 0.7 539.715 0.00015 0.0506298 15260.1 6701.15 0.0386214 0.797303 1.49535e+38 2.24224e+38 2.82356e-08 4.23386e-08
28 3.14888e+18 7.03173e+24 0.7 519.65 0.00015 0.0502205 15053.9 6597.68 0.0383091 0.786588 1.40594e+38 2.12412e+38 2.65473e-08 4.01081e-08
29 2.9855e+18 6.77431e+24 0.7 500.627 0.00015 0.0498207 14853.6 6497.39 0.0380042 0.77618 1.32297e+38 2.01391e+38 2.49807e-08 3.80272e-08
30 2.83291e+18 6.53005e+24 0.7 482.576 0.00015 0.0494302 14659 6400.13 0.0377063 0.766067 1.2459e+38 1.91098e+38 2.35254e-08 3.60836e-08
31 2.69026e+18 6.29809e+24 0.7 465.434 0.00015 0.0490486 14469.8 6305.76 0.0374152 0.756235 1.17423e+38 1.81475e+38 2.21722e-08 3.42666e-08
32 2.55675e+18 6.07764e+24 0.7 449.143 0.00015 0.0486755 14285.9 6214.16 0.0371306 0.746673 1.10753e+38 1.72469e+38 2.09126e-08 3.25661e-08
33 2.43169e+18 5.86798e+24 0.7 433.649 0.00015 0.0483107 14107 6125.2 0.0368523 0.73737 1.04538e+38 1.64033e+38 1.97391e-08 3.09731e-08
34 2.31442e+18 5.66843e+24 0.7 418.902 0.00015 0.0479539 13932.8 6038.78 0.0365801 0.728314 9.8742e+37 1.56122e+38 1.86447e-08 2.94794e-08
35 2.20436e+18 5.47836e+24 0.7 404.856 0.00015 0.0476047 13763.2 5954.78 0.0363137 0.719497 9.33321e+37 1.48698e+38 1.76232e-08 2.80775e-08
0 4.09369012299e+17 2.70002195397e+25 0.7 2536.27159615 0.00015 0.0705363625959 26274.3630591 4312.85161893 0.000726515170351 0.472320832039 1.21664735712e+37 2.76145326049e+37 2.29730565537e-09 5.21424894012e-09
1 1.45508141037e+19 2.57540001746e+25 0.7 2097.41826081 0.00015 0.0677223770147 24743.4531268 10424.0715047 0.0325243476713 1.15326784318 7.6857874896e+38 9.81544568401e+38 1.45125068184e-07 1.85337836374e-07
2 1.59576490835e+19 2.43807378532e+25 0.7 1891.57588941 0.00015 0.0662398076734 23892.8060179 10608.5127758 0.0404356676589 1.18018634976 8.49203338335e+38 1.07644449793e+39 1.60348815974e-07 2.03257091574e-07
3 1.5829984635e+19 2.30169949786e+25 0.7 1744.89406434 0.00015 0.0651039502188 23235.08066 10541.5498988 0.0442428024088 1.17781880215 8.41871870809e+38 1.06783272233e+39 1.58964468923e-07 2.01630993371e-07
4 1.51170712455e+19 2.17141014006e+25 0.7 1626.70624539 0.00015 0.0641328016149 22669.8598401 10381.7239894 0.0460062520025 1.16432782028 8.00985517738e+38 1.01974219899e+39 1.51244199809e-07 1.92550413811e-07
5 1.41874869908e+19 2.04910721476e+25 0.7 1525.52501947 0.00015 0.0632563060081 22159.3997625 10183.2131939 0.0466789260209 1.14600029298 7.47819360612e+38 9.57035853517e+38 1.41205225678e-07 1.80710036134e-07
6 1.32096357451e+19 1.93522185142e+25 0.7 1435.93659196 0.00015 0.0624412409512 21686.0716107 9970.64152547 0.0467759475904 1.12572178362 6.92089925423e+38 8.91073593804e+38 1.30682246618e-07 1.68254868136e-07
7 1.22588040888e+19 1.82952817412e+25 0.7 1355.06188603 0.00015 0.0616703822073 21240.6862901 9755.81815325 0.0465747867377 1.10489341618 6.3811729063e+38 8.26933976526e+38 1.20490991245e-07 1.56143856293e-07
8 1.13658429752e+19 1.73153065256e+25 0.7 1281.21305827 0.00015 0.0609342405651 20818.0464839 9544.39213207 0.0462229259287 1.08419842617 5.87646041006e+38 7.66698093871e+38 1.10960876663e-07 1.44769957926e-07
9 1.05407706058e+19 1.64064562454e+25 0.7 1213.30275462 0.00015 0.0602272564486 20414.967188 9338.96764844 0.0457982242067 1.06396281565 5.41222415744e+38 7.11041736988e+38 1.02195045197e-07 1.34260777704e-07
10 9.78413599756e+18 1.55628383681e+25 0.7 1150.56522111 0.00015 0.0595459313814 20029.3243631 9140.63050668 0.0453416882237 1.0443329476 4.98846845094e+38 6.60001940543e+38 9.41935780891e-08 1.2462330861e-07
11 9.0924254968e+18 1.47788590737e+25 0.7 1092.41870238 0.00015 0.0588878807172 19659.5779828 8949.70930911 0.0448748737612 1.0253645474 4.60290770536e+38 6.13341686341e+38 8.69133183151e-08 1.15812796244e-07
12 8.46060464376e+18 1.40493565075e+25 0.7 1038.39491644 0.00015 0.0582513433249 19304.5259919 8766.15906873 0.0444090459749 1.00706779969 4.25242726246e+38 5.70721368186e+38 8.02954540765e-08 1.07765115265e-07
13 7.88329098855e+18 1.33696318415e+25 0.7 988.101359344 0.00015 0.0576349231752 18963.1741512 8589.75603923 0.0439500003299 0.98943039807 3.93376345554e+38 5.31777905745e+38 7.42783599571e-08 1.00411707889e-07
14 7.35527450479e+18 1.27354349377e+25 0.7 941.200102164 0.00015 0.0570374504885 18634.665269 8420.19710813 0.0435006108612 0.972429400768 3.64374687263e+38 4.9615984974e+38 6.88021902833e-08 9.36862125336e-08
15 6.87172846384e+18 1.21429315668e+25 0.7 897.395106315 0.00015 0.0564579053733 18318.2394037 8257.15046003 0.043062185962 0.956037344889 3.37948497432e+38 4.63541606755e+38 6.38123273626e-08 8.75271497912e-08
16 6.4282751516e+18 1.15886648298e+25 0.7 856.424087598 0.00015 0.0558953745664 18013.2105064 8100.28114289 0.0426351950091 0.940225388373 3.1383527093e+38 4.33627872247e+38 5.92592042833e-08 8.18787594786e-08
17 6.02098541639e+18 1.10695165507e+25 0.7 818.052913013 0.00015 0.0553490259731 17718.9519668 7949.26362426 0.0422196605952 0.924964901479 2.91801030769e+38 4.06153600051e+38 5.50986408925e-08 7.66909948791e-08
18 5.64634997055e+18 1.05826711098e+25 0.7 782.07148246 0.00015 0.0548180929427 17434.8871018 7803.78758058 0.0418153715974 0.910228244987 2.71637215827e+38 3.80882066487e+38 5.12912561291e-08 7.19191572028e-08
19 5.30124050858e+18 1.01255826122e+25 0.7 748.290535188 0.00015 0.0543018639851 17160.4824727 7663.56017342 0.0414219994653 0.89598912104 2.53158180344e+38 3.57602247538e+38 4.78019958703e-08 6.75234003374e-08
20 4.98286905959e+18 9.69594555136e+24 0.7 716.539070721 0.00015 0.0537996756082 16895.2428882 7528.3065204 0.041039161815 0.882222700241 2.36199302702e+38 3.36126076909e+38 4.4599775828e-08 6.34682131088e-08
21 4.68874930497e+18 9.29166880399e+24 0.7 686.662204729 0.00015 0.05331090701 16638.7074598 7397.76926245 0.0406664571217 0.868905633146 2.20613709157e+38 3.16285836661e+38 4.16568629138e-08 5.97219265734e-08
22 4.41666132776e+18 8.9108526612e+24 0.7 658.519350351 0.00015 0.0528349759181 16390.4463525 7271.7077038 0.04030348346 0.856016003886 2.06270997133e+38 2.97931779338e+38 3.8948634169e-08 5.62562650207e-08
23 4.16462018556e+18 8.55176856882e+24 0.7 631.982654236 0.00015 0.0523713351766 16150.0580231 7149.89677611 0.0399498483963 0.843533256698 1.93054958361e+38 2.80930008003e+38 3.6453146842e-08 5.30459456778e-08
24 3.93084820779e+18 8.21284125542e+24 0.7 606.935638761 0.00015 0.0519194698487 15917.1668183 7032.12595771 0.0396051739572 0.831438111771 1.80861510068e+38 2.65160607514e+38 3.41507477485e-08 5.00683258513e-08
25 3.71375071465e+18 7.89263295376e+24 0.7 583.272015267 0.00015 0.0514788946941 15691.4208558 6918.19821444 0.0392690988625 0.819712479007 1.69597806144e+38 2.50516006622e+38 3.20239054409e-08 4.73030936537e-08
26 3.51189478833e+18 7.58982945261e+24 0.7 560.8946416 0.00015 0.0510491519346 15472.4901327 6807.92899417 0.0389412792453 0.808339374066 1.59180527305e+38 2.36899545944e+38 3.00568873521e-08 4.47319976054e-08
27 3.32399072536e+18 7.30322774772e+24 0.7 539.714602879 0.00015 0.0506298092513 15260.0648262 6701.1452885 0.0386213885484 0.797302838828 1.49534957775e+38 2.24224226813e+38 2.82355854522e-08 4.23386103881e-08
28 3.14887582506e+18 7.03172509068e+24 0.7 519.650398402 0.00015 0.0502204579745 15053.8537576 6597.68476542 0.038309116986 0.786587867112 1.40593970123e+38 2.12411617703e+38 2.65473245623e-08 4.01081223543e-08
29 2.98550020538e+18 6.77430926083e+24 0.7 500.627220552 0.00015 0.0498207114385 14853.583 6497.39497168 0.0380041707901 0.776180335898 1.32297207683e+38 2.01390897421e+38 2.49807079777e-08 3.80271608596e-08
30 2.83291437554e+18 6.53004990875e+24 0.7 482.576313811 0.00015 0.049430203479 14658.9946111 6400.13260141 0.0377062713654 0.766066941923 1.24590094098e+38 1.91098016801e+38 2.35254304462e-08 3.6083631971e-08
31 2.69025833035e+18 6.29809084014e+24 0.7 465.434403792 0.00015 0.0490485870582 14469.8454786 6305.76282598 0.0374151544211 0.756235143357 1.17423435559e+38 1.81474963046e+38 2.21722030632e-08 3.4266581559e-08
32 2.5567519638e+18 6.07764312625e+24 0.7 449.143187668 0.00015 0.0486755330018 14285.9062643 6214.15868047 0.0371305691187 0.746673106226 1.10752773395e+38 1.72469113064e+38 2.09126310249e-08 3.25660731928e-08
33 2.43168662766e+18 5.86797894235e+24 0.7 433.648878573 0.00015 0.0483107288378 14106.9604387 6125.20050161 0.0368522772523 0.737369655189 1.04537811459e+38 1.64032664043e+38 1.97391055065e-08 3.09730806192e-08
34 2.31441768514e+18 5.66842604809e+24 0.7 418.901797556 0.00015 0.0479538777268 13932.8033958 6038.77541255 0.0365800524743 0.728314228304 9.87420183589e+37 1.56122131151e+38 1.86447285543e-08 2.94793929173e-08
35 2.20435793106e+18 5.47836283541e+24 0.7 404.85600752 0.00015 0.0476046974746 13763.2416406 5954.77685034 0.0363136795679 0.719496835445 9.33320776342e+37 1.48697903679e+38 1.76232092662e-08 2.80775306883e-08

0 comments on commit e83c91f

Please sign in to comment.