Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0e0cd0a
Added hooks for NCrystal
marquezj Sep 13, 2021
0f33e0b
Add temporary requirement of natural elements in NCrystal materials
tkittel Sep 13, 2022
9c54ac0
Fix access to private attributes
marquezj Sep 13, 2022
70d5c76
Fixed material.h
marquezj Sep 13, 2022
29a10ea
Removed MacroNCrystalXS
marquezj Sep 16, 2022
2e19260
Implement recommended changes
marquezj Sep 26, 2022
5afcc9e
Apply clang-format
marquezj Sep 26, 2022
fdf763e
Couple of fixes
marquezj Sep 26, 2022
52ee2c3
Print where NCrystal was found as suggested by @paulromano
tkittel Oct 20, 2022
a5b811e
Use new NCrystal getFlattenedComposition method to better support mor…
tkittel Oct 20, 2022
f2e807e
Move NCrystalRNGWrapper data member into explicit private section as …
tkittel Oct 20, 2022
aca4fcb
NCrystal cfgstr printout now mentions material ID
tkittel Oct 21, 2022
a3dd55d
first stab at gha-install-ncrystal.sh
tkittel Oct 21, 2022
e64bf6a
Add installation instructions for NCrystal
marquezj Nov 10, 2022
1f3c5ed
Add use instructions and examples for NCrystal
marquezj Nov 10, 2022
cf96ddf
Basic introduction to NCrystal
marquezj Nov 17, 2022
24572a7
Added simple NCrystal test
marquezj Nov 17, 2022
54745f5
Changed example NCrystal cfg strings
marquezj Nov 18, 2022
91f939a
Add flag for NCrystal
marquezj Nov 18, 2022
5f8e64b
Add NCrystal vairables to ci.yml
marquezj Nov 18, 2022
87ed26b
Add option to install NCrystal
marquezj Nov 18, 2022
8cf9dbe
Fixed in NCrystal docs
marquezj Nov 18, 2022
b9e8f13
Attempt to fix NCrystal installation script
marquezj Nov 18, 2022
b9a1fd5
Merge branch 'mixed_ncrystal' of https://github.com/highness-eu/openm…
marquezj Nov 18, 2022
d7ab491
Try fix of NCrystal install
marquezj Nov 19, 2022
b199db9
Update gha-install-ncrystal.sh
marquezj Nov 19, 2022
39d0c5c
Try to initialize with setup.sh
marquezj Nov 19, 2022
9e1abb3
Update gha-install-ncrystal.sh
marquezj Nov 19, 2022
3e6bb9d
Upgrade installation script to NCrystal 3.5.0
marquezj Nov 28, 2022
be330a1
Update gha-install-ncrystal.sh
marquezj Nov 28, 2022
fff545a
Update gha-install-ncrystal.sh
marquezj Nov 28, 2022
8598ff7
Pass CMAKE_PREFIX_PATH from NCrystall installation
marquezj Nov 28, 2022
c98a121
Update gha-install.py
marquezj Nov 28, 2022
19bf624
Add NCrystal installation test
marquezj Nov 28, 2022
4391d60
find NCrystal
marquezj Nov 28, 2022
e626447
Update gha-script.sh
marquezj Nov 28, 2022
e7b4285
Cleanup
marquezj Nov 29, 2022
f2c2870
Apply suggestions from code review
tkittel Dec 7, 2022
a86e74f
Rename compute_angular_distribution to pencil_beam_model
tkittel Dec 7, 2022
b6d6bdf
Merge branch 'develop' into mixed_ncrystal_pr
paulromano Jan 9, 2023
7dae457
Merge pull request #1 from paulromano/ncrystal_mixed
tkittel Jan 10, 2023
62af773
Refactor NCrystal interface code to ncrystal_interface.h/cpp
paulromano Jan 9, 2023
4eda693
Style and spacing changes
paulromano Jan 10, 2023
c4227f7
Change Material.from_ncrystal to accept kwargs
paulromano Jan 10, 2023
fe4a1de
Merge pull request #2 from paulromano/mixed_ncrystal_pr
tkittel Jan 10, 2023
e83ced8
Change ncrystal_max_energy to be a global constant
paulromano Jan 10, 2023
93aaa32
Merge pull request #3 from paulromano/mixed_ncrystal_const
tkittel Jan 11, 2023
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
Move NCrystalRNGWrapper data member into explicit private section as …
…requested
  • Loading branch information
tkittel committed Oct 21, 2022
commit f2e807e942ed421cd03fc87823c579e47dfcce3c
4 changes: 2 additions & 2 deletions include/openmc/physics.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ void split_particle(Particle& p);
//==============================================================================

class NCrystalRNGWrapper : public NCrystal::RNGStream {
uint64_t* openmc_seed_;

public:
constexpr NCrystalRNGWrapper(uint64_t* seed) noexcept : openmc_seed_(seed) {}

Expand All @@ -122,6 +120,8 @@ class NCrystalRNGWrapper : public NCrystal::RNGStream {
return std::max<double>(
std::numeric_limits<double>::min(), prn(openmc_seed_));
}
private:
uint64_t* openmc_seed_;
};
#endif

Expand Down