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.

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

Feature/multigroup part10 #19

Merged
merged 12 commits into from
Oct 8, 2024
Merged

Feature/multigroup part10 #19

merged 12 commits into from
Oct 8, 2024

Conversation

whaeck
Copy link
Member

@whaeck whaeck commented Jun 5, 2024

This adds the last few remaining records for the multigroup neutron and photon files:

  • nubar
  • nu sigma_f
  • chi vector
  • chi matrix

The only few remaining things to finalise are the constructor of the MultigroupTable to use these records (the PR was getting big) and maybe some consolidation of records into logical blocks to make it easier for the user (e.g. putting all fission related records in their own class as we did with the metadata).


module,
"FissionNeutronProduction",
"A fission neutron production record for multigroup neutron and photon data"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind removing "and photon data" for now? For multigroup we only create photons with a production matrix that's included with the scattering matrix. I don't want people to expect the wrong thing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

COnsider it done. See fix/review-part6.

"Initialise the record\n\n"
"Arguments:\n"
" self the record\n"
" values the fission neutron production values"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget "type"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in fix/review-part6.

"record\n\n"
"Arguments:\n"
" string the string representing the record\n"
" number the fission neutron multiplicity values"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why call this "number"? Especially since it's multiple values.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking further down, should this be the number of groups?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Changed in fix/review-part6.

"record\n\n"
"Arguments:\n"
" string the string representing the record\n"
" number the fission neutron production values"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as before with "number"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Number of groups?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Changed in fix/review-part6.


module,
"FissionNeutronSpectrumMatrix",
"A fission neutron spectrum matrix record for multigroup neutron and photon data"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here about photon.

Copy link
Member Author

@whaeck whaeck Oct 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it everywhere. Changed in fix/review-part6.

FissionNeutronSpectrumMatrix() : RealListRecord( base::Keyword( "chi_mat" ) ) {}

/**
* @brief Default constructor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mention type?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in fix/review-part6.

*
* The following verification tests are performed:
* - there is at least one value
*

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mention the "check for matrix" test.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in fix/review-part6.


GIVEN( "invalid data for a FissionNeutronSpectrumMatrix instance" ) {

WHEN( "the number of weight values is insufficient" ) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not weights.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, we should test the "matrix not square" bit too.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn you copy/paste!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in fix/review-part6. And added square test.

FissionNeutronSpectrumVector() : RealListRecord( base::Keyword( "chi_vec" ) ) {}

/**
* @brief Default constructor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Type?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in fix/review-part6.

/**
* @brief Constructor
*
* @param[in] values the fission neutron spectrum vector values

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Type?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in fix/review-part6.

Base automatically changed from fix/review-part5 to develop October 8, 2024 19:46
@whaeck whaeck merged commit 428e519 into develop Oct 8, 2024
8 checks passed
@whaeck whaeck deleted the feature/multigroup-part10 branch October 8, 2024 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants