Skip to content

Commit

Permalink
minor tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
tkknight committed Jan 12, 2024
1 parent a0d3cb8 commit d168d07
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 18 deletions.
3 changes: 1 addition & 2 deletions benchmarks/asv_delegated_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
# See LICENSE in the root of the repository for full licensing details.
"""ASV plug-in providing an alternative :class:`asv.plugins.conda.Conda` subclass.
ASV plug-in providing an alternative :class:`asv.plugins.conda.Conda`
subclass that manages the Conda environment via custom user scripts.
Manages the Conda environment via custom user scripts.
"""

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/benchmarks/sperf/equality.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class CubeEquality(FileMixin):
r"""Benchmark time and memory costs.
Benchmark time and memory costs of comparing :class:`~iris.cube.Cube`\\ s
with attached :class:`~iris.experimental.ugrid.mesh.Mesh`\\ es.
with attached :class:`~iris.experimental.ugrid.mesh.Mesh`\\ es.
Uses :class:`FileMixin` as the realistic case will be comparing
:class:`~iris.cube.Cube`\\ s that have been loaded from file.
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/_concatenate.py
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ class _ProtoCube:
"""Framework for concatenating multiple source-cubes over one common dimension."""

def __init__(self, cube):
"""Create a new _ProtoCube and record the cube as a source-cube.
"""Create a new _ProtoCube and record the cube as a source-cube.
Create a new _ProtoCube from the given cube and record the cube
as a source-cube.
Expand Down
4 changes: 4 additions & 0 deletions lib/iris/_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,10 @@ def _build_separable_group(
):
"""Update the space with the first separable consistent group.
Update the space with the first separable consistent group that
satisfies a valid functional relationship with all other candidate
dimensions in the group.
For example, the group ABCD and separable consistent group CD,
if A = f(C, D) and B = f(C, D) then update the space with
"A: (C, D), B: (C, D), C: None, D: None". Where "A: (C, D)" means
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/coords.py
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ def _get_2d_coord_bound_grid(bounds):


class Cell(namedtuple("Cell", ["point", "bound"])):
"""An coordinate cell containing a single point, or point and bounds.
"""A coordinate cell containing a single point, or point and bounds.
An immutable representation of a single cell of a coordinate, including the
sample point and/or boundary position.
Expand Down
8 changes: 1 addition & 7 deletions lib/iris/fileformats/_structured_array_identification.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,9 @@
# See LICENSE in the root of the repository for full licensing details.
r"""Identification of multi-dimensional structure in a flat sequence of homogeneous objects.
One application of this is to efficiently identify a higher dimensional
structure from a sorted sequence of PPField instances; for an example, given
a list of 12 PPFields, identification that there are 3 unique "time" values
and 4 unique "height" values where time and height are linearly independent
means that we could construct a resulting cube with a shape of
``(3, 4) + <shape of a single field>``.
The purpose of this module is to provide utilities for the identification
of multi-dimensional structure in a flat sequence of homogeneous objects.
One application of this is to efficiently identify a higher dimensional
structure from a sorted sequence of PPField instances; for an example, given
a list of 12 PPFields, identification that there are 3 unique "time" values
Expand Down
5 changes: 3 additions & 2 deletions lib/iris/fileformats/pp.py
Original file line number Diff line number Diff line change
Expand Up @@ -1716,8 +1716,9 @@ def _create_field_data(field, data_shape, land_mask_field=None):
"""Modify a field's ``_data`` attribute.
Modify a field's ``_data`` attribute either by:
* converting a 'deferred array bytes' tuple into a lazy array,
* converting LoadedArrayBytes into an actual numpy array.
* converting a 'deferred array bytes' tuple into a lazy array,
* converting LoadedArrayBytes into an actual numpy array.
If 'land_mask_field' is passed (not None), then it contains the associated
landmask, which is also a field : Its data array is used as a template for
Expand Down
4 changes: 0 additions & 4 deletions lib/iris/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -1736,10 +1736,6 @@ def _meshgrid(*xi, **kwargs):
associated input 1D coordinate. This is not the case prior to numpy v1.13,
where the output dtype is cast up to its highest resolution, regardlessly.
@numpy v1.13, the dtype of each output n-D coordinate is the same as its
associated input 1D coordinate. This is not the case prior to numpy v1.13,
where the output dtype is cast up to its highest resolution, regardlessly.
Reference: https://github.com/numpy/numpy/pull/5302
"""
Expand Down

0 comments on commit d168d07

Please sign in to comment.