Merge branch 'develop' into no_n_batches_in_statepoint

Conflicts:
	docs/source/devguide/statepoint.rst
This commit is contained in:
Sterling Harper 2014-10-24 18:08:48 -04:00
commit db84521286
135 changed files with 3643 additions and 1446 deletions

View file

@ -290,6 +290,13 @@ if (run_mode == MODE_EIGENVALUE and source_present)
Energy of the i-th source particle.
-----------
Revision 12
-----------
Same as revision 11, except **tallies(i) % scatt_order(j)** is now **tallies(i)
% moment_order(j)**.
-----------
Revision 11
-----------
@ -504,13 +511,13 @@ if (run_mode == MODE_EIGENVALUE)
**integer(4) tallies(i) % score_bins(j)**
Values of specified scoring bins (e.g. SCORE_FLUX).
*do j = 1, tallies(i) % n_score_bins*
**integer(4) tallies(i) % scatt_order(j)**
Scattering Order specified scoring bins.
**integer(4) tallies(i) % n_score_bins**
Number of scoring bins without accounting for those added by
@ -551,7 +558,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -581,7 +588,7 @@ if (run_mode == MODE_EIGENVALUE and source_present)
Energy of the i-th source particle.
-----------
Revision 10
Revision 10
-----------
**integer(4) FILETYPE_STATEPOINT**
@ -794,13 +801,13 @@ if (run_mode == MODE_EIGENVALUE)
**integer(4) tallies(i) % score_bins(j)**
Values of specified scoring bins (e.g. SCORE_FLUX).
*do j = 1, tallies(i) % n_score_bins*
**integer(4) tallies(i) % scatt_order(j)**
Scattering Order specified scoring bins.
**integer(4) tallies(i) % n_score_bins**
Number of scoring bins without accounting for those added by
@ -837,7 +844,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -1046,13 +1053,13 @@ if (run_mode == MODE_EIGENVALUE)
**integer(4) tallies(i) % score_bins(j)**
Values of specified scoring bins (e.g. SCORE_FLUX).
*do j = 1, tallies(i) % n_score_bins*
**integer(4) tallies(i) % scatt_order(j)**
Scattering Order specified scoring bins.
**integer(4) tallies(i) % n_score_bins**
Number of scoring bins without accounting for those added by
@ -1089,7 +1096,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -1294,13 +1301,13 @@ if (run_mode == MODE_EIGENVALUE)
**integer(4) tallies(i) % score_bins(j)**
Values of specified scoring bins (e.g. SCORE_FLUX).
*do j = 1, tallies(i) % n_score_bins*
**integer(4) tallies(i) % scatt_order(j)**
Scattering Order specified scoring bins.
**integer(4) tallies(i) % n_score_bins**
Number of scoring bins without accounting for those added by
@ -1337,7 +1344,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -1526,13 +1533,13 @@ if (run_mode == MODE_EIGENVALUE)
**integer(4) tallies(i) % score_bins(j)**
Values of specified scoring bins (e.g. SCORE_FLUX).
*do j = 1, tallies(i) % n_score_bins*
**integer(4) tallies(i) % scatt_order(j)**
Scattering Order specified scoring bins.
**integer(4) tallies(i) % n_score_bins**
Number of scoring bins without accounting for those added by
@ -1569,7 +1576,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -1790,7 +1797,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -1999,7 +2006,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -2204,7 +2211,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -2405,7 +2412,7 @@ if (tallies_on > 0)
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the
i-th tally
@ -2526,7 +2533,7 @@ Revision 2
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the i-th
tally
@ -2625,7 +2632,7 @@ Revision 1
*do j = 1, size(tallies(i) % scores, 1)*
**real(8) tallies(i) % scores(j,k) % sum**
Accumulated sum for the j-th score and k-th filter of the i-th
tally