Skip to content

Merge dev into Main for version 1.2.0 #170

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

Merged
merged 57 commits into from
Nov 30, 2021
Merged

Merge dev into Main for version 1.2.0 #170

Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
685b31b
Added tagged BCA output. Now particles carry tags and weights through…
drobnyjt Aug 22, 2021
2893e51
Updated hdf5 section with new particle data.
drobnyjt Aug 22, 2021
f9549ab
small fix to hdf5 particle input.
drobnyjt Aug 22, 2021
bb5c48a
Fixes to input deck - no need to have weight/tag in toml right now.
drobnyjt Aug 22, 2021
a16e41b
Merge pull request #148 from lcpp-org/library_upgrades_particle_tagging
drobnyjt Aug 22, 2021
076c1e3
Update to RustBCA.h.
drobnyjt Aug 22, 2021
5e24721
Merge pull request #149 from lcpp-org/header
drobnyjt Aug 22, 2021
378ffd8
Added single ion reflection routine for compound targets.
drobnyjt Sep 16, 2021
2785b4f
Included Fortran module with interface to reflection_single_ion.
drobnyjt Sep 16, 2021
d74912e
Added docstrings to rustbca module.
drobnyjt Sep 16, 2021
abe3612
list input for Fortran.
drobnyjt Sep 17, 2021
ad530a2
Added particle tracking components.
drobnyjt Sep 20, 2021
8f2c2ec
Fix to tracking components.
drobnyjt Sep 20, 2021
3c8c6d2
Further fixes.
drobnyjt Sep 20, 2021
327060f
Further fixes.
drobnyjt Sep 20, 2021
bf6371f
Merge pull request #151 from lcpp-org/library_reflection
drobnyjt Sep 20, 2021
8d187d1
Updates to Fortran wrappers.
drobnyjt Sep 20, 2021
7c33fbd
Merge pull request #152 from lcpp-org/library_reflection
drobnyjt Sep 20, 2021
de11897
Added docstring to fortran bca function.
drobnyjt Sep 20, 2021
862981c
Update Cargo.toml
drobnyjt Sep 21, 2021
b434775
New feature: particle distributions. Is backwards compatible, thanks …
drobnyjt Oct 14, 2021
093a857
Added more context to error message for NR rootfinder.
drobnyjt Oct 18, 2021
29ecabf
Merge pull request #154 from lcpp-org/input_distributions
drobnyjt Oct 18, 2021
c16c447
Added context to error when particle energy goes NaN following collis…
drobnyjt Oct 28, 2021
9d96870
Fix for Issue #159
drobnyjt Nov 17, 2021
5cc112e
Update rustbca_compile_check.yml
drobnyjt Nov 17, 2021
a658f1e
Update setup.py
drobnyjt Nov 17, 2021
d84a76f
Another attempted fix
drobnyjt Nov 18, 2021
2a161be
Update rustbca_compile_check.yml
drobnyjt Nov 18, 2021
3217150
Update rustbca_compile_check.yml
drobnyjt Nov 18, 2021
f886f02
Update rustbca_compile_check.yml
drobnyjt Nov 18, 2021
cf00eab
Merge pull request #160 from lcpp-org/drobnyjt-patch-1
drobnyjt Nov 18, 2021
a82abaf
Merge pull request #161 from lcpp-org/recoil_nan_error_context
drobnyjt Nov 18, 2021
82ec443
Add tests of fortran functions to workflow
drobnyjt Nov 18, 2021
3351bf7
Update rustbca_compile_check.yml
drobnyjt Nov 18, 2021
6e8c7f1
Merge pull request #162 from lcpp-org/workflow-fortran-test
drobnyjt Nov 18, 2021
bca3d89
Update lib.rs
drobnyjt Nov 19, 2021
d2db27e
Fortran routine tests.
drobnyjt Nov 19, 2021
96462d6
added C example to examples folder.
drobnyjt Nov 20, 2021
ca25e27
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
5dca803
add g++ compilation of C libraries
drobnyjt Nov 20, 2021
56333cd
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
d55f728
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
559ba45
Made sure Python headers are installed
drobnyjt Nov 20, 2021
ed472a6
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
25c3b1b
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
52b23a8
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
8af04f0
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
f6baee7
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
ccbad25
Update rustbca_compile_check.yml
drobnyjt Nov 20, 2021
731c77a
Update test_rustbca.f90
drobnyjt Nov 20, 2021
331c716
Merge pull request #165 from lcpp-org/fortran_example
drobnyjt Nov 20, 2021
119f1e0
Remove generic import from anyhow - it was overriding Ok() and breaki…
drobnyjt Nov 29, 2021
92696d5
Merge pull request #167 from lcpp-org/fix_error_handling
drobnyjt Nov 29, 2021
8d7678d
Testing pip as python build tool instead of directly invoking setup.py.
drobnyjt Nov 29, 2021
7a50bf6
Merge pull request #168 from lcpp-org/test_pip
drobnyjt Nov 29, 2021
20ad62e
Merge branch 'master' into dev
drobnyjt Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updates to Fortran wrappers.
  • Loading branch information
@drobnyjt
drobnyjt committed Sep 20, 2021
commit 8d187d1cea34707dead447a378c2f76b8dd427bb
3 changes: 2 additions & 1 deletion rustbca.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@ subroutine reflect_single_ion_c(num_species_target, ux, uy, uz, E1, &

end subroutine reflect_single_ion_c

function compound_bca_list_fortran(num_incident_ions, ux, uy, uz, E1, &
function compound_bca_list_fortran(num_incident_ions, track_recoils, ux, uy, uz, E1, &
Z1, m1, Ec1, Es1, &
num_species_target, Z2, m2, Ec2, Es2, Eb2, n2, &
num_emitted_particles) bind(c) result(output)

use, intrinsic :: iso_c_binding
logical(c_bool), intent(in) :: track_recoils
integer(c_int), intent(in) :: num_incident_ions, num_species_target
integer(c_int), intent(out) :: num_emitted_particles
real(c_double), intent(in), dimension(*) :: ux, uy, uz, E1, Z1, m1, Ec1, Es1
Expand Down