-
Notifications
You must be signed in to change notification settings - Fork 35
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.
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
Add nuclear zone data #1269
Merged
Merged
Add nuclear zone data #1269
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
ff78c9b
Import nucleon loss energies in IsotopeView
whokion 8004439
Add options for the Bertini cascade model
whokion 67c7137
Adjust test results due to updates for nuclear mass
whokion 5896714
Add nuclear zone data for the Bertini cascade model
whokion b5d5665
Fix an error from window build
whokion c8bda1a
Guard for A and Z when calculating the binding energy difference for …
whokion 84d053d
Fix a typo
whokion 3dc753f
Add default initializers in ImportIsotope
whokion 3bfad58
Use CELER_JSON_LOAD_OPTION from JasonUtils.json
whokion 78cd898
Rename zone_builder to build_nuclear_zones
whokion 7a200a0
Reflect review comments and suggestions by sethrj
whokion 68253c4
Add a test case for the Gaussian ptential with isotope A in [5,11]
whokion 77fd2d7
Remove num_zones from NuclearZones and use zones.size() instead
whokion 37dc2c7
Reflect more review comments by amandalund and sethrj
whokion 72379bc
Merge branch 'develop' into nuclei-model-data
sethrj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
//----------------------------------*-C++-*----------------------------------// | ||
// Copyright 2024 UT-Battelle, LLC, and other Celeritas developers. | ||
// See the top-level COPYRIGHT file for details. | ||
// SPDX-License-Identifier: (Apache-2.0 OR MIT) | ||
//---------------------------------------------------------------------------// | ||
//! \file celeritas/neutron/model/CascadeOptions.cc | ||
//---------------------------------------------------------------------------// | ||
#include "CascadeOptions.hh" | ||
|
||
#include "corecel/Assert.hh" | ||
|
||
namespace celeritas | ||
{ | ||
//---------------------------------------------------------------------------// | ||
/*! | ||
* Throw a runtime assertion if any of the input is invalid. | ||
*/ | ||
void validate_input(CascadeOptions const& opts) | ||
{ | ||
CELER_VALIDATE(opts.prob_pion_absorption >= 0, | ||
<< "invalid prob_pion_absorption " | ||
<< opts.prob_pion_absorption); | ||
CELER_VALIDATE(opts.radius_scale > 0, | ||
<< "invalid radius_scale " << opts.radius_scale); | ||
CELER_VALIDATE(opts.radius_small > 0, | ||
<< "invalid radius_small " << opts.radius_small); | ||
CELER_VALIDATE(opts.radius_alpha > 0, | ||
<< "invalid radius_alpha " << opts.radius_alpha); | ||
CELER_VALIDATE(opts.radius_trailing >= 0, | ||
<< "invalid radius_trailing " << opts.radius_trailing); | ||
CELER_VALIDATE(opts.fermi_scale > 0, | ||
<< "invalid fermi_scale " << opts.fermi_scale); | ||
CELER_VALIDATE(opts.xsec_scale > 0, | ||
<< "invalid xsec_scale " << opts.xsec_scale); | ||
CELER_VALIDATE(opts.gamma_qd_scale > 0, | ||
<< "invalid gamma_qd_scale " << opts.gamma_qd_scale); | ||
CELER_VALIDATE(opts.dp_max_doublet > 0, | ||
<< "invalid dp_max_doublet " << opts.dp_max_doublet); | ||
CELER_VALIDATE(opts.dp_max_triplet > 0, | ||
<< "invalid dp_max_triplet " << opts.dp_max_triplet); | ||
CELER_VALIDATE(opts.dp_max_alpha > 0, | ||
<< "invalid dp_max_alpha " << opts.dp_max_alpha); | ||
CELER_ENSURE(opts); | ||
} | ||
|
||
//---------------------------------------------------------------------------// | ||
} // namespace celeritas |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the data could be simplified slightly by removing this struct and instead storing the
components
andzones
directly inNeutronInelasticData
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I originally did what you are suggesting, but I may want to reorganize data structure by grouping data separately needed for the process (i.e., macro_xs) and for the interactor (nucleon_xs, zone_data and other data which will be added later). Although NuclearZoneData is too specific now and can be renamed by the more generic name as more data are added, I would keep the structure as it is now and reorganize them later as more codes and data are added.