Skip to content

Commit 02913a1

Browse files
authored
Merge pull request #229 from StochSS/doc-edits
small doc update
2 parents 774335d + 637527e commit 02913a1

36 files changed

+529
-554
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
193 Bytes
Binary file not shown.
-39 Bytes
Binary file not shown.

docs/build/html/_modules/spatialpy/core/boundarycondition.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ <h1>Source code for spatialpy.core.boundarycondition</h1><div class="highlight">
124124
<span class="sd"> - type_id: type (subdomain) of the partciles</span>
125125
<span class="sd"> Targets (one of the following must be set):</span>
126126
<span class="sd"> property: (str), &#39;nu&#39;, &#39;rho&#39;,&#39;v&#39;</span>
127-
<span class="sd"> species: (str) name of a chemical species.</span>
127+
<span class="sd"> species: (str) name of a chemical species. \</span>
128128
<span class="sd"> Must also set deterministic=True/False flag.</span>
129129

130130
<span class="sd"> :param xmin: x-axis coordinate lower bound of **condition**</span>
@@ -152,15 +152,15 @@ <h1>Source code for spatialpy.core.boundarycondition</h1><div class="highlight">
152152
<span class="sd"> and applies to deterministic simulation. **BoundaryCondition not yet implemeneted for Stochastic Species**.</span>
153153
<span class="sd"> :type deterministic: bool</span>
154154

155-
<span class="sd"> :param target: Set **target** to properties, can be &#39;nu&#39; &#39;rho&#39; or &#39;v&#39; or species name</span>
155+
<span class="sd"> :param target: Set **target** to properties, can be &#39;nu&#39; &#39;rho&#39; or &#39;v&#39; or species name \</span>
156156
<span class="sd"> If species name, determinstic must also be set to True/False.</span>
157157
<span class="sd"> :type target: str</span>
158158

159159
<span class="sd"> :param value: Value property will take in region defined by the conditions</span>
160160
<span class="sd"> :type value: float or float[3]</span>
161161

162162
<span class="sd"> :param model: Target model of boundary condition</span>
163-
<span class="sd"> :type model: spatialpy.Model.Model</span>
163+
<span class="sd"> :type model: spatialpy.core.model.Model</span>
164164
<span class="sd"> &quot;&quot;&quot;</span>
165165

166166
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">xmin</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">xmax</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">ymin</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">ymax</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">zmin</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">zmax</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>

docs/build/html/_modules/spatialpy/core/datafunction.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ <h1>Source code for spatialpy.core.datafunction</h1><div class="highlight"><pre>
116116

117117
<span class="sd"> :param name: Name of the Data Function.</span>
118118
<span class="sd"> :type name: str</span>
119+
120+
<span class="sd"> :raises DataFunctionError: If a name is not provided.</span>
119121
<span class="sd"> &quot;&quot;&quot;</span>
120122

121123
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
@@ -128,11 +130,11 @@ <h1>Source code for spatialpy.core.datafunction</h1><div class="highlight"><pre>
128130
<span class="sd">&quot;&quot;&quot;</span>
129131
<span class="sd"> This method must be overridden by the DataFunction subclass.</span>
130132

131-
<span class="sd"> NOTE: The spatial location is evaulated at t=0 and is not</span>
132-
<span class="sd"> reevaluated as the fluid domain moves over time.</span>
133+
<span class="sd"> NOTE: The spatial location is evaulated at t=0 and is not \</span>
134+
<span class="sd"> re-evaluated as the fluid domain moves over time.</span>
133135

134-
<span class="sd"> :param point: The x,y,z position</span>
135-
<span class="sd"> :type point: vector of 3 doubles</span>
136+
<span class="sd"> :param point: The x, y, z position.</span>
137+
<span class="sd"> :type point: float[3]</span>
136138

137139
<span class="sd"> :returns: Value of function at this spatial location.</span>
138140
<span class="sd"> :rtype: float</span>

docs/build/html/_modules/spatialpy/core/domain.html

Lines changed: 43 additions & 60 deletions
Large diffs are not rendered by default.

docs/build/html/_modules/spatialpy/core/geometry.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ <h1>Source code for spatialpy.core.geometry</h1><div class="highlight"><pre>
150150
<div class="viewcode-block" id="GeometryExterior"><a class="viewcode-back" href="../../../classes/spatialpy.core.html#spatialpy.core.geometry.GeometryExterior">[docs]</a><span class="k">class</span> <span class="nc">GeometryExterior</span><span class="p">(</span><span class="n">Geometry</span><span class="p">):</span>
151151
<span class="sd">&quot;&quot;&quot;</span>
152152
<span class="sd"> Mark particles that are on the edge of the domain.</span>
153-
<span class="sd"> only works for meshes that define triangles and tetrahedrons.</span>
153+
<span class="sd"> only works for domains that define triangles and tetrahedrons.</span>
154154
<span class="sd"> &quot;&quot;&quot;</span>
155155
<div class="viewcode-block" id="GeometryExterior.inside"><a class="viewcode-back" href="../../../classes/spatialpy.core.html#spatialpy.core.geometry.GeometryExterior.inside">[docs]</a> <span class="k">def</span> <span class="nf">inside</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">point</span><span class="p">,</span> <span class="n">on_boundary</span><span class="p">):</span>
156156
<span class="sd">&quot;&quot;&quot;</span>
@@ -168,7 +168,7 @@ <h1>Source code for spatialpy.core.geometry</h1><div class="highlight"><pre>
168168
<div class="viewcode-block" id="GeometryInterior"><a class="viewcode-back" href="../../../classes/spatialpy.core.html#spatialpy.core.geometry.GeometryInterior">[docs]</a><span class="k">class</span> <span class="nc">GeometryInterior</span><span class="p">(</span><span class="n">Geometry</span><span class="p">):</span>
169169
<span class="sd">&quot;&quot;&quot;</span>
170170
<span class="sd"> Mark particles that are not on the edge of the domain.</span>
171-
<span class="sd"> Only works for meshes that define triangles and tetrahedrons.</span>
171+
<span class="sd"> Only works for domains that define triangles and tetrahedrons.</span>
172172
<span class="sd"> &quot;&quot;&quot;</span>
173173
<div class="viewcode-block" id="GeometryInterior.inside"><a class="viewcode-back" href="../../../classes/spatialpy.core.html#spatialpy.core.geometry.GeometryInterior.inside">[docs]</a> <span class="k">def</span> <span class="nf">inside</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">point</span><span class="p">,</span> <span class="n">on_boundary</span><span class="p">):</span>
174174
<span class="sd">&quot;&quot;&quot;</span>

docs/build/html/_modules/spatialpy/core/initialcondition.html

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,14 @@ <h1>Source code for spatialpy.core.initialcondition</h1><div class="highlight"><
116116
<span class="sd">&quot;&quot;&quot;</span>
117117
<span class="sd"> Class used to defined initial conditions in SpatialPy.</span>
118118
<span class="sd"> SubClasses must implement the &#39;apply(model)&#39; method, which</span>
119-
<span class="sd"> direction modifies the model.u0[species,voxel] matrix.</span>
119+
<span class="sd"> direction modifies the model.u0[species, voxel] matrix.</span>
120120
<span class="sd"> &quot;&quot;&quot;</span>
121121
<div class="viewcode-block" id="InitialCondition.apply"><a class="viewcode-back" href="../../../classes/spatialpy.core.html#spatialpy.core.initialcondition.InitialCondition.apply">[docs]</a> <span class="k">def</span> <span class="nf">apply</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">model</span><span class="p">):</span>
122122
<span class="sd">&quot;&quot;&quot;</span>
123123
<span class="sd"> Set the initial condition of the species to the count.</span>
124+
125+
<span class="sd"> :param model: Model contianing the target species.</span>
126+
<span class="sd"> :type model: spatialpy.core.model.Model</span>
124127
<span class="sd"> &quot;&quot;&quot;</span>
125128
<span class="k">raise</span> <span class="n">InitialConditionError</span><span class="p">(</span><span class="s2">&quot;spatialpy.InitialCondition subclasses must implement apply()&quot;</span><span class="p">)</span></div></div>
126129

@@ -129,7 +132,7 @@ <h1>Source code for spatialpy.core.initialcondition</h1><div class="highlight"><
129132
<span class="sd"> Class used to defined the place initial condition in SpatialPy.</span>
130133

131134
<span class="sd"> :param species: The species to set the initial condition.</span>
132-
<span class="sd"> :type species: spayialpy.species.Species</span>
135+
<span class="sd"> :type species: spatialpy.core.species.Species</span>
133136

134137
<span class="sd"> :param count: The initial condition for the target species.</span>
135138
<span class="sd"> :type count: int</span>
@@ -151,7 +154,7 @@ <h1>Source code for spatialpy.core.initialcondition</h1><div class="highlight"><
151154
<span class="sd"> Set the initial condition of the species to the count at the location.</span>
152155

153156
<span class="sd"> :param model: Model contianing the target species.</span>
154-
<span class="sd"> :type model: spatialpy.model.Model</span>
157+
<span class="sd"> :type model: spatialpy.core.model.Model</span>
155158
<span class="sd"> &quot;&quot;&quot;</span>
156159
<span class="n">spec_name</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">species</span><span class="o">.</span><span class="n">name</span>
157160
<span class="n">spec_ndx</span> <span class="o">=</span> <span class="kc">None</span>
@@ -167,7 +170,7 @@ <h1>Source code for spatialpy.core.initialcondition</h1><div class="highlight"><
167170
<span class="sd"> Class used to defined the uniform initial condition in SpatialPy.</span>
168171

169172
<span class="sd"> :param species: The species to set the initial condition.</span>
170-
<span class="sd"> :type species: spayialpy.species.Species</span>
173+
<span class="sd"> :type species: spatialpy.core.species.Species</span>
171174

172175
<span class="sd"> :param count: The initial condition for the target species.</span>
173176
<span class="sd"> :type count: int</span>
@@ -194,7 +197,7 @@ <h1>Source code for spatialpy.core.initialcondition</h1><div class="highlight"><
194197
<span class="sd"> Set &#39;count&#39; of &#39;species&#39; in over the list of types (all types if None).</span>
195198

196199
<span class="sd"> :param model: Model contianing the target species.</span>
197-
<span class="sd"> :type model: spatialpy.model.Model</span>
200+
<span class="sd"> :type model: spatialpy.core.model.Model</span>
198201
<span class="sd"> &quot;&quot;&quot;</span>
199202
<span class="n">spec_name</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">species</span><span class="o">.</span><span class="n">name</span>
200203
<span class="n">spec_ndx</span> <span class="o">=</span> <span class="kc">None</span>
@@ -219,7 +222,7 @@ <h1>Source code for spatialpy.core.initialcondition</h1><div class="highlight"><
219222
<span class="sd"> Class used to defined the scatter initial condition in SpatialPy.</span>
220223

221224
<span class="sd"> :param species: The species to set the initial condition.</span>
222-
<span class="sd"> :type species: spayialpy.species.Species</span>
225+
<span class="sd"> :type species: spatialpy.core.species.Species</span>
223226

224227
<span class="sd"> :param count: The initial condition for the target species.</span>
225228
<span class="sd"> :type count: int</span>
@@ -246,7 +249,7 @@ <h1>Source code for spatialpy.core.initialcondition</h1><div class="highlight"><
246249
<span class="sd"> Scatter &#39;count&#39; of &#39;species&#39; randomly over the list of types (all types if None).</span>
247250

248251
<span class="sd"> :param model: Model contianing the target species.</span>
249-
<span class="sd"> :type model: spatialpy.model.Model</span>
252+
<span class="sd"> :type model: spatialpy.core.model.Model</span>
250253
<span class="sd"> &quot;&quot;&quot;</span>
251254
<span class="n">spec_name</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">species</span><span class="o">.</span><span class="n">name</span>
252255
<span class="n">spec_ndx</span> <span class="o">=</span> <span class="kc">None</span>

0 commit comments

Comments
 (0)