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

DEV/REL/BUG Merge 0.9.1 into develop #369

Merged

Conversation

drewejohnson
Copy link
Collaborator

Introduce the bug fix and release data from #366, #368 into the develop branch. Develop version 0.10.0.dev0 is preserved

drewejohnson and others added 10 commits December 7, 2019 16:04
Related to GH issue CORE-GATECH-GROUP#365, where the use of the new Serpent
sens opt history 1 option prints out additional sensitivity
data. In this mode, sensitivities using 1<=n<N latent generations
are printed, where N is the number specified using sens opt latgen
argument. This creates new arrays of the form

ADJ_PERT_SENS_<RESP>_<N>_GEN
ADJ_PERT_SENS_<RESP>_<N>_GEN_E_INT

to the sensitivity files.  As reported in the issue,
serpentTools would store the last set of <N>_GEN as the actual
response, so the value stored would reflect data using one fewer
latent generations.

The sensitivity test file is modified to include four new arrays,

ADJ_PERT_keff_SENS_1_GEN
ADJ_PERT_keff_SENS_1_GEN_E_INT
ADJ_PERT_fis2flx_SENS_1_GEN
ADJ_PERT_fis2flx_SENS_1_GEN_E_INT

These arrays are identical the non _1_GEN values, except the
very first value and associated uncertainty are set to zero.
Running the sensitivity file test will fail due to this
change, as the reference data have not been changed in the file,
but are overwritten as reported in the issue.
This closes GH issue CORE-GATECH-GROUP#356 but changing how arrays are processed
in the sensitivity reader. The variable names are processed using
a single for-loop rather than multiple index calls. The new routine
also reads the _N_GEN information to be used later in storing
these arrays. Examination of these arrays can help the determination
of ideal number of latent generations, as described in the Serpent
Wiki using the sens opt history setting.
Don't overwrite sensitivity data with _N_GEN variables
Point to GitHub issue CORE-GATECH-GROUP#367 to indicate we are aware of the
desire to store arrays over variable number of latent generations,
but do not store them currently.
Bump version to 0.9.1 in setup.py, serpentTools/__init__.py,
and docs/conf.py. Updated changelog to reflect handling of
sensitivity history arrays
Preserve development version 0.10.0.dev0 in
docs/conf.py, setup.py, and serpentTools/__init__.py
@drewejohnson drewejohnson added bug release Items related to releasing versions developer Developer-focused changes labels Dec 12, 2019
@drewejohnson drewejohnson added this to the 0.10.0 milestone Dec 12, 2019
@drewejohnson drewejohnson added this to Review in Main Dec 12, 2019
@drewejohnson drewejohnson merged commit d5ff5c6 into CORE-GATECH-GROUP:develop Dec 16, 2019
@drewejohnson drewejohnson deleted the merge-0.9.1-develop branch February 20, 2020 19:34
drewejohnson added a commit to drewejohnson/serpent-tools that referenced this pull request May 23, 2020
Backport of features included since 0.9.3 release

Includes the following PRs

git log --online --pretty="%s" --merges 0.9.3...

Merge pull request CORE-GATECH-GROUP#407 from drewejohnson/fix-readme
Merge pull request CORE-GATECH-GROUP#406 from drewejohnson/r0.9.3
Merge pull request CORE-GATECH-GROUP#405 from nicoloabrate/master
Merge pull request CORE-GATECH-GROUP#404 from drewejohnson/update-git-attr
Merge pull request CORE-GATECH-GROUP#402 from drewejohnson/xsplot-labels
Merge pull request CORE-GATECH-GROUP#400 from drewejohnson/lib2-notes
Merge pull request CORE-GATECH-GROUP#399 from CORE-GATECH-GROUP/docs-sphinx-2.0
Merge pull request CORE-GATECH-GROUP#397 from drewejohnson/port-list-of-arrays
Merge pull request CORE-GATECH-GROUP#398 from drewejohnson/det-supers
Merge pull request CORE-GATECH-GROUP#396 from drewejohnson/df-arg-renaming
Merge pull request CORE-GATECH-GROUP#394 from drewejohnson/0.9.3-update-docs
Merge pull request CORE-GATECH-GROUP#395 from drewejohnson/hist-branch-dictlike
Merge pull request CORE-GATECH-GROUP#393 from drewejohnson/less-metadata
Merge pull request CORE-GATECH-GROUP#392 from drewejohnson/better-access
Merge pull request CORE-GATECH-GROUP#391 from drewejohnson/dep-dataframe
Merge pull request CORE-GATECH-GROUP#390 from drewejohnson/api-dep-attributes
Merge pull request CORE-GATECH-GROUP#388 from drewejohnson/xsplot-branch
Merge pull request CORE-GATECH-GROUP#378 from drewejohnson/better-build
Merge pull request CORE-GATECH-GROUP#376 from drewejohnson/unbundle-data-files
Merge pull request CORE-GATECH-GROUP#370 from drewejohnson/results-loa
Merge pull request CORE-GATECH-GROUP#369 from drewejohnson/merge-0.9.1-develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug developer Developer-focused changes release Items related to releasing versions
Projects
Main
Review
Development

Successfully merging this pull request may close these issues.

None yet

2 participants