Skip to content

Commit

Permalink
Merge branch '2.X_doc_updates' into 2.X
Browse files Browse the repository at this point in the history
  • Loading branch information
bpuchala committed Oct 5, 2023
2 parents 8dac7fc + 86b48f2 commit bb7703b
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions python/libcasm/xtal/prims.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ def cubic(
in the occupants dictionary (i.e. "H2O", or "H2_xx"). The names
are case sensitive, and "Va" is reserved for vacancies.
local_dof : list[xtal.DoFSetBasis]=[]
Continuous DoF allowed on each basis site. No effect if empty.
If not empty, the value local_dof[b] is a list of :class:`~xtal.DoFSetBasis`
objects describing the DoF allowed on the `b`-th basis site.
Continuous DoF allowed on the basis site. No effect if empty.
global_dof : list[xtal.DoFSetBasis]=[]
Global continuous DoF allowed for the entire crystal.
occupants : dict[str, xtal.Occupant]=[]
Expand Down Expand Up @@ -87,9 +85,7 @@ def BCC(
in the occupants dictionary (i.e. "H2O", or "H2_xx"). The names
are case sensitive, and "Va" is reserved for vacancies.
local_dof : list[xtal.DoFSetBasis]=[]
Continuous DoF allowed on each basis site. No effect if empty.
If not empty, the value local_dof[b] is a list of :class:`~xtal.DoFSetBasis`
objects describing the DoF allowed on the `b`-th basis site.
Continuous DoF allowed on the basis site. No effect if empty.
global_dof : list[xtal.DoFSetBasis]=[]
Global continuous DoF allowed for the entire crystal.
occupants : dict[str, xtal.Occupant]=[]
Expand Down Expand Up @@ -147,9 +143,7 @@ def FCC(
in the occupants dictionary (i.e. "H2O", or "H2_xx"). The names
are case sensitive, and "Va" is reserved for vacancies.
local_dof : list[xtal.DoFSetBasis]=[]
Continuous DoF allowed on each basis site. No effect if empty.
If not empty, the value local_dof[b] is a list of :class:`~xtal.DoFSetBasis`
objects describing the DoF allowed on the `b`-th basis site.
Continuous DoF allowed on the basis site. No effect if empty.
global_dof : list[xtal.DoFSetBasis]=[]
Global continuous DoF allowed for the entire crystal.
occupants : dict[str, xtal.Occupant]=[]
Expand Down Expand Up @@ -206,14 +200,12 @@ def HCP(
If not specified, the ideal value is used :math:`c = `a \sqrt{8./3.}`.
occ_dof : list[str] = ["A", "B"]
Labels ('orientation names') of occupants allowed on the basis
site. The values may either be (i) the name of an isotropic
sites. The values may either be (i) the name of an isotropic
atom (i.e. "Mg") or vacancy ("Va"), or (ii) a key
in the occupants dictionary (i.e. "H2O", or "H2_xx"). The names
are case sensitive, and "Va" is reserved for vacancies.
local_dof : list[xtal.DoFSetBasis]=[]
Continuous DoF allowed on each basis site. No effect if empty.
If not empty, the value local_dof[b] is a list of :class:`~xtal.DoFSetBasis`
objects describing the DoF allowed on the `b`-th basis site.
Continuous DoF allowed on the basis sites. No effect if empty.
global_dof : list[xtal.DoFSetBasis]=[]
Global continuous DoF allowed for the entire crystal.
occupants : dict[str, xtal.Occupant]=[]
Expand Down

0 comments on commit bb7703b

Please sign in to comment.