Skip to content

Commit

Permalink
Merge pull request #4 from hmenke/py_fixes_aug16
Browse files Browse the repository at this point in the history
Fix pysyntax error
  • Loading branch information
RudolfWeeber committed Aug 29, 2016
2 parents 7030671 + 5d521dd commit b72301b
Showing 1 changed file with 28 additions and 23 deletions.
51 changes: 28 additions & 23 deletions doc/ug/inter.tex
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,13 @@ \subsection{Tabulated interaction}
\begin{features}
\required{TABULATED}
\end{features}
\object{espressomd.non_bonded_inter[\var{type1},
\var{type2}]}
{tabulated}
{
filename=\arg{filename}
}
\object{
espressomd.non_bonded_inter[\var{type1},\var{type2}]
}{
tabulated
}{
filename=\arg{filename}
}
\end{pysyntax}

This defines an interaction between particles of the types \var{type1} and
Expand Down Expand Up @@ -854,8 +855,8 @@ \subsection{FENE bond}
\var{K} \var{\Delta r_\mathrm{max}} \opt{\var{r_0}}
\end{essyntax}
\begin{pysyntax}
\object{
espressomd.System().bondedInter.add(FeneBond)
\object{
espressomd.System().bondedInter.add(FeneBond)
}{
setParams
}{
Expand Down Expand Up @@ -1014,14 +1015,16 @@ \subsection{Rigid bonds}
\label{sec:rattle}

\begin{pysyntax}
\object{espressomd.interactions}{
RigidBond
}{
r = \arg{float},
}[
ptol = \arg{float},
vtol = \arg{float}
]
\object{
espressomd.interactions
}{
RigidBond
}{
r = \arg{float},
}[
ptol = \arg{float},
vtol = \arg{float}
]
\end{pysyntax}

\begin{essyntax}
Expand Down Expand Up @@ -1065,15 +1068,17 @@ \subsubsection{Python}
\begin{features}
\required{TABULATED}
\end{features}
\object{espressomd.interactions.Tabulated
}
{
type=\arg{str},
filename=\arg{filename}
}
\object{
espressomd.interactions
}{
Tabulated
}{
type=\arg{str},
filename=\arg{filename}
}
\end{pysyntax}

The bonded interaction can be based on a distance, a bond angle or a dihedral angle. This is determined by the \textt{type} argument, which can be one of \texttt{distance}, \texttt{angle} or \texttt{dihedral}. The data is read from th file given by the \texttt{filename} argument.
The bonded interaction can be based on a distance, a bond angle or a dihedral angle. This is determined by the \texttt{type} argument, which can be one of \texttt{distance}, \texttt{angle} or \texttt{dihedral}. The data is read from th file given by the \texttt{filename} argument.

\subsubsection{Calculation of the force and energy}

Expand Down

0 comments on commit b72301b

Please sign in to comment.