Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option for general energy input from files instead of radioactive decay #15

Open
wants to merge 1,553 commits into
base: main
Choose a base branch
from
Open

Add option for general energy input from files instead of radioactive decay #15

wants to merge 1,553 commits into from

Conversation

ccollins22
Copy link
Member

No description provided.

@lukeshingles
Move atomic functions int atomic.cc
161f642
@lukeshingles
Revert to nne_free in nonthermal loss function
497ecf4
@lukeshingles
Remove individ_rad_deexc from cellhistory
a4610c6 
similar or slightly better performance and less memory usage per thread
@lukeshingles
Fix previous commit
3884fd2
@lukeshingles
Show mem_usage for phixslist and coolinglist
2ac6da3
@lukeshingles
Revert "Remove individ_rad_deexc from cellhistory"
0537f2d 
This reverts commit a4610c6.
@lukeshingles
Revert "Fix previous commit"
4cbc598 
This reverts commit 3884fd2.
@lukeshingles
Remove unused debug message
a782b86
@lukeshingles
Revert "Revert "Remove individ_rad_deexc from cellhistory""
6dedabf 
This reverts commit 0537f2d.
@lukeshingles
Revert "Revert "Fix previous commit""
994253c 
This reverts commit 4cbc598.
@lukeshingles
Remove individ_internal_down_same from cellhistory
cc2b18d
@lukeshingles
Remove individ_internal_up_same from cellhistory
af4a106 
Similar performance (within ~10%)
@lukeshingles
Update update_grid.cc
926a767
@lukeshingles
Combine excitations in cooling list
06230d4 
4% faster and 80MB less mem per thread
@lukeshingles
Move full phixslist into shared memory
46ac9a5
@lukeshingles
Split cooling list into global list and thead-specific rates (reduce …
1c8b707 
…mem per thread by >85MB)
@lukeshingles
Replace calloc with malloc (future CUDA compatability)
12ef758
@lukeshingles
Remove unused code
1f1ea06
@lukeshingles
Use time instead of time - t_model (almost identical)
c9f5913
@lukeshingles
Restructure stats and eliminate MTHREADS
3ade78e
@lukeshingles
Use get_elem_abundance function
b27869b
@lukeshingles
Update decay.cc
dc38b8c
@lukeshingles
Change elements_uppermost_ion from short to int
6dc7d27
@lukeshingles
Fix kpkt
9e2c26f
@lukeshingles
Update kpkt.cc
ac8ceaa
@lukeshingles
Replace globals::nthreads with get_nthreads()
1025e13
@lukeshingles
Set CMake to C++
88d6213
@lukeshingles
Remove unused code
ea7eefa
@lukeshingles
Prepare for CUDA compilation
156f6be
@lukeshingles
Make get_num_threads() and get_thread_num() work in CUDA/OpenMP/singl…
2499345 
…e thread mode
lukeshingles and others added 30 commits March 21, 2021 11:40
@lukeshingles
Merge branch 'nebular' into nebular-generalenergyinput
c0fd5ca
@lukeshingles
Merge branch 'nebular' into nebular-generalenergyinput
aca27e6
@lukeshingles
Fix merge
15e3be9
@lukeshingles
Merge branch 'nebular' into nebular-generalenergyinput
0ca72bc
@lukeshingles
Merge branch 'nebular' into nebular-generalenergyinput
b4842fb
@lukeshingles
Merge branch 'nebular' into nebular-generalenergyinput
cb0ff3b
@ccollins22
Use wid_init for cell volume and remove set 0 for MMODELGRID
9927860
@ccollins22
Use npts_model instead of MMODELGRID
bab3f64
@ccollins22
Update set cell energies
0d8c8d6
@lukeshingles
Move energy_input_init() call after model init and add checks
eddc81a
@ccollins22
Change loop variable
463d3df
@ccollins22
Use mgi instead of geid cell index
280f73b
@ccollins22
Update energy_input.cc
d0e0f5b
@ccollins22
Update energy_input.cc
51fc12a
@ccollins22
Update grid.cc
1dc655b
@ccollins22
Update radfield.cc
0273f10
@ccollins22
Rename
3e32882
@ccollins22
1D energy read
fbf9d6e
@ccollins22
Update packet_init.cc
7eba9b8
@ccollins22
Update packet_init.cc
a7a4c7d
@ccollins22
Update energy_input.cc
177ee4b
@ccollins22
Update energy_input.cc
a4306d3
@ccollins22
Set e_cmf in new pellet function
488e910
@ccollins22
Update escape condition. If empty cell outside rmax then escaped
46299ea
@ccollins22
Update boundary.cc
8c0e3d0
@ccollins22
Update boundary.cc
5d910ab
@ccollins22
Update boundary.cc
8101494
@ccollins22
Check for 1D or 3D model
5955b22
@ccollins22
Update energy_input.cc
c93999d
@ccollins22
Only use other escape condition where model has high velocities (>0.6c)
afbbb42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukeshingles lukeshingles Awaiting requested review from lukeshingles lukeshingles is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ccollins22 @lukeshingles