Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Merge branch 'debug' into CMAKE
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminton
daminton committed Oct 25, 2022
2 parents 6e1bb0b + 79a6e83 commit 325b379
Show file tree
Hide file tree
Showing 83 changed files with 4,704 additions and 197 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,4 @@ python/swiftest/tests/convert_code_type/swifter2swiftest/tp.swifter2swiftest.in
!python/swiftest/requirements.txt

bin/
build/*
1 change: 0 additions & 1 deletion build/.gitignore
View file

This file was deleted.

5 changes: 0 additions & 5 deletions cmake/Modules/SetFortranFlags.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,6 @@ SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
Fortran "-mp1" # Intel
)

# Calls the Matrix Multiply library
SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
Fortran "-qopt-matmul" # Intel
)

# Strict model for floating-point calculations (precise and except)
SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
Fortran "-fp-model strict" # Intel
Expand Down
33 changes: 33 additions & 0 deletions examples/helio_neptune_pluto/param.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
! VERSION Swiftest parameter input from file param.in
T0 0.0
TSTOP 100000.0
DT 5.0
ISTEP_OUT 20
ISTEP_DUMP 20
OUT_FORM XVEL
OUT_TYPE NETCDF_DOUBLE
OUT_STAT REPLACE
IN_TYPE NETCDF_DOUBLE
BIN_OUT bin.nc
CHK_QMIN 0.004650467260962157
CHK_RMIN 0.004650467260962157
CHK_RMAX 1000.0
CHK_EJECT 1000.0
CHK_QMIN_COORD HELIO
CHK_QMIN_RANGE 0.004650467260962157 1000.0
MU2KG 1.988409870698051e+30
TU2S 31557600.0
DU2M 149597870700.0
IN_FORM XV
NC_IN init_cond.nc
EXTRA_FORCE NO
BIG_DISCARD NO
CHK_CLOSE NO
RHILL_PRESENT NO
FRAGMENTATION NO
ROTATION NO
TIDES NO
ENERGY YES
GR NO
INTERACTION_LOOPS TRIANGULAR
ENCOUNTER_CHECK TRIANGULAR
38 changes: 38 additions & 0 deletions examples/symba_hungarias/swifter/control_planets/hungarias_5pl_500tp_17_param.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
! VERSION Swiftest parameter input
T0 0.0
TSTOP 200000000.0
DT 0.005
ISTEP_OUT 200000
ISTEP_DUMP 200000
OUT_FORM XVEL
OUT_TYPE NETCDF_DOUBLE
OUT_STAT REPLACE
IN_TYPE ASCII
PL_IN hungarias_5pl_500tp_17_pl.in
TP_IN hungarias_5pl_500tp_17_tp.in
CB_IN hungarias_5pl_500tp_17_sun_MsunAUYR.in
BIN_OUT hungarias_5pl_500tp_17_out.nc
CHK_QMIN -1.0
CHK_RMIN -1.0
CHK_RMAX 1000.0
CHK_EJECT 1000.0
CHK_QMIN_COORD HELIO
CHK_QMIN_RANGE -1.0 -1.0
MU2KG 1.988409870698051e+30
TU2S 31557600.0
DU2M 149597870700.0
IN_FORM EL
EXTRA_FORCE NO
PARTICLE_OUT hungarias_5pl_500tp_17_particle.dat
BIG_DISCARD NO
CHK_CLOSE YES
RHILL_PRESENT YES
FRAGMENTATION NO
ROTATION YES
TIDES NO
ENERGY YES
GR YES
INTERACTION_LOOPS ADAPTIVE
ENCOUNTER_CHECK ADAPTIVE
ENERGY_OUT hungarias_5pl_500tp_17_energy.dat
GMTINY 3.646098141953443043e-08
49 changes: 49 additions & 0 deletions examples/symba_hungarias/swifter/control_planets/hungarias_5pl_500tp_17_pl.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
8
Mercury 6.553709809565314146e-06 0.0014751274117575772341
1.6306381826061645943e-05
0.38709894990924181846 0.20562369687869339052 7.0036069691825035832
48.302897646473702764 29.190213908309409874 163.69992642152809026
0.0 0.0 0.34599999999999997424
3.5735549824428292985 -18.380047749494480457 34.361526740492798437
Venus 9.6633133995815381836e-05 0.006759122875155079725
4.0453784346544178454e-05
0.7233300630551103838 0.006773384545514573099 3.394505355540899938
76.62090440289564697 55.183156101464518883 271.2285045598760007
0.0 0.0 0.4000000000000000222
0.17650282045605921225 -3.6612475825356215592 8.702866268072763821
Earth 0.000120026935827952456416 0.010044657392872289059
4.25875607065040958e-05
0.99999328599172943033 0.01668004783869252855 0.0027793940989077428085
175.84932558359508903 287.2227751976308241 324.72725799674782365
0.0 0.0 0.33069999999999999396
4.827962479462605839 0.034731626640621778608 2301.2114260455621944
Mars 1.2739802010675941808e-05 0.007246146587933918669
2.265740805092889601e-05
1.5236121180553410248 0.093387475645674775104 1.8479297186242829021
49.490271729763087194 286.7387645553690163 252.78317601821959215
0.0 0.0 0.3644000000000000017
997.9376283354346323 -909.38573894978675416 1783.4600697011568969
Jupiter 0.03769225108898567778 0.35525381666404283465
0.00046732617030490929307
5.203268729924161562 0.04848413524543258163 1.3035624911873560094
100.51639734596980702 273.421918018626684 325.351028522703416
0.0 0.0 0.27560000000000001164
-80.967241888586720104 -2387.9998942634933492 5008.7344122962876782
Saturn 0.01128589982009127331 0.43764770913411007376
0.00038925687730393611812
9.581513697274186114 0.05248801962394190196 2.4862838811768979141
113.59546767797320399 335.45662431368151601 228.84653123700309152
0.0 0.0 0.22000000000000000111
441.9323685947327233 378.52918410105413535 5135.911248678291292
Uranus 0.001723658947826773068 0.4699394560146697986
0.00016953449859497231466
19.24773626798451076 0.04408736292912442123 0.7704474968533898682
74.09072726634606454 95.12631113857929677 237.66915583105441101
0.0 0.0 0.23000000000000000999
-677.3000258209181323 -3008.109907190578637 -836.301326618569835
Neptune 0.0020336100526728302882 0.7816500366521773358
0.000164587904124493665
30.297815841143489024 0.013873050398302080172 1.7688477929856469828
131.74107055888509876 246.83916166351488641 334.07963351871291025
0.0 0.0 0.23000000000000000999
1231.0256802954641403 -2178.2009371051150557 2329.6179923847095223
7 changes: 7 additions & 0 deletions examples/symba_hungarias/swifter/control_planets/hungarias_5pl_500tp_17_sun_MsunAUYR.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Sun
39.476926408897626
0.004650467260962157
4.7535806948127355e-12
-2.2473967953572827e-18
0.0 0.0 0.07
11.209306302144773 -38.759372036774764 82.25088158389266
1 change: 1 addition & 0 deletions examples/symba_hungarias/swifter/control_planets/hungarias_5pl_500tp_17_tp.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0
26 changes: 26 additions & 0 deletions examples/symba_hungarias/swifter/control_planets/param.swifter.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
! VERSION Swifter parameter file converted from Swiftest
T0 0.0
TSTOP 200000000.0
DT 0.005
ISTEP_OUT 200000
ISTEP_DUMP 200000
OUT_FORM XV
OUT_TYPE REAL8
OUT_STAT UNKNOWN
IN_TYPE ASCII
PL_IN hungarias_5pl_500tp_17_pl.in
TP_IN hungarias_5pl_500tp_17_tp.in
BIN_OUT hungarias_5pl_500tp_17_out.dat
CHK_QMIN -1.0
CHK_RMIN -1.0
CHK_RMAX 1000.0
CHK_EJECT 1000.0
CHK_QMIN_COORD HELIO
CHK_QMIN_RANGE -1.0 -1.0
EXTRA_FORCE NO
PARTICLE_OUT hungarias_5pl_500tp_17_particle.dat
BIG_DISCARD NO
CHK_CLOSE YES
RHILL_PRESENT YES
J2 0.0
J4 0.0
38 changes: 38 additions & 0 deletions examples/symba_hungarias/swifter/control_tp/hungarias_5pl_500tp_17_param.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
! VERSION Swiftest parameter input
T0 0.0
TSTOP 200000000.0
DT 0.005
ISTEP_OUT 200000
ISTEP_DUMP 200000
OUT_FORM XVEL
OUT_TYPE NETCDF_DOUBLE
OUT_STAT REPLACE
IN_TYPE ASCII
PL_IN hungarias_5pl_500tp_17_pl.in
TP_IN hungarias_5pl_500tp_17_tp.in
CB_IN hungarias_5pl_500tp_17_sun_MsunAUYR.in
BIN_OUT hungarias_5pl_500tp_17_out.nc
CHK_QMIN -1.0
CHK_RMIN -1.0
CHK_RMAX 1000.0
CHK_EJECT 1000.0
CHK_QMIN_COORD HELIO
CHK_QMIN_RANGE -1.0 -1.0
MU2KG 1.988409870698051e+30
TU2S 31557600.0
DU2M 149597870700.0
IN_FORM EL
EXTRA_FORCE NO
PARTICLE_OUT hungarias_5pl_500tp_17_particle.dat
BIG_DISCARD NO
CHK_CLOSE YES
RHILL_PRESENT YES
FRAGMENTATION NO
ROTATION YES
TIDES NO
ENERGY YES
GR YES
INTERACTION_LOOPS ADAPTIVE
ENCOUNTER_CHECK ADAPTIVE
ENERGY_OUT hungarias_5pl_500tp_17_energy.dat
GMTINY 3.646098141953443043e-08
49 changes: 49 additions & 0 deletions examples/symba_hungarias/swifter/control_tp/hungarias_5pl_500tp_17_pl.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
8
Mercury 6.553709809565314146e-06 0.0014751274117575772341
1.6306381826061645943e-05
0.38709894990924181846 0.20562369687869339052 7.0036069691825035832
48.302897646473702764 29.190213908309409874 163.69992642152809026
0.0 0.0 0.34599999999999997424
3.5735549824428292985 -18.380047749494480457 34.361526740492798437
Venus 9.6633133995815381836e-05 0.006759122875155079725
4.0453784346544178454e-05
0.7233300630551103838 0.006773384545514573099 3.394505355540899938
76.62090440289564697 55.183156101464518883 271.2285045598760007
0.0 0.0 0.4000000000000000222
0.17650282045605921225 -3.6612475825356215592 8.702866268072763821
Earth 0.000120026935827952456416 0.010044657392872289059
4.25875607065040958e-05
0.99999328599172943033 0.01668004783869252855 0.0027793940989077428085
175.84932558359508903 287.2227751976308241 324.72725799674782365
0.0 0.0 0.33069999999999999396
4.827962479462605839 0.034731626640621778608 2301.2114260455621944
Mars 1.2739802010675941808e-05 0.007246146587933918669
2.265740805092889601e-05
1.5236121180553410248 0.093387475645674775104 1.8479297186242829021
49.490271729763087194 286.7387645553690163 252.78317601821959215
0.0 0.0 0.3644000000000000017
997.9376283354346323 -909.38573894978675416 1783.4600697011568969
Jupiter 0.03769225108898567778 0.35525381666404283465
0.00046732617030490929307
5.203268729924161562 0.04848413524543258163 1.3035624911873560094
100.51639734596980702 273.421918018626684 325.351028522703416
0.0 0.0 0.27560000000000001164
-80.967241888586720104 -2387.9998942634933492 5008.7344122962876782
Saturn 0.01128589982009127331 0.43764770913411007376
0.00038925687730393611812
9.581513697274186114 0.05248801962394190196 2.4862838811768979141
113.59546767797320399 335.45662431368151601 228.84653123700309152
0.0 0.0 0.22000000000000000111
441.9323685947327233 378.52918410105413535 5135.911248678291292
Uranus 0.001723658947826773068 0.4699394560146697986
0.00016953449859497231466
19.24773626798451076 0.04408736292912442123 0.7704474968533898682
74.09072726634606454 95.12631113857929677 237.66915583105441101
0.0 0.0 0.23000000000000000999
-677.3000258209181323 -3008.109907190578637 -836.301326618569835
Neptune 0.0020336100526728302882 0.7816500366521773358
0.000164587904124493665
30.297815841143489024 0.013873050398302080172 1.7688477929856469828
131.74107055888509876 246.83916166351488641 334.07963351871291025
0.0 0.0 0.23000000000000000999
1231.0256802954641403 -2178.2009371051150557 2329.6179923847095223
7 changes: 7 additions & 0 deletions examples/symba_hungarias/swifter/control_tp/hungarias_5pl_500tp_17_sun_MsunAUYR.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Sun
39.476926408897626
0.004650467260962157
4.7535806948127355e-12
-2.2473967953572827e-18
0.0 0.0 0.07
11.209306302144773 -38.759372036774764 82.25088158389266
Loading

0 comments on commit 325b379

Please sign in to comment.