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

This commit is contained in:
Sterling Harper 2016-06-15 10:59:18 -05:00
commit 2ea00d23b1
12 changed files with 822 additions and 781 deletions

View file

@ -171,9 +171,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:
@ -181,7 +181,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

File diff suppressed because one or more lines are too long