Merge remote-tracking branch 'upstream/develop' into mg_docs

This commit is contained in:
Adam Nelson 2016-06-15 19:36:49 -04:00
commit 5651505918
28 changed files with 1218 additions and 1088 deletions

View file

@ -173,9 +173,9 @@ attributes/sub-elements required to describe the meta-data:
provided via the ``scatt_type`` element above, is represented and thus used
during the scattering process. Specifically, the options are to either
convert the Legendre expansion to a tabular representation or leave it as
a set of Legendre coefficients. Converting to a tabular representation will
cost memory but can allow for a decrease in runtime compared to leaving as a
set of Legendre coefficients. This element has the following
a set of Legendre coefficients. Converting to a tabular representation
will cost memory but can allow for a decrease in runtime compared to
leaving as a set of Legendre coefficients. This element has the following
attributes/sub-elements:
:enable:
@ -183,7 +183,7 @@ attributes/sub-elements required to describe the meta-data:
tabular format should be performed or not. A value of "true" means
the conversion should be performed, "false" means it should not.
*Default*: "false"
*Default*: "true"
:num_points:
If the conversion is to take place the number of tabular points is