diff --git a/docs/src/_static/icon_api.svg b/docs/src/_static/icon_api.svg index 841b105973..bf2f8d67bb 100644 --- a/docs/src/_static/icon_api.svg +++ b/docs/src/_static/icon_api.svg @@ -13,14 +13,15 @@ id="Capa_1" x="0px" y="0px" - viewBox="0 0 511 511" - style="enable-background:new 0 0 511 511;" + viewBox="0 0 508 511" xml:space="preserve" - sodipodi:docname="icon_api2.svg" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)">image/svg+xml + inkscape:current-layer="g20" + inkscape:pagecheckerboard="true" /> + style="fill:#1b8fb7;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#1b8fb7;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#1b8fb7;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#1b8fb7;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#1b8fb7;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#cadc6d;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#cadc6d;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#cadc6d;fill-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#cadc6d;fill-opacity:1" + inkscape:connector-curvature="0" /> 23, 28-19,-21101525-5-15-20-30xyCoordinate ArraysxyCoordinate Arrays23, 28-19, -21xyBounds Arraysderive point locationsassign data using dimensional indices,position in array == relative spatial positionderive area locations & shapesPoint DataArea DataData Array(bounded coordsalways have points too)my_variable* x+yare not lons+lats, just a demonstration! \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 23, 28- +1 +9, +- +21 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1015 +25 +- + + + + + +5- + + + + + +15- + + + + + +20- + + + + + +30 + + + + + + + + + + + x + + yCoordinate Arrays + + + + + + + + + + + + x + + yCoordinate Arrays +23, 28 +- +1 +9, +- +21 + + + + + + + + + + + + + + + + + + + + + + + + + + x + + yBounds Arrays + + + + + + + + derive point locationsassign data using +dimensional indices, +position in array == relative +spatial position +derive area +locations & shapes +Point Data + + + Area Data + + Data Array(bounded +coords +always have +points too) + + + my_variable + + + + + + + + + + + + + + + * x+y +are not +lons+lats +, just a demonstration! + + + + diff --git a/docs/src/further_topics/ugrid/images/data_ugrid_mesh.svg b/docs/src/further_topics/ugrid/images/data_ugrid_mesh.svg index ab7302346b..c2b822fbcf 100644 --- a/docs/src/further_topics/ugrid/images/data_ugrid_mesh.svg +++ b/docs/src/further_topics/ugrid/images/data_ugrid_mesh.svg @@ -1 +1,2273 @@ -5, 7, 8, 14`xy1212`node_coordinates`every node has its own x + y coordinatesderive node locations1515xy`node_coordinates`[5][7][8][14]construct faces by connecting nodesderive ‘corner’ node locationsassign data using 1D indexing,position in array unrelated to spatial positionmatch indices with facesmatch indices with nodesNode DataFace Data12Data Arraymy_variable12 ×4`face_node_connectivity`face_nodes \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5, 7, 8, 14 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ` + + + + x + + y12 +12 +` +node_coordinates +` +every node +has its own +x + y +coordinates + + + derive node locations + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1515 + + + x + + y` +node_coordinates +` +[5] +[7] +[8] +[14] +construct faces +by connecting +nodes +derive ‘corner’ +node locations + + + + + + + + assign data using 1D indexing, +position in array +unrelated to spatial +position +match indices +with faces +match indices +with nodes +Node Data + + + Face Data + + + + + + + + + + + + + + + 12Data +Array + + + my_variable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 × +4 +` +face_node_connectivity +` + + + face_nodes + + + + + + + + + + + + + + + + + diff --git a/docs/src/further_topics/ugrid/images/iris-esmf-regrid.svg b/docs/src/further_topics/ugrid/images/iris-esmf-regrid.svg index e70a9386a7..93e35cb21d 100644 --- a/docs/src/further_topics/ugrid/images/iris-esmf-regrid.svg +++ b/docs/src/further_topics/ugrid/images/iris-esmf-regrid.svg @@ -10,12 +10,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="89.186264mm" - height="35.112755mm" - viewBox="0 0 89.186264 35.112755" + width="99.186264mm" + height="45.112755mm" + viewBox="0 0 99.186261 45.112755" version="1.1" id="svg1444" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="iris-esmf-regrid.svg"> @@ -27,20 +27,20 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" - inkscape:cx="167.70776" - inkscape:cy="25.61879" + inkscape:cx="125.49117" + inkscape:cy="44.51643" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="983" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" /> + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + inkscape:window-width="1718" + inkscape:window-height="1368" + inkscape:window-x="3633" + inkscape:window-y="0" + inkscape:window-maximized="0" /> @@ -57,7 +57,7 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-14.306365,-64.275871)"> + transform="translate(-9.306365,-59.275871)"> `edge_node_connectivity`12 ×2 \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `edge_node_connectivity +` +12 +× +2 + + + diff --git a/docs/src/further_topics/ugrid/images/ugrid_element_centres.svg b/docs/src/further_topics/ugrid/images/ugrid_element_centres.svg index 13b885d600..94ab6ec585 100644 --- a/docs/src/further_topics/ugrid/images/ugrid_element_centres.svg +++ b/docs/src/further_topics/ugrid/images/ugrid_element_centres.svg @@ -1 +1,1276 @@ -`face_node_connectivity`xy`node_coordinates`xy`face_coordinates`151512 ×41212`face_coordinates``node_coordinates` \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `face_node_connectivity +` + + + x + + y` +node_coordinates +` + + + x + + y` +face_coordinates +` +15 +15 +12 + +×4 +12 +12 + + + + `face_coordinates +` +` +nod + +e_ +coordinates +` + + + + diff --git a/docs/src/further_topics/ugrid/images/ugrid_node_independence.svg b/docs/src/further_topics/ugrid/images/ugrid_node_independence.svg index ba72c42ffa..d63000da92 100644 --- a/docs/src/further_topics/ugrid/images/ugrid_node_independence.svg +++ b/docs/src/further_topics/ugrid/images/ugrid_node_independence.svg @@ -1 +1,865 @@ -` \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ` + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/src/further_topics/ugrid/images/ugrid_variable_faces.svg b/docs/src/further_topics/ugrid/images/ugrid_variable_faces.svg index 378978abc3..91223e269a 100644 --- a/docs/src/further_topics/ugrid/images/ugrid_variable_faces.svg +++ b/docs/src/further_topics/ugrid/images/ugrid_variable_faces.svg @@ -1 +1,943 @@ -`face_node_connectivity`12 ×6 \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `face_node_connectivity +` +12 +× +6 + + + diff --git a/docs/src/further_topics/ugrid/operations.rst b/docs/src/further_topics/ugrid/operations.rst index 29a05ec044..f0638800fa 100644 --- a/docs/src/further_topics/ugrid/operations.rst +++ b/docs/src/further_topics/ugrid/operations.rst @@ -53,8 +53,8 @@ structured formats and non-UGRID mesh formats. The objects created in this example will be used where possible in the subsequent example operations on this page. -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -146,8 +146,8 @@ Creating a :class:`~iris.cube.Cube` is unchanged; the :class:`~iris.experimental.ugrid.Mesh` is linked via a :class:`~iris.experimental.ugrid.MeshCoord` (see :ref:`ugrid MeshCoords`): -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -208,8 +208,8 @@ The Iris saving process automatically detects if the :class:`~iris.cube.Cube` has an associated :class:`~iris.experimental.ugrid.Mesh` and automatically saves the file in a UGRID-conformant format: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -284,8 +284,8 @@ The :func:`iris.experimental.ugrid.save_mesh` function allows :class:`~iris.experimental.ugrid.Mesh`\es to be saved to file without associated :class:`~iris.cube.Cube`\s: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -356,8 +356,8 @@ loading a file remains **optional**. To load UGRID data from a file into the Iris mesh data model, use the :const:`iris.experimental.ugrid.PARSE_UGRID_ON_LOAD` context manager: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -377,8 +377,8 @@ All the existing loading functionality still operates on UGRID-compliant data - :class:`~iris.Constraint`\s, callbacks, :func:`~iris.load_cube` etcetera: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -421,8 +421,8 @@ The :func:`iris.experimental.ugrid.load_mesh` and :class:`~iris.experimental.ugrid.Mesh`\es to be loaded from a file without creating any associated :class:`~iris.cube.Cube`\s: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -476,8 +476,8 @@ be added to API in the near future. This first example uses GeoVista to plot the ``face_cube`` that we created earlier: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python @@ -547,8 +547,8 @@ earlier: Here's another example using a global cubed-sphere data set: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python @@ -623,8 +623,8 @@ therefore set to return an :class:`~iris.coords.AuxCoord` instead - breaking the link between :class:`~iris.cube.Cube` and :class:`~iris.experimental.ugrid.Mesh`: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. doctest:: ugrid_operations @@ -667,8 +667,8 @@ mesh, we then reconstruct a :class:`~iris.experimental.ugrid.Mesh` from the .. Not using doctest here as want to keep GeoVista as optional dependency. -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python @@ -795,8 +795,8 @@ with the .. Not using doctest here as want to keep iris-esmf-regrid as optional dependency. -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python @@ -892,8 +892,8 @@ Since calling a regridder is usually a lot faster than initialising, reusing regridders can save a lot of time. We can demonstrate the reuse of the previously initialised regridder: -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python diff --git a/docs/src/further_topics/ugrid/other_meshes.rst b/docs/src/further_topics/ugrid/other_meshes.rst index 090d9b4f73..2fcbeda0d0 100644 --- a/docs/src/further_topics/ugrid/other_meshes.rst +++ b/docs/src/further_topics/ugrid/other_meshes.rst @@ -27,8 +27,8 @@ To represent the Voronoi Polygons as faces, the corner coordinates will be used as the **nodes** when creating the Iris :class:`~iris.experimental.ugrid.mesh.Mesh`. -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python @@ -116,8 +116,8 @@ as the **nodes** when creating the Iris :class:`~iris.experimental.ugrid.mesh.Mesh`. -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python @@ -231,6 +231,7 @@ as the **nodes** when creating the Iris .. figure:: images/orca_grid.png :width: 300 :alt: Plot of ORCA-gridded data from NEMO. + :class: dark-light NEMO can use various grids, but is frequently used with ORCA type grids. ORCA grids store global data in 2-dimensional ny * nx arrays. All cells are @@ -255,8 +256,8 @@ To make an unstructured cube, the data must be 'flattened' to convert the given dimensions into a single mesh dimension. Since Iris cubes don't support a "reshape" or "flatten" operations, we create a new cube from the flattened data. -.. dropdown:: :octicon:`code` - :color: light +.. dropdown:: Code + :icon: code .. code-block:: python diff --git a/docs/src/index.rst b/docs/src/index.rst index 1ef6d9b12f..21971c2322 100644 --- a/docs/src/index.rst +++ b/docs/src/index.rst @@ -20,7 +20,7 @@ For more information see :ref:`why_iris`. .. grid-item-card:: :text-align: center :img-top: _static/icon_shuttle.svg - :class-img-top: w-50 m-auto px-1 py-2 + :class-img-top: w-50 m-auto px-1 py-2 dark-light :shadow: lg Information on Iris, how to install and a gallery of examples that @@ -38,7 +38,7 @@ For more information see :ref:`why_iris`. .. grid-item-card:: :text-align: center :img-top: _static/icon_instructions.svg - :class-img-top: w-50 m-auto px-1 py-2 + :class-img-top: w-50 m-auto px-1 py-2 dark-light :shadow: lg Learn how to use Iris, including loading, navigating, saving, @@ -56,7 +56,7 @@ For more information see :ref:`why_iris`. .. grid-item-card:: :text-align: center :img-top: _static/icon_development.svg - :class-img-top: w-50 m-auto px-1 py-2 + :class-img-top: w-50 m-auto px-1 py-2 dark-light :shadow: lg Information on how you can contribute to Iris as a developer. @@ -76,7 +76,7 @@ For more information see :ref:`why_iris`. .. grid-item-card:: :text-align: center :img-top: _static/icon_api.svg - :class-img-top: w-50 m-auto px-1 py-2 + :class-img-top: w-50 m-auto px-1 py-2 dark-light :shadow: lg Browse full Iris functionality by module. @@ -93,7 +93,7 @@ For more information see :ref:`why_iris`. .. grid-item-card:: :text-align: center :img-top: _static/icon_new_product.svg - :class-img-top: w-50 m-auto px-1 py-2 + :class-img-top: w-50 m-auto px-1 py-2 dark-light :shadow: lg Find out what has recently changed in Iris. @@ -110,7 +110,7 @@ For more information see :ref:`why_iris`. .. grid-item-card:: :text-align: center :img-top: _static/icon_thumb.png - :class-img-top: w-50 m-auto px-1 py-2 + :class-img-top: w-50 m-auto px-1 py-2 dark-light :shadow: lg Raise the profile of issues by voting on them. diff --git a/docs/src/userguide/concat.png b/docs/src/userguide/concat.png deleted file mode 100644 index eb3d84046e..0000000000 Binary files a/docs/src/userguide/concat.png and /dev/null differ diff --git a/docs/src/userguide/concat.svg b/docs/src/userguide/concat.svg index 0234b37bfa..f32fc0030b 100644 --- a/docs/src/userguide/concat.svg +++ b/docs/src/userguide/concat.svg @@ -9,11 +9,11 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="750" - height="250" + width="772.70679" + height="285.20804" id="svg2834" version="1.1" - inkscape:version="0.47 r22583" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="concat.svg" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -98,7 +98,8 @@ id="path3666" style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="scale(-0.8)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,10,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + borderlayer="true" + fit-margin-top="20" + fit-margin-left="20" + fit-margin-bottom="20" + fit-margin-right="20"> + snapvisiblegridlinesonly="true" + originx="16.413907" + originy="19.718628" /> @@ -443,7 +456,7 @@ image/svg+xml - + @@ -451,10 +464,10 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" - transform="translate(-34.602633,-28.380468)"> + transform="translate(-18.188725,-12.891066)"> x + style="font-size:18.91116524px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">x @@ -471,19 +484,22 @@ inkscape:path-effect="#path-effect3640" id="path3638" d="M 60,420 320,260" - style="fill:none;stroke:#000000;stroke-width:1.42801106px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" /> + style="fill:none;stroke:#000000;stroke-width:1.42801106px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 V 50" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 H 480" + style="fill:none;stroke:#000000;stroke-width:1.16397536px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:1.42801106px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 V 50" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 H 480" + style="fill:none;stroke:#000000;stroke-width:1.16397536px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 60.562629,212.61178 H 54.65289" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 60.562629,165.33386 c -5.909739,0 -5.909739,0 -5.909739,0" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 60.562629,118.05595 c -5.909739,0 -5.909739,0 -5.909739,0" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 458.87904,212.61178 H 452.9693" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 458.87904,165.33386 H 452.9693" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 458.87904,118.05595 H 452.9693" + inkscape:connector-curvature="0" /> 0 + style="font-size:18.91116524px;line-height:1.25">0 + inkscape:original-d="m 60.562629,259.88968 c -5.909739,0 -5.909739,0 -5.909739,0 v 0" + inkscape:connector-curvature="0" /> 1 + style="font-size:18.91116524px;line-height:1.25">1 2 + style="font-size:18.91116524px;line-height:1.25">2 3 + style="font-size:18.91116524px;line-height:1.25">3 0 + style="font-size:18.91116524px;line-height:1.25">0 1 + style="font-size:18.91116524px;line-height:1.25">1 2 + style="font-size:18.91116524px;line-height:1.25">2 3 + style="font-size:18.91116524px;line-height:1.25">3 + inkscape:original-d="M 458.87904,259.88968 H 452.9693" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 480.51092,212.61178 600.71279,141.69491 H 770.08815 Z" + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 480.51092,118.05595 600.71279,47.139078 H 770.08815 L 677.2049,118.05595 Z" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 481.40069,118.38047 V 212.9363 H 664.60263 V 118.38047 Z" + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 664.60263,212.9363 770.08815,141.69491 V 47.139078 L 664.60263,118.38047 Z" + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> t + style="font-size:18.91116524px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">t y + style="font-size:18.91116524px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">y t + style="font-size:18.91116524px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">t y + style="font-size:18.91116524px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">y + inkscape:original-d="m 386.84486,142.01943 v 11.81948 h 23.63896 v 5.90973 l 17.72922,-11.81947 -17.72922,-11.81948 v 5.90974 z" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 144.54556,118.38048 262.74034,41.553863 h -59.09738" + sodipodi:nodetypes="ccc" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 262.74034,212.9363 V 118.38047 L 380.93512,41.553863 v 94.555827 z" + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 86.176265,213.75562 85.448171,118.38048 203.64296,41.553863" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 262.74034,41.553863 H 380.93512" + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 84.558085,118.283 c 0.890086,0.0975 178.182255,0.0975 178.182255,0.0975 v 94.55582 l -176.564075,0.81932 v 0" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 144.54556,118.38048 V 212.9363" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 203.76402,118.82239 -0.12106,94.11391" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 85.636872,117.7436 -0.188701,95.1927" + inkscape:connector-curvature="0" /> diff --git a/docs/src/userguide/cube_diagram.dia b/docs/src/userguide/cube_diagram.dia deleted file mode 100644 index 8edc611782..0000000000 Binary files a/docs/src/userguide/cube_diagram.dia and /dev/null differ diff --git a/docs/src/userguide/cube_diagram.png b/docs/src/userguide/cube_diagram.png deleted file mode 100644 index 80f5328c3b..0000000000 Binary files a/docs/src/userguide/cube_diagram.png and /dev/null differ diff --git a/docs/src/userguide/iris_cubes.rst b/docs/src/userguide/iris_cubes.rst index 3aa299a23c..267f97b0fc 100644 --- a/docs/src/userguide/iris_cubes.rst +++ b/docs/src/userguide/iris_cubes.rst @@ -102,7 +102,7 @@ Suppose we have some gridded data which has 24 air temperature readings (in Kelvin) which is located at 4 different longitudes, 2 different latitudes and 3 different heights. Our data array can be represented pictorially: -.. image:: multi_array.png +.. image:: multi_array.svg Where dimensions 0, 1, and 2 have lengths 3, 2 and 4 respectively. @@ -132,7 +132,7 @@ The Iris cube to represent this data would consist of: Pictorially the cube has taken on more information than a simple array: -.. image:: multi_array_to_cube.png +.. image:: multi_array_to_cube.svg Additionally further information may be optionally attached to the cube. diff --git a/docs/src/userguide/merge.png b/docs/src/userguide/merge.png deleted file mode 100644 index cafaa370da..0000000000 Binary files a/docs/src/userguide/merge.png and /dev/null differ diff --git a/docs/src/userguide/merge.svg b/docs/src/userguide/merge.svg index 9326bc332b..0f0d37a1ca 100644 --- a/docs/src/userguide/merge.svg +++ b/docs/src/userguide/merge.svg @@ -9,11 +9,11 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="750" - height="250" + width="734.55884" + height="280.94952" id="svg2834" version="1.1" - inkscape:version="0.47 r22583" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="merge.svg" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -38,7 +38,8 @@ id="path3666" style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="scale(-0.8)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,10,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + borderlayer="true" + fit-margin-top="20" + fit-margin-left="20" + fit-margin-bottom="20" + fit-margin-right="20"> + snapvisiblegridlinesonly="true" + originx="-4.2538044" + originy="11.570523" /> @@ -394,7 +407,7 @@ image/svg+xml - + @@ -402,10 +415,10 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" - transform="translate(-22.109375,-210.54913)"> + transform="translate(-26.363179,-191.17014)"> y + style="font-size:17.92656898px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">y @@ -422,19 +435,22 @@ inkscape:path-effect="#path-effect3640" id="path3638" d="M 60,420 320,260" - style="fill:none;stroke:#000000;stroke-width:1.42801106px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" /> + style="fill:none;stroke:#000000;stroke-width:1.42801106px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 V 50" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 H 480" + style="fill:none;stroke:#000000;stroke-width:1.16397536px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:1.42801106px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 V 50" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + d="M 60,420 H 480" + style="fill:none;stroke:#000000;stroke-width:1.16397536px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 67.5722,390.18197 H 61.970147" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 67.5722,345.36554 c -5.602053,0 -5.602053,0 -5.602053,0" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 67.5722,300.54913 c -5.602053,0 -5.602053,0 -5.602053,0" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 445.15053,390.18197 h -5.60205" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 445.15053,345.36554 h -5.60205" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 445.15053,300.54913 h -5.60205" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 88.077823,390.18196 202.02147,322.95733 H 362.5784 l -88.04735,67.22463 z" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 203.20315,211.22392 c 0,134.44926 0,134.44926 0,134.44926" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 88.394922,345.36553 202.33857,278.1409 H 362.8955 l -88.04735,67.22463 z" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 88.077823,300.54913 202.02147,233.3245 H 362.5784 l -88.04735,67.22463 z" + inkscape:connector-curvature="0" /> 0 + style="font-size:17.92656898px;line-height:1.25">0 + inkscape:original-d="m 67.5722,434.99838 c -5.602053,0 -5.602053,0 -5.602053,0 v 0" + inkscape:connector-curvature="0" /> 1 + style="font-size:17.92656898px;line-height:1.25">1 2 + style="font-size:17.92656898px;line-height:1.25">2 3 + style="font-size:17.92656898px;line-height:1.25">3 0 + style="font-size:17.92656898px;line-height:1.25">0 1 + style="font-size:17.92656898px;line-height:1.25">1 2 + style="font-size:17.92656898px;line-height:1.25">2 3 + style="font-size:17.92656898px;line-height:1.25">3 + inkscape:original-d="m 89.980408,278.14092 c 0,134.44926 0,134.44926 0,134.44926" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 274.84815,278.14092 c 0,134.44926 0,134.44926 0,134.44926" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 445.15053,434.99838 h -5.60205" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 465.65616,390.18197 113.94362,-67.22463 h 160.55695 l -88.04736,67.22463 H 465.65615 Z" + inkscape:connector-curvature="0" /> + inkscape:original-d="M 465.65616,300.54913 579.59978,233.3245 h 160.55695 l -88.04736,67.22463 H 465.65615 Z" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 465.65617,300.54913 v 89.63284 H 652.10938 V 300.54913 H 465.65616 Z" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 652.10939,390.18197 88.04735,-67.22463 V 233.3245 l -88.04736,67.22463 v 89.63284 z" + inkscape:connector-curvature="0" /> + inkscape:original-d="m 363.42185,211.17014 c 0,134.44926 0,134.44926 0,134.44926" + inkscape:connector-curvature="0" /> x + style="font-size:17.92656898px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">x z + style="font-size:17.92656898px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">z x + style="font-size:17.92656898px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">x z + style="font-size:17.92656898px;line-height:1.25;font-family:'URW Palladio L';-inkscape-font-specification:'URW Palladio L'">z + inkscape:original-d="m 376.86678,323.26496 v 11.20411 h 22.4082 v 5.60205 l 16.80616,-11.2041 -16.80616,-11.20411 v 5.60205 z" + inkscape:connector-curvature="0" /> diff --git a/docs/src/userguide/merge_and_concat.png b/docs/src/userguide/merge_and_concat.png deleted file mode 100644 index 48238287b4..0000000000 Binary files a/docs/src/userguide/merge_and_concat.png and /dev/null differ diff --git a/docs/src/userguide/merge_and_concat.rst b/docs/src/userguide/merge_and_concat.rst index b521d49a59..d754e08cc1 100644 --- a/docs/src/userguide/merge_and_concat.rst +++ b/docs/src/userguide/merge_and_concat.rst @@ -16,7 +16,7 @@ issues from occurring. Both ``merge`` and ``concatenate`` take multiple cubes as input and result in fewer cubes as output. The following diagram illustrates the two processes: -.. image:: merge_and_concat.png +.. image:: merge_and_concat.svg :alt: Pictographic of merge and concatenation. :align: center @@ -128,7 +128,7 @@ make a new ``z`` dimension coordinate: The following diagram illustrates what has taken place in this example: -.. image:: merge.png +.. image:: merge.svg :alt: Pictographic of merge. :align: center @@ -294,7 +294,7 @@ cubes to form a new cube with an extended ``t`` coordinate: The following diagram illustrates what has taken place in this example: -.. image:: concat.png +.. image:: concat.svg :alt: Pictographic of concatenate. :align: center diff --git a/docs/src/userguide/multi_array.png b/docs/src/userguide/multi_array.png deleted file mode 100644 index 54a2688d2a..0000000000 Binary files a/docs/src/userguide/multi_array.png and /dev/null differ diff --git a/docs/src/userguide/multi_array.svg b/docs/src/userguide/multi_array.svg index d28f6d71d6..38ba58744f 100644 --- a/docs/src/userguide/multi_array.svg +++ b/docs/src/userguide/multi_array.svg @@ -13,244 +13,250 @@ height="300" id="svg2" version="1.1" - inkscape:version="0.47 r22583" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="multi_array.svg" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + viewBox="0 0 470 320"> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,4.8,0)" + inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,-4.8,0)" + inkscape:connector-curvature="0" /> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(1.1,0,0,1.1,1.1,0)" + inkscape:connector-curvature="0" /> + style="overflow:visible"> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + style="overflow:visible"> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + inkscape:connector-curvature="0" /> + style="color-interpolation-filters:sRGB"> @@ -322,17 +328,24 @@ + + transform="translate(-22.275317,-306.43968)" + style="display:inline"> + style="opacity:1;fill:none;stroke:#000000;stroke-width:1.23286104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + d="M 227.83333,331.9969 H 460.74875" + id="path2967" + inkscape:connector-curvature="0" /> 2 + style="font-size:20px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">2 1 + style="font-size:20px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">1 0 + style="font-size:20px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">0 + d="m 35.115947,477.76237 v 104.4593" + style="fill:none;stroke:#000000;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#EmptyTriangleInL)" + inkscape:connector-curvature="0" /> + id="path2965-9-1" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:1.90165818;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL)" + d="M 34.20344,581.46304 H 134.30678" + id="path2967-5" + inkscape:connector-curvature="0" /> + d="m 276.64236,373.53613 v 187.701" + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="M 218.10752,373.53612 V 561.23713" + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="M 339.27837,373.53612 V 561.23713" + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="M 164.28582,434.95011 H 397.20125" + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="M 164.28582,500.94163 H 397.20124" + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="M 429.87688,350.79329 V 538.4943" + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="M 197.00473,350.14458 H 429.92015" + style="fill:#b3b3b3;stroke:#999999;stroke-width:2.03630161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + id="path2965-9" + inkscape:connector-curvature="0" /> + id="path2965-9-3" + inkscape:connector-curvature="0" /> + id="path2965-9-3-1" + inkscape:connector-curvature="0" /> + style="opacity:1;fill:none;stroke:#000000;stroke-width:1.40908241;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + d="M 460.83518,331.99456 V 519.69557" + id="path3940" + inkscape:connector-curvature="0" /> diff --git a/docs/src/userguide/multi_array_to_cube.png b/docs/src/userguide/multi_array_to_cube.png deleted file mode 100644 index 1144ee6715..0000000000 Binary files a/docs/src/userguide/multi_array_to_cube.png and /dev/null differ diff --git a/docs/src/userguide/multi_array_to_cube.svg b/docs/src/userguide/multi_array_to_cube.svg index a2fc2f5e26..8b0cc529dd 100644 --- a/docs/src/userguide/multi_array_to_cube.svg +++ b/docs/src/userguide/multi_array_to_cube.svg @@ -9,11 +9,11 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="600" - height="400" + width="588.37256" + height="379.43076" id="svg2" version="1.1" - inkscape:version="0.47 r22583" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="multi_array_to_cube.svg" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -28,9 +28,10 @@ style="overflow:visible"> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,4.8,0)" + inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,-4.8,0)" + inkscape:connector-curvature="0" /> + transform="matrix(1.1,0,0,1.1,1.1,0)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + inkscape:connector-curvature="0" /> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,-4.8,0)" + inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,-4.8,0)" + inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,-4.8,0)" + inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,4.8,0)" + inkscape:connector-curvature="0" /> + inkscape:guide-bbox="true" + borderlayer="false" + inkscape:pagecheckerboard="true" + showborder="true" + fit-margin-top="10" + fit-margin-left="10" + fit-margin-bottom="10" + fit-margin-right="10" /> @@ -1012,86 +1028,108 @@ + + transform="translate(-24.340681,-213.92624)"> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + d="M 279.33268,257.02949 H 512.2481" + id="path2967" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330)" + d="m 334.56237,297.14191 v 187.701" + id="path3940-3" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330)" + d="M 276.02753,297.1419 V 484.84291" + id="path3940-2" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330)" + d="M 397.19838,297.1419 V 484.84291" + id="path3940-38" + inkscape:connector-curvature="0" /> + id="path2965-9-3-8" + inkscape:connector-curvature="0" /> + id="path2965-9-3-7" + inkscape:connector-curvature="0" /> + id="path2965-9-3-9" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330)" + d="M 222.20583,358.55589 H 455.12126" + id="path2967-1" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330)" + d="M 222.20583,424.54741 H 455.12125" + id="path2967-4" + inkscape:connector-curvature="0" /> + id="path2965-9-3-0" + inkscape:connector-curvature="0" /> + id="path2965-9-3-91" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330)" + d="M 487.79689,274.39907 V 462.10008" + id="path3940-6" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330)" + d="M 254.92474,273.75036 H 487.84016" + id="path2967-8" + inkscape:connector-curvature="0" /> + id="path2965-9" + inkscape:connector-curvature="0" /> + id="path2965-9-3" + inkscape:connector-curvature="0" /> + id="path2965-9-3-1" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + d="M 512.33453,257.02715 V 444.72816" + id="path3940" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:4.65429401;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330-5-0)" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:4.86589146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330-5-0)" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:4.77046061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330-5-0)" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + d="M 180.66394,434.79892 H 414.8872 m 0.13354,0.19234 23.6025,-16.61686" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + id="path2967-45-1" + inkscape:connector-curvature="0" /> + d="M 205.47014,418.47977 H 438.38556" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:4.46560764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330-2)" + inkscape:connector-curvature="0" /> + style="fill:#b3b3b3;stroke:#999999;stroke-width:4.46560764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330-2)" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + d="M 607.67297,166.52524 V 354.22625" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + d="M 632.44481,148.8327 V 336.23717" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> 2 + style="font-size:20px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">2 + style="fill:none;stroke:#000000;stroke-width:0.72307718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL)" + d="m 218.65167,564.61456 h 36.19122" + id="path2967-5-8" + inkscape:connector-curvature="0" /> -180 90 + style="font-size:16px;line-height:1.25">90 0 + style="font-size:16px;line-height:1.25">0 90 + style="font-size:16px;line-height:1.25">90 Longitude (degrees) + style="font-size:16px;line-height:1.25">Longitude (degrees) Height (meters) + style="font-size:16px;line-height:1.25">Height (meters) + d="m 654.20331,319.24177 h 58.79787" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + d="M 454.91905,335.96264 H 687.83447" + style="fill:#b3b3b3;stroke:#999999;stroke-width:8.0860281;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4330-0)" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> + d="m 597.7085,358.87212 h 58.79787" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" + inkscape:connector-curvature="0" /> Latitude (degrees) + style="font-size:16px;line-height:1.25">Latitude (degrees) @@ -1281,9 +1337,9 @@ id="text4028-7" y="378.68555" x="17.929327" - style="font-size:22.62892342px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve"> + style="fill:none;stroke:#000000;stroke-width:0.99685019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL)" + inkscape:connector-curvature="0" /> -45 + style="font-size:16px;line-height:1.25">-45 45 + style="font-size:16px;line-height:1.25">45 + d="m 588.51962,415.76898 v 48.81029" + style="fill:none;stroke:#000000;stroke-width:0.93453234;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#EmptyTriangleInL)" + inkscape:connector-curvature="0" /> 0 Air temperature (kelvin) + style="font-size:20px;line-height:1.25">Air temperature (kelvin) 2 + style="font-size:16px;line-height:1.25">2 10 + style="font-size:16px;line-height:1.25">10 25 + style="font-size:16px;line-height:1.25">25 diff --git a/docs/src/voted_issues.rst b/docs/src/voted_issues.rst index 7d983448b9..0c99638bbd 100644 --- a/docs/src/voted_issues.rst +++ b/docs/src/voted_issues.rst @@ -20,7 +20,7 @@ the below table. .. raw:: html - +
@@ -42,7 +42,8 @@ the below table. "ajax": 'https://raw.githubusercontent.com/scitools/voted_issues/main/voted-issues.json', "lengthMenu": [10, 25, 50, 100], "pageLength": 10, - "order": [[ 0, "desc" ]] + "order": [[ 0, "desc" ]], + "bJQueryUI": true, } ); } ); diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst index b78087b8fb..651f25e95e 100644 --- a/docs/src/whatsnew/latest.rst +++ b/docs/src/whatsnew/latest.rst @@ -66,7 +66,9 @@ This document explains the changes made to Iris for this release 📚 Documentation ================ -#. N/A +#. `@tkknight`_ prepared the documentation for dark mode and enable the option + to use it. By default the theme will be based on the users system settings, + defaulting to ``light`` if no system setting is found. (:pull:`5299`) 💼 Internal
👍