Skip to content

Commit

Permalink
Merge 1a4f60e into 1f56f74
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny committed Jan 14, 2020
2 parents 1f56f74 + 1a4f60e commit 02b3c73
Show file tree
Hide file tree
Showing 40 changed files with 5,495 additions and 419 deletions.
1 change: 1 addition & 0 deletions doc/downloads/index.js
View file
Expand Up @@ -37,6 +37,7 @@ var jsonData = { "versions": [
}
],
"changes": [
{ "change": "<strong>Simulation Experiment view:</strong> can now customise the font size of the different bits of text in a graph panel (see issue <a href=\"https://github.com/opencor/opencor/issues/2271\">#2271</a>)." },
{ "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 9.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2269\">#2269</a>)." }
]
},
Expand Down
Binary file modified models/tests/combine/fink_slepchenko_moraru_watras_schaff_loew_2000v2.omex
View file
Binary file not shown.
Binary file modified models/tests/combine/lorenz.omex
View file
Binary file not shown.
Binary file added models/tests/combine/no_master_file.omex
View file
Binary file not shown.
Binary file removed models/tests/combine/no_master_sedml_file.omex
View file
Binary file not shown.
Binary file modified models/tests/combine/noble_1962.omex
View file
Binary file not shown.
Binary file modified models/tests/combine/smith_chase_nokes_shaw_wake_2004.omex
View file
Binary file not shown.
Binary file added models/tests/combine/two_master_files.omex
View file
Binary file not shown.
Binary file removed models/tests/combine/two_master_sedml_files.omex
View file
Binary file not shown.
39 changes: 30 additions & 9 deletions models/tests/sedml/lorenz.sedml
View file
Expand Up @@ -88,33 +88,39 @@
<listOfOutputs>
<plot2D id="plot1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<properties version="2" xmlns="http://www.opencor.ws/">
<backgroundColor>#ffffff</backgroundColor>
<fontSize>10</fontSize>
<fontSize>20</fontSize>
<foregroundColor>#000000</foregroundColor>
<height>1</height>
<gridLines>
<style>dot</style>
<width>1</width>
<color>#a0a0a4</color>
</gridLines>
<legend>true</legend>
<legend>
<fontSize>10</fontSize>
<visible>true</visible>
</legend>
<pointCoordinates>
<style>dash</style>
<width>1</width>
<color>#b0008080</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
</pointCoordinates>
<surroundingArea>
<backgroundColor>#ececec</backgroundColor>
<foregroundColor>#000000</foregroundColor>
</surroundingArea>
<title/>
<xAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</xAxis>
<yAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</yAxis>
Expand All @@ -123,6 +129,7 @@
<width>1</width>
<color>#b0800000</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
<filled>true</filled>
<fillColor>#30ffff00</fillColor>
</zoomRegion>
Expand Down Expand Up @@ -153,33 +160,39 @@
</plot2D>
<plot2D id="plot2">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<properties version="2" xmlns="http://www.opencor.ws/">
<backgroundColor>#ffffff</backgroundColor>
<fontSize>10</fontSize>
<fontSize>20</fontSize>
<foregroundColor>#000000</foregroundColor>
<height>1</height>
<gridLines>
<style>dot</style>
<width>1</width>
<color>#a0a0a4</color>
</gridLines>
<legend>true</legend>
<legend>
<fontSize>10</fontSize>
<visible>true</visible>
</legend>
<pointCoordinates>
<style>dash</style>
<width>1</width>
<color>#b0008080</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
</pointCoordinates>
<surroundingArea>
<backgroundColor>#ececec</backgroundColor>
<foregroundColor>#000000</foregroundColor>
</surroundingArea>
<title/>
<xAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</xAxis>
<yAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</yAxis>
Expand All @@ -188,6 +201,7 @@
<width>1</width>
<color>#b0800000</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
<filled>true</filled>
<fillColor>#30ffff00</fillColor>
</zoomRegion>
Expand Down Expand Up @@ -218,33 +232,39 @@
</plot2D>
<plot2D id="plot3">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<properties version="2" xmlns="http://www.opencor.ws/">
<backgroundColor>#ffffff</backgroundColor>
<fontSize>10</fontSize>
<fontSize>20</fontSize>
<foregroundColor>#000000</foregroundColor>
<height>1</height>
<gridLines>
<style>dot</style>
<width>1</width>
<color>#a0a0a4</color>
</gridLines>
<legend>true</legend>
<legend>
<fontSize>10</fontSize>
<visible>true</visible>
</legend>
<pointCoordinates>
<style>dash</style>
<width>1</width>
<color>#b0008080</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
</pointCoordinates>
<surroundingArea>
<backgroundColor>#ececec</backgroundColor>
<foregroundColor>#000000</foregroundColor>
</surroundingArea>
<title/>
<xAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</xAxis>
<yAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</yAxis>
Expand All @@ -253,6 +273,7 @@
<width>1</width>
<color>#b0800000</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
<filled>true</filled>
<fillColor>#30ffff00</fillColor>
</zoomRegion>
Expand Down
58 changes: 43 additions & 15 deletions models/tests/sedml/noble_1962_V_iK.sedml
View file
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<sedML level="1" version="2" xmlns="http://sed-ml.org/sed-ml/level1/version2" xmlns:cellml="http://www.cellml.org/cellml/1.0#">
<sedML level="1" version="3" xmlns="http://sed-ml.org/sed-ml/level1/version3" xmlns:cellml="http://www.cellml.org/cellml/1.0#">
<listOfSimulations>
<uniformTimeCourse id="simulation1" initialTime="0" numberOfPoints="1000" outputEndTime="1000" outputStartTime="0">
<algorithm kisaoID="KISAO:0000019">
<listOfAlgorithmParameters>
<algorithmParameter kisaoID="KISAO:0000211" value="1e-7"/>
<algorithmParameter kisaoID="KISAO:0000211" value="1e-07"/>
<algorithmParameter kisaoID="KISAO:0000475" value="BDF"/>
<algorithmParameter kisaoID="KISAO:0000481" value="true"/>
<algorithmParameter kisaoID="KISAO:0000476" value="Newton"/>
Expand All @@ -13,7 +13,7 @@
<algorithmParameter kisaoID="KISAO:0000415" value="500"/>
<algorithmParameter kisaoID="KISAO:0000467" value="0"/>
<algorithmParameter kisaoID="KISAO:0000478" value="Banded"/>
<algorithmParameter kisaoID="KISAO:0000209" value="1e-7"/>
<algorithmParameter kisaoID="KISAO:0000209" value="1e-07"/>
<algorithmParameter kisaoID="KISAO:0000479" value="0"/>
</listOfAlgorithmParameters>
</algorithm>
Expand Down Expand Up @@ -104,33 +104,39 @@
<listOfOutputs>
<plot2D id="plot1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<properties version="2" xmlns="http://www.opencor.ws/">
<backgroundColor>#ffffff</backgroundColor>
<fontSize>10</fontSize>
<fontSize>20</fontSize>
<foregroundColor>#000000</foregroundColor>
<height>1</height>
<gridLines>
<style>dot</style>
<width>1</width>
<color>#a0a0a4</color>
</gridLines>
<legend>false</legend>
<legend>
<fontSize>10</fontSize>
<visible>false</visible>
</legend>
<pointCoordinates>
<style>dash</style>
<width>1</width>
<color>#b0008080</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
</pointCoordinates>
<surroundingArea>
<backgroundColor>#ececec</backgroundColor>
<foregroundColor>#000000</foregroundColor>
</surroundingArea>
<title/>
<xAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</xAxis>
<yAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</yAxis>
Expand All @@ -139,6 +145,7 @@
<width>1</width>
<color>#b0800000</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
<filled>true</filled>
<fillColor>#30ffff00</fillColor>
</zoomRegion>
Expand Down Expand Up @@ -169,33 +176,39 @@
</plot2D>
<plot2D id="plot2">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<properties version="2" xmlns="http://www.opencor.ws/">
<backgroundColor>#ffffff</backgroundColor>
<fontSize>10</fontSize>
<fontSize>20</fontSize>
<foregroundColor>#000000</foregroundColor>
<height>1</height>
<gridLines>
<style>dot</style>
<width>1</width>
<color>#a0a0a4</color>
</gridLines>
<legend>false</legend>
<legend>
<fontSize>10</fontSize>
<visible>false</visible>
</legend>
<pointCoordinates>
<style>dash</style>
<width>1</width>
<color>#b0008080</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
</pointCoordinates>
<surroundingArea>
<backgroundColor>#ececec</backgroundColor>
<foregroundColor>#000000</foregroundColor>
</surroundingArea>
<title/>
<xAxis>
<fontSize>10</fontSize>
<logarithmicScale>true</logarithmicScale>
<title/>
</xAxis>
<yAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</yAxis>
Expand All @@ -204,6 +217,7 @@
<width>1</width>
<color>#b0800000</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
<filled>true</filled>
<fillColor>#30ffff00</fillColor>
</zoomRegion>
Expand Down Expand Up @@ -234,33 +248,39 @@
</plot2D>
<plot2D id="plot3">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<properties version="2" xmlns="http://www.opencor.ws/">
<backgroundColor>#ffffff</backgroundColor>
<fontSize>10</fontSize>
<fontSize>20</fontSize>
<foregroundColor>#000000</foregroundColor>
<height>1</height>
<gridLines>
<style>dot</style>
<width>1</width>
<color>#a0a0a4</color>
</gridLines>
<legend>false</legend>
<legend>
<fontSize>10</fontSize>
<visible>false</visible>
</legend>
<pointCoordinates>
<style>dash</style>
<width>1</width>
<color>#b0008080</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
</pointCoordinates>
<surroundingArea>
<backgroundColor>#ececec</backgroundColor>
<foregroundColor>#000000</foregroundColor>
</surroundingArea>
<title/>
<xAxis>
<fontSize>10</fontSize>
<logarithmicScale>false</logarithmicScale>
<title/>
</xAxis>
<yAxis>
<fontSize>10</fontSize>
<logarithmicScale>true</logarithmicScale>
<title/>
</yAxis>
Expand All @@ -269,6 +289,7 @@
<width>1</width>
<color>#b0800000</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
<filled>true</filled>
<fillColor>#30ffff00</fillColor>
</zoomRegion>
Expand Down Expand Up @@ -299,33 +320,39 @@
</plot2D>
<plot2D id="plot4">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<properties version="2" xmlns="http://www.opencor.ws/">
<backgroundColor>#ffffff</backgroundColor>
<fontSize>10</fontSize>
<fontSize>20</fontSize>
<foregroundColor>#000000</foregroundColor>
<height>1</height>
<gridLines>
<style>dot</style>
<width>1</width>
<color>#a0a0a4</color>
</gridLines>
<legend>false</legend>
<legend>
<fontSize>10</fontSize>
<visible>false</visible>
</legend>
<pointCoordinates>
<style>dash</style>
<width>1</width>
<color>#b0008080</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
</pointCoordinates>
<surroundingArea>
<backgroundColor>#ececec</backgroundColor>
<foregroundColor>#000000</foregroundColor>
</surroundingArea>
<title/>
<xAxis>
<fontSize>10</fontSize>
<logarithmicScale>true</logarithmicScale>
<title/>
</xAxis>
<yAxis>
<fontSize>10</fontSize>
<logarithmicScale>true</logarithmicScale>
<title/>
</yAxis>
Expand All @@ -334,6 +361,7 @@
<width>1</width>
<color>#b0800000</color>
<fontColor>#ffffff</fontColor>
<fontSize>10</fontSize>
<filled>true</filled>
<fillColor>#30ffff00</fillColor>
</zoomRegion>
Expand Down

0 comments on commit 02b3c73

Please sign in to comment.