Develop #14

Merged
coryab merged 124 commits from develop into main 2023-10-24 20:43:56 +00:00

124 Commits

Author SHA1 Message Date
226d381f2c Merge pull request #13 from FYS3150-G2-2023/coryab/code
Coryab/code
2023-10-24 22:43:28 +02:00
b25c6fd54d Merge pull request #12 from FYS3150-G2-2023/janitaws/latex-setup
Janitaws/latex setup
2023-10-24 22:43:04 +02:00
09d81d5917
Final edition of the report 2023-10-24 22:42:13 +02:00
Janita Willumsen
ccf492d726 Final, for real, changes 2023-10-24 22:36:04 +02:00
Janita Willumsen
82cdbaced5 Final, hopefully, changes 2023-10-24 22:32:53 +02:00
61d9ca8a25
Fix mistake 2023-10-24 22:23:50 +02:00
91f079fc71
Some changes 2023-10-24 22:21:47 +02:00
Janita Willumsen
30f2cda100 Update pdf again 2023-10-24 22:09:19 +02:00
Janita Willumsen
a9365ec35e Changed some stuff 2023-10-24 22:08:08 +02:00
7df2e46f89
Changes 2023-10-24 22:00:40 +02:00
Janita Willumsen
ecf9aae916 Update pdf 2023-10-24 21:49:38 +02:00
df38780e69
Add docs for Python 2023-10-24 21:49:26 +02:00
36ee519964
Update docs 2023-10-24 21:49:13 +02:00
Janita Willumsen
d887601c7c Fix note on references 2023-10-24 21:49:08 +02:00
Janita Willumsen
baf780dfbb Finish report 2023-10-24 21:44:56 +02:00
bd67af34c0
Update doc 2023-10-24 21:33:44 +02:00
111d267385
Exclude Python scripts 2023-10-24 21:33:30 +02:00
e4e608248f
Fix some things for the long program 2023-10-24 21:25:41 +02:00
95af969987
Add batch system 2023-10-24 21:24:27 +02:00
978616f7d9
Add resonance part for the abstract 2023-10-24 21:12:45 +02:00
f06bfc0f59
Add part about resonance 2023-10-24 21:09:50 +02:00
4e09128483
Add updated figures 2023-10-24 21:03:50 +02:00
b08d6babf0
Update gitignore 2023-10-24 21:03:34 +02:00
2b83889039
Made some changes 2023-10-24 21:03:15 +02:00
6f34b25e5c
Fixed bug 2023-10-24 21:02:42 +02:00
bdda8a12fc
Merge branch 'develop' into janitaws/latex-setup 2023-10-24 20:36:51 +02:00
4ee5d397e6 Merge pull request #11 from FYS3150-G2-2023/coryab/code
Coryab/code
2023-10-24 20:35:52 +02:00
9bc6038af0
Plots 2023-10-24 20:22:37 +02:00
Janita Willumsen
9e01ad8351 Add from overleaf draft 2023-10-24 17:26:02 +02:00
Janita Willumsen
bd7f911ec5 Move appendix 2023-10-24 17:22:18 +02:00
Janita Willumsen
87d13194f3 Update references 2023-10-24 17:21:53 +02:00
Janita Willumsen
8a9152a1c1 Update sections 2023-10-24 17:21:27 +02:00
5c44103471
Remove -lblas -llapack 2023-10-24 15:56:07 +02:00
82bbd1c2f4
Fix bug 2023-10-24 15:52:35 +02:00
6b6231fcf3
Modify batch program 2023-10-24 15:52:08 +02:00
7257e40c4e
Some stuff 2023-10-24 14:18:26 +02:00
Janita Willumsen
4bfc98791c Merge branch 'develop' into janitaws/latex-setup 2023-10-24 13:47:56 +02:00
Janita Willumsen
914261cf55 Add illustration of Penning trap 2023-10-24 13:47:16 +02:00
c93e442d99 Merge pull request #10 from FYS3150-G2-2023/coryab/code
Coryab/code
2023-10-24 12:45:32 +02:00
6847938827
Update particles 2023-10-24 12:44:48 +02:00
16d7622283
Add ofile as private 2023-10-24 12:44:25 +02:00
f7eee8dc61
Change scripts 2023-10-24 12:43:52 +02:00
cd90d29970
Edit plots 2023-10-24 12:43:13 +02:00
3eb652be83
Merge branch 'janitaws/latex-setup' into coryab/code 2023-10-23 21:49:52 +02:00
f767cdc99b
Merge branch 'janitaws/latex-setup' of github.uio.no:FYS3150-G2-2023/Project-3 into janitaws/latex-setup 2023-10-23 21:45:31 +02:00
684b38abba
Small change 2023-10-23 21:44:54 +02:00
0dfcdd5e2a
Add run times 2023-10-23 21:43:26 +02:00
9cacf7bbc2
Make some changes 2023-10-23 21:43:09 +02:00
1eb386237a
Update docs 2023-10-23 12:53:58 +02:00
f1ca42fcf5
Rearrange implementations to match definitions 2023-10-23 12:53:10 +02:00
9c4e99a327
Comment options 2023-10-23 12:43:48 +02:00
d2824d7c1d
Update docs 2023-10-23 12:43:32 +02:00
1ae665e7e7
Update versions and some other things
- Update version numbers for Doxygen
- Use vec3 instead of vec_3d
2023-10-23 12:42:12 +02:00
0dfb102cef
Update versions and some other things
- Update version number for Doxygen
- Use vec3 instead of vec_3d
2023-10-23 12:41:03 +02:00
79da936956
Update formatting 2023-10-23 10:52:38 +02:00
d08a4a046c
Update formatting 2023-10-23 10:50:08 +02:00
8f315a0955
Change Particle
- Give Particle default values for mass and charge
- Modify PenningTrap to use the new Particle constructor
- Modify main.cpp to use the new Particle constructor
- Modify test_suite.cpp to use the new Particle constructor
2023-10-23 09:54:13 +02:00
8fc0bf8c13
Refactor
- Change PenningTrap so that perturbation is its own field
- Add Calcium mass and charge to constants
2023-10-23 09:45:08 +02:00
Janita Willumsen
346a800428 Merge branch 'develop' into janitaws/latex-setup 2023-10-22 17:51:18 +02:00
bbb0203d35 Merge pull request #9 from FYS3150-G2-2023/coryab/code
Coryab/code
2023-10-22 17:46:55 +02:00
Janita Willumsen
937e681195 Update methods 2023-10-22 17:46:45 +02:00
2b69094ff4
Update constant 2023-10-22 17:45:34 +02:00
bd9600b6d1
Fix dumb mistake 2023-10-22 17:44:08 +02:00
Janita Willumsen
1224700312 Update references 2023-10-22 17:24:06 +02:00
b985a2c25f
Changes 2023-10-22 17:17:28 +02:00
Janita Willumsen
4e14915b04 Stuff 2023-10-22 17:16:47 +02:00
Janita Willumsen
872b84d0d1 Change labels 2023-10-22 17:15:13 +02:00
Janita Willumsen
493bac88c3 Update document 2023-10-22 17:14:03 +02:00
8373deea81
Update plots 2023-10-22 16:34:48 +02:00
e42c108d20
Made some changes 2023-10-22 15:19:45 +02:00
0dfda79fda
Update plots 2023-10-22 15:09:14 +02:00
f37385dc87
Merge branch 'janitaws/latex-setup' of github.uio.no:FYS3150-G2-2023/Project-3 into janitaws/latex-setup 2023-10-22 14:32:53 +02:00
eab84f52e9
Stuff 2023-10-22 14:32:29 +02:00
Janita Willumsen
1918dfb3f7 Update plots 2023-10-22 14:22:44 +02:00
Janita Willumsen
b8f32f1fd9 Update plot with seaborn theme 2023-10-22 14:22:03 +02:00
944c52d22f
Add commments 2023-10-22 14:11:15 +02:00
a99eeab8b5
Optimize
- Use the new reinitialize method to reuse PenningTrap instances
2023-10-22 03:50:48 +02:00
eb2a985b3b
Bunch of stuff
- Add reinitialize to reuse PenningTrap instance and its particles
- Reformatting
- Refactor fraction_of_particles_left to not use simulate
2023-10-22 03:47:23 +02:00
19e35f25ec
Add instrumentation for scorep and scalasca 2023-10-22 03:45:56 +02:00
Janita Willumsen
405493a888 Update plots, not finished result 2023-10-20 15:59:39 +02:00
Janita Willumsen
f52892c1a6 Latexify the plots 2023-10-20 15:58:49 +02:00
2348d06070
Uncomment 2023-10-20 11:24:41 +02:00
335907d435
Formatting 2023-10-20 11:20:57 +02:00
b6a3024613
Add some formatting rules 2023-10-19 22:37:11 +02:00
7269429a37
Optimizations 2023-10-19 22:36:54 +02:00
4551b233e9
Update README 2023-10-19 18:38:15 +02:00
c2f089ee0f
Add scripts directory 2023-10-19 18:37:55 +02:00
14a6d4ba15
Update docs 2023-10-19 18:37:42 +02:00
76dd30df23
Add documentation 2023-10-19 18:37:28 +02:00
9c17608066
Add Python requirements 2023-10-19 18:36:56 +02:00
520728a9c2
Move typedef 2023-10-19 18:36:34 +02:00
8412e2f643
Cleanup 2023-10-19 13:17:58 +02:00
1741b107f7
Cleanup 2023-10-19 13:17:45 +02:00
6d002cf564
Update 2023-10-19 13:17:33 +02:00
d9f9940451
Cleanup 2023-10-19 13:17:08 +02:00
763a34ea8c
Use close_to 2023-10-19 13:16:18 +02:00
af2712cccd
Change name 2023-10-19 13:15:56 +02:00
555c397d76
Fix directories list 2023-10-19 13:15:12 +02:00
Janita Willumsen
10a565eb24 pdf stuff 2023-10-18 15:55:00 +02:00
58db1d9928
Merge branch 'coryab/code' into develop 2023-10-18 15:51:54 +02:00
Janita Willumsen
f359789767 Remove compiled pdf 2023-10-18 15:47:47 +02:00
e636bf17a2
Update latex 2023-10-18 14:51:01 +02:00
8783e15e9e
Merge branch 'coryab/latex' into develop 2023-10-18 13:59:00 +02:00
eb55d9b3c9
Merge branch 'janitaws/latex-setup' into develop 2023-10-18 13:49:46 +02:00
7714f80f8c
Merge branch 'janitaws/latex-setup' of github.uio.no:FYS3150-G2-2023/Project-3 into janitaws/latex-setup 2023-10-18 13:37:24 +02:00
d8059a92e1
Delete file 2023-10-18 13:36:19 +02:00
4f38357db7
Stuff 2023-10-18 13:34:23 +02:00
Janita Willumsen
d07e5a9eff Update introduction 2023-10-18 13:31:45 +02:00
Janita Willumsen
4d2c24e92b Merge branch 'janitaws/latex-setup' of github.uio.no:FYS3150-G2-2023/Project-3 into janitaws/latex-setup 2023-10-18 08:42:17 +02:00
Janita Willumsen
0163bc3d21 Add introduction and (a somewhat messy) method part 2023-10-17 19:41:01 +02:00
d7246b05b1
Fix last update of RK4 2023-10-17 17:31:56 +02:00
5ed7cedfae
Stuff 2023-10-17 17:01:50 +02:00
f29424f96e
Fix some small things 2023-10-16 20:58:50 +02:00
95432102ea
Small fix 2023-10-16 13:33:00 +02:00
0fc1ec1e33
Fix signature 2023-10-16 13:01:21 +02:00
03344c3298
Update methods 2023-10-16 12:58:34 +02:00
56080de561
Implemented pseudocode for forward Euler and RK4 2023-10-15 23:01:03 +02:00
655bf6aceb Merge pull request #8 from FYS3150-G2-2023/janitaws/latex-setup
Janitaws/latex setup
2023-10-14 03:16:22 +02:00
58e5ed5c69
Merge branch 'develop' into janitaws/latex-setup 2023-10-14 03:15:30 +02:00
Janita Willumsen
1841de0693 Fix link to repo 2023-10-03 13:55:13 +02:00
Janita Willumsen
1e12f8d0f1 Ignore build bib 2023-10-03 13:54:26 +02:00
Janita Willumsen
b699ca4dee Add bib for references 2023-10-03 12:26:31 +02:00
Janita Willumsen
89e50a32a4 Include bib files for references 2023-10-03 12:25:17 +02:00
Janita Willumsen
ef3af22876 Set up document structure, content placed in separate directories 2023-10-03 12:23:46 +02:00