Skip to content

Commit

Permalink
Merge pull request #89 from emmo-repo/dev
Browse files Browse the repository at this point in the history
update taxonomy
  • Loading branch information
jsimonclark authored Jul 15, 2024
2 parents dcb8fe0 + 94e2366 commit f437b44
Show file tree
Hide file tree
Showing 19 changed files with 1,179 additions and 450 deletions.
6 changes: 3 additions & 3 deletions catalog-v001.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<uri id="Imports Wizard Entry" name="https://w3id.org/emmo/1.0.0-beta7" uri="https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta7/emmo.ttl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=false, version=2" prefer="public" xml:base="">
<uri name="https://w3id.org/emmo/domain/chemical-substance/0.6.0-beta/chemical-substance" uri="https://raw.githubusercontent.com/emmo-repo/domain-chemical-substance/main/chemical-substance.ttl"/>
<uri name="https://w3id.org/emmo/domain/chemical-substance/0.7.0-beta/chemical-substance" uri="https://raw.githubusercontent.com/emmo-repo/domain-chemical-substance/main/chemical-substance.ttl"/>
<uri name="https://w3id.org/emmo/domain/characterisation-methodology/chameo" uri="https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/main/chameo.ttl"/>
<uri name="https://w3id.org/emmo/domain/electrochemistry/0.18.0-beta/electrochemistry" uri="./electrochemistry.ttl"/>
<uri name="https://w3id.org/emmo/domain/electrochemistry/0.18.0-beta/electrochemicalquantities" uri="./electrochemicalquantities.ttl"/>
<uri name="https://w3id.org/emmo/domain/electrochemistry/0.19.0-beta/electrochemistry" uri="./electrochemistry.ttl"/>
<uri name="https://w3id.org/emmo/domain/electrochemistry/0.19.0-beta/electrochemicalquantities" uri="./electrochemicalquantities.ttl"/>

<uri name="https://w3id.org/emmo/1.0.0-beta7/mereocausality" uri="https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta7/mereocausality/mereocausality.ttl"/>

Expand Down
Binary file added docs/assets/img/fig/png/ElectrochemicalCell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/img/fig/png/ElectrochemicalDevice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/img/fig/png/Interface.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/img/fig/png/InterfacialRegion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/img/fig/png/Interphase.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
<mxfile host="65bd71144e">
<diagram id="5ydP_mNCoAJ0G2GhFtXP" name="Page-1">
<mxGraphModel dx="869" dy="469" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<mxGraphModel dx="629" dy="469" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#005CA2;" vertex="1" parent="1">
<mxGeometry x="160" y="80" width="40" height="160" as="geometry"/>
<mxCell id="12" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#cfd1d3;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="65" y="40" width="450" height="320" as="geometry"/>
</mxCell>
<mxCell id="3" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E1EBf8;" vertex="1" parent="1">
<mxGeometry x="200" y="80" width="80" height="160" as="geometry"/>
<mxCell id="2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#005CA2;" parent="1" vertex="1">
<mxGeometry x="210" y="80" width="40" height="160" as="geometry"/>
</mxCell>
<mxCell id="4" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#920048;" vertex="1" parent="1">
<mxGeometry x="280" y="80" width="40" height="160" as="geometry"/>
<mxCell id="3" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E1EBf8;" parent="1" vertex="1">
<mxGeometry x="250" y="80" width="80" height="160" as="geometry"/>
</mxCell>
<mxCell id="8" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;fontSize=18;" edge="1" parent="1" source="5" target="2">
<mxCell id="4" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#920048;" parent="1" vertex="1">
<mxGeometry x="330" y="80" width="40" height="160" as="geometry"/>
</mxCell>
<mxCell id="8" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;fontSize=18;" parent="1" source="5" target="2" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="5" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Electrode&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" vertex="1" parent="1">
<mxGeometry x="130" y="270" width="100" height="40" as="geometry"/>
<mxCell id="5" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Electrode&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="180" y="270" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="9" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontSize=18;" edge="1" parent="1" source="6" target="4">
<mxCell id="9" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontSize=18;" parent="1" source="6" target="4" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="6" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Electrode&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" vertex="1" parent="1">
<mxGeometry x="250" y="270" width="100" height="40" as="geometry"/>
<mxCell id="6" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Electrode&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="300" y="270" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="10" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontSize=18;" edge="1" parent="1" source="7" target="3">
<mxCell id="10" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontSize=18;" parent="1" source="7" target="3" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="7" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Electrolyte&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" vertex="1" parent="1">
<mxGeometry x="190" y="310" width="100" height="40" as="geometry"/>
<mxCell id="7" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Electrolyte&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="240" y="310" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="11" value="Electrochemical Cell" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" vertex="1" parent="1">
<mxGeometry x="190" y="40" width="100" height="40" as="geometry"/>
<mxCell id="11" value="Electrochemical Cell" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="240" y="40" width="100" height="40" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
Expand Down
45 changes: 28 additions & 17 deletions docs/assets/img/fig/src/ElectrochemicalDevice.drawio
Original file line number Diff line number Diff line change
@@ -1,41 +1,52 @@
<mxfile host="65bd71144e">
<diagram id="5ydP_mNCoAJ0G2GhFtXP" name="Page-1">
<mxGraphModel dx="1039" dy="469" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<mxGraphModel dx="629" dy="469" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="12" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cfd1d3;" vertex="1" parent="1">
<mxGeometry x="150" y="100" width="180" height="180" as="geometry"/>
<mxCell id="23" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#cfd1d3;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="80" y="40" width="450" height="320" as="geometry"/>
</mxCell>
<mxCell id="12" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cfd1d3;" parent="1" vertex="1">
<mxGeometry x="130" y="127" width="180" height="180" as="geometry"/>
</mxCell>
<mxCell id="2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#005CA2;" parent="1" vertex="1">
<mxGeometry x="160" y="110" width="40" height="160" as="geometry"/>
<mxGeometry x="140" y="137" width="40" height="160" as="geometry"/>
</mxCell>
<mxCell id="3" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E1EBf8;" parent="1" vertex="1">
<mxGeometry x="200" y="110" width="80" height="160" as="geometry"/>
<mxGeometry x="180" y="137" width="80" height="160" as="geometry"/>
</mxCell>
<mxCell id="4" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#920048;" parent="1" vertex="1">
<mxGeometry x="280" y="110" width="40" height="160" as="geometry"/>
<mxGeometry x="260" y="137" width="40" height="160" as="geometry"/>
</mxCell>
<mxCell id="11" value="Electrochemical Device" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="190" y="40" width="100" height="40" as="geometry"/>
<mxGeometry x="255" y="40" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="13" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#cfd1d3;" vertex="1" parent="1">
<mxGeometry x="160" y="90" width="40" height="10" as="geometry"/>
<mxCell id="13" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#cfd1d3;" parent="1" vertex="1">
<mxGeometry x="140" y="117" width="40" height="10" as="geometry"/>
</mxCell>
<mxCell id="14" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#cfd1d3;" vertex="1" parent="1">
<mxGeometry x="280" y="90" width="40" height="10" as="geometry"/>
<mxCell id="14" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#cfd1d3;" parent="1" vertex="1">
<mxGeometry x="260" y="117" width="40" height="10" as="geometry"/>
</mxCell>
<mxCell id="18" style="edgeStyle=none;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;fontSize=18;" edge="1" parent="1" source="16" target="14">
<mxCell id="18" style="edgeStyle=none;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;fontSize=18;" parent="1" source="16" target="14" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="16" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Terminal&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=left;" vertex="1" parent="1">
<mxGeometry x="360" y="73" width="100" height="40" as="geometry"/>
<mxCell id="16" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Terminal&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=left;" parent="1" vertex="1">
<mxGeometry x="340" y="100" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="19" style="edgeStyle=none;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=18;" edge="1" parent="1" source="17" target="12">
<mxCell id="19" style="edgeStyle=none;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=18;" parent="1" source="17" target="12" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="17" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Case&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=left;" vertex="1" parent="1">
<mxGeometry x="360" y="170" width="100" height="40" as="geometry"/>
<mxCell id="17" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Case&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=left;" parent="1" vertex="1">
<mxGeometry x="340" y="197" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="20" style="edgeStyle=none;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0.813;entryDx=0;entryDy=0;fontSize=18;entryPerimeter=0;" edge="1" parent="1" source="21" target="3">
<mxGeometry relative="1" as="geometry">
<mxPoint x="310" y="267" as="targetPoint"/>
</mxGeometry>
</mxCell>
<mxCell id="21" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Electrochemical Cell&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=left;" vertex="1" parent="1">
<mxGeometry x="340" y="247" width="100" height="40" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
Expand Down
48 changes: 48 additions & 0 deletions docs/assets/img/fig/src/Interface.drawio
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<mxfile host="65bd71144e">
<diagram id="5ydP_mNCoAJ0G2GhFtXP" name="Page-1">
<mxGraphModel dx="629" dy="469" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="18" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#cfd1d3;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="65" y="40" width="450" height="320" as="geometry"/>
</mxCell>
<mxCell id="2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e4c89e;" parent="1" vertex="1">
<mxGeometry x="170" y="80" width="120" height="160" as="geometry"/>
</mxCell>
<mxCell id="3" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff4e3;" parent="1" vertex="1">
<mxGeometry x="290" y="80" width="120" height="160" as="geometry"/>
</mxCell>
<mxCell id="8" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;fontSize=18;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="5" target="2" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="5" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Phase A&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="180" y="280" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="9" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontSize=18;" parent="1" source="6" target="3" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="390" y="240" as="targetPoint"/>
</mxGeometry>
</mxCell>
<mxCell id="6" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Phase B&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="300" y="280" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="10" style="edgeStyle=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;fontSize=18;" parent="1" source="7" target="3" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="7" value="&lt;span style=&quot;font-weight: normal;&quot;&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;Interface&lt;/font&gt;&lt;/span&gt;" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="240" y="320" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="11" value="Interface" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
<mxGeometry x="240" y="40" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="15" value="" style="endArrow=none;html=1;entryX=0;entryY=0;entryDx=0;entryDy=0;exitX=0;exitY=1;exitDx=0;exitDy=0;strokeColor=#4EAB8A;strokeWidth=4;" edge="1" parent="1" source="3" target="3">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="390" y="270" as="sourcePoint"/>
<mxPoint x="440" y="220" as="targetPoint"/>
</mxGeometry>
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
Loading

0 comments on commit f437b44

Please sign in to comment.