Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/MarekMatejak/Physiolibrary
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarekMatejak
MarekMatejak committed Apr 3, 2015
2 parents a089675 + ceb8a72 commit c889e3a
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 45 deletions.
36 changes: 18 additions & 18 deletions Physiolibrary/Chemical.mo
View file
Expand Up @@ -4320,12 +4320,12 @@ package Chemical "Domain with Molar Concentration and Molar Flow"
graphics={
Rectangle(
extent={{-100,-50},{100,50}},
lineColor={0,0,127},
lineColor={107,45,134},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-80,26},{62,0},{-80,-26},{-80,26}},
lineColor={0,0,127},
lineColor={107,45,134},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Text(
Expand All @@ -4340,37 +4340,37 @@ package Chemical "Domain with Molar Concentration and Molar Flow"
points={{-68,24},{-68,-24},{-58,-22},{-58,22},{-68,24}},
lineColor={0,0,127},
smooth=Smooth.None,
fillColor={0,0,127},
fillColor={107,45,134},
fillPattern=FillPattern.Solid),
Polygon(
points={{-46,20},{-46,-20},{-36,-18},{-36,18},{-46,20}},
lineColor={0,0,127},
smooth=Smooth.None,
fillColor={0,0,127},
fillColor={107,45,134},
fillPattern=FillPattern.Solid),
Polygon(
points={{-24,16},{-24,-16},{-14,-14},{-14,14},{-24,16}},
lineColor={0,0,127},
smooth=Smooth.None,
fillColor={0,0,127},
fillColor={107,45,134},
fillPattern=FillPattern.Solid),
Polygon(
points={{-2,12},{-2,-12},{8,-10},{8,10},{-2,12}},
lineColor={0,0,127},
smooth=Smooth.None,
fillColor={0,0,127},
fillColor={107,45,134},
fillPattern=FillPattern.Solid),
Polygon(
points={{20,8},{20,-8},{30,-6},{30,6},{20,8}},
lineColor={0,0,127},
smooth=Smooth.None,
fillColor={0,0,127},
fillColor={107,45,134},
fillPattern=FillPattern.Solid),
Polygon(
points={{40,4},{40,-4},{50,-2},{50,2},{40,4}},
lineColor={0,0,127},
smooth=Smooth.None,
fillColor={0,0,127},
fillColor={107,45,134},
fillPattern=FillPattern.Solid)}),
Documentation(revisions="<html>
<table>
Expand Down Expand Up @@ -4429,7 +4429,7 @@ package Chemical "Domain with Molar Concentration and Molar Flow"
fillPattern=FillPattern.Solid),
Polygon(
points={{-80,25},{80,0},{-80,-25},{-80,25}},
lineColor={0,0,127},
lineColor={107,45,134},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Text(
Expand Down Expand Up @@ -4480,7 +4480,7 @@ package Chemical "Domain with Molar Concentration and Molar Flow"
rotation=360),
Polygon(
points={{-80,25},{80,0},{-80,-25},{-80,25}},
lineColor={0,0,127},
lineColor={107,45,134},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
rotation=360),
Expand Down Expand Up @@ -4549,14 +4549,14 @@ package Chemical "Domain with Molar Concentration and Molar Flow"
100,100}}), graphics={
Rectangle(
extent={{-100,-50},{100,50}},
lineColor={0,0,127},
lineColor={107,45,134},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
rotation=360),
Polygon(
points={{-80,25},{80,0},{-80,-25},{-80,25}},
lineColor={0,0,127},
fillColor={0,0,127},
fillColor={107,45,134},
fillPattern=FillPattern.Solid,
rotation=360),
Text(
Expand Down Expand Up @@ -4814,13 +4814,13 @@ package Chemical "Domain with Molar Concentration and Molar Flow"
100,100}}), graphics={
Rectangle(
extent={{-100,-42},{100,40}},
lineColor={0,0,127},
lineColor={107,45,134},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-48,20},{50,0},{-48,-21},{-48,20}},
lineColor={0,0,127},
fillColor={0,0,127},
lineColor={107,45,134},
fillColor={107,45,134},
fillPattern=FillPattern.Solid),
Text(
extent={{-82,-82},{90,-58}},
Expand Down Expand Up @@ -5019,13 +5019,13 @@ package Chemical "Domain with Molar Concentration and Molar Flow"
100,100}}), graphics={
Rectangle(
extent={{-100,-42},{100,40}},
lineColor={0,0,127},
lineColor={107,45,134},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-48,20},{50,0},{-48,-21},{-48,20}},
lineColor={0,0,127},
fillColor={0,0,127},
lineColor={107,45,134},
fillColor={107,45,134},
fillPattern=FillPattern.Solid),
Text(
extent={{-82,-82},{90,-58}},
Expand Down
20 changes: 10 additions & 10 deletions Physiolibrary/Hydraulic.mo
View file
Expand Up @@ -1323,14 +1323,14 @@ package Hydraulic "Domain with Pressure and Volumetric Flow"
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
100,100}}), graphics={
Rectangle(
extent={{-100,-40},{100,60}},
lineColor={0,0,127},
extent={{-100,-50},{100,60}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-80,35},{80,10},{-80,-15},{-80,35}},
points={{-80,25},{80,0},{-80,-25},{-80,25}},
lineColor={0,0,127},
fillColor={0,0,127},
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Text(
extent={{-150,-90},{150,-50}},
Expand Down Expand Up @@ -1690,13 +1690,13 @@ package Hydraulic "Domain with Pressure and Volumetric Flow"
100,100}}), graphics={
Rectangle(
extent={{-100,-50},{100,50}},
lineColor={0,0,127},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-80,25},{80,0},{-80,-25},{-80,25}},
lineColor={0,0,127},
fillColor={0,0,127},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Text(
extent={{-150,-94},{150,-54}},
Expand Down Expand Up @@ -1806,13 +1806,13 @@ package Hydraulic "Domain with Pressure and Volumetric Flow"
graphics={
Rectangle(
extent={{-100,-50},{100,50}},
lineColor={0,0,127},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-80,25},{80,0},{-80,-25},{-80,25}},
lineColor={0,0,127},
fillColor={0,0,127},
lineColor={0,0,0},
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Text(
extent={{-150,-94},{150,-54}},
Expand Down
26 changes: 13 additions & 13 deletions Physiolibrary/Osmotic.mo
View file
Expand Up @@ -252,12 +252,12 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
smooth=Smooth.None));
connect(flowMeasure1.volumeFlowRate, arachnoid_villi_hydraulic.solutionFlow)
annotation (Line(
points={{8,62},{8,79}},
points={{8,64},{8,79}},
color={0,0,127},
smooth=Smooth.None));
connect(flowMeasure.volumeFlowRate, choroid_plexus_hydraulic.solutionFlow)
annotation (Line(
points={{8,-2},{8,-15}},
points={{8,-4},{8,-15}},
color={0,0,127},
smooth=Smooth.None));
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
Expand Down Expand Up @@ -476,13 +476,13 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
lineColor={0,0,255}),
Rectangle(
extent={{-100,-50},{100,50}},
lineColor={0,0,127},
lineColor={127,127,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-78,25},{82,0},{-78,-25},{-78,25}},
lineColor={0,0,127},
fillColor={0,0,127},
lineColor={127,127,0},
fillColor={127,127,0},
fillPattern=FillPattern.Solid)}),
Documentation(revisions="<html>
<p><i>2009-2010</i></p>
Expand Down Expand Up @@ -739,13 +739,13 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
graphics={
Rectangle(
extent={{-60,-30},{60,30}},
lineColor={0,0,127},
lineColor={127,127,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-48,20},{50,0},{-48,-21},{-48,20}},
lineColor={0,0,127},
fillColor={0,0,127},
lineColor={127,127,0},
fillColor={127,127,0},
fillPattern=FillPattern.Solid),
Text(
extent={{-92,-58},{80,-34}},
Expand All @@ -769,14 +769,14 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
100,100}}), graphics={
Rectangle(
extent={{-60,-32},{60,30}},
lineColor={0,0,127},
extent={{-60,-30},{60,30}},
lineColor={127,127,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Polygon(
points={{-48,18},{50,-2},{-48,-26},{-48,18}},
lineColor={0,0,127},
fillColor={0,0,127},
points={{-46,22},{52,0},{-46,-22},{-46,22}},
lineColor={127,127,0},
fillColor={127,127,0},
fillPattern=FillPattern.Solid),
Text(
extent={{-78,-58},{72,-36}},
Expand Down
8 changes: 4 additions & 4 deletions Physiolibrary/Population.mo
View file
Expand Up @@ -216,7 +216,7 @@ package Population
{100,100}}), graphics={
Rectangle(
extent={{-100,-50},{100,50}},
lineColor={0,0,127},
lineColor={0,127,127},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
rotation=360),
Expand Down Expand Up @@ -247,7 +247,7 @@ package Population
annotation (Icon(graphics={
Rectangle(
extent={{-100,-52},{100,48}},
lineColor={0,0,127},
lineColor={0,127,127},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
rotation=360),
Expand Down Expand Up @@ -279,7 +279,7 @@ package Population
graphics={
Rectangle(
extent={{-100,-52},{100,48}},
lineColor={0,0,127},
lineColor={0,127,127},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
rotation=360),
Expand Down Expand Up @@ -331,7 +331,7 @@ package Population
lineColor={0,127,127},
fillColor={0,127,127},
fillPattern=FillPattern.Solid),
Text(extent= {{-160,110},{40,50}}, lineColor={0,127,127},
Text(extent = {{-160,110},{40,50}}, lineColor={0,127,127},
textString="%name")}),
Documentation(info="<html>
<p>
Expand Down

0 comments on commit c889e3a

Please sign in to comment.