Skip to content

Commit 517a996

Browse files
sjoelundsjoelund
authored
Convert to MSL 4.0.0 (#19)
* Convert to MSL 4.0.0 * Update version number to 1.0.3
1 parent 8f4e786 commit 517a996

File tree

4 files changed

+23
-14
lines changed

4 files changed

+23
-14
lines changed

‎BioChem/Math/package.mo

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package Math
2424
end factorial;
2525

2626
function sec "secant trigonometric function"
27-
input Modelica.SIunits.Angle alpha "input angle";
27+
input Modelica.Units.SI.Angle alpha "input angle";
2828
output Real y "output value";
2929
algorithm
3030
y := 1 / cos(alpha);
@@ -34,7 +34,7 @@ package Math
3434
end sec;
3535

3636
function cot "Cotangent trigonometric function"
37-
input Modelica.SIunits.Angle alpha "input angle";
37+
input Modelica.Units.SI.Angle alpha "input angle";
3838
output Real y "output value";
3939
algorithm
4040
y := 1 / tan(alpha);
@@ -44,7 +44,7 @@ package Math
4444
end cot;
4545

4646
function csc "cosecant trigonometric function"
47-
input Modelica.SIunits.Angle alpha "input angle";
47+
input Modelica.Units.SI.Angle alpha "input angle";
4848
output Real y "output value";
4949
algorithm
5050
y := 1 / sin(alpha);
@@ -54,7 +54,7 @@ package Math
5454
end csc;
5555

5656
function sech "hyperbolic secant trigonometric function"
57-
input Modelica.SIunits.Angle alpha "input angle";
57+
input Modelica.Units.SI.Angle alpha "input angle";
5858
output Real y "output value";
5959
algorithm
6060
y := 1 / cosh(alpha);
@@ -64,7 +64,7 @@ package Math
6464
end sech;
6565

6666
function csch "hyperbolic cosecant trigonometric function"
67-
input Modelica.SIunits.Angle alpha "input angle";
67+
input Modelica.Units.SI.Angle alpha "input angle";
6868
output Real y "output value";
6969
algorithm
7070
y := 1 / sinh(alpha);
@@ -74,7 +74,7 @@ package Math
7474
end csch;
7575

7676
function coth "hyperbolic cotangent trigonometric function"
77-
input Modelica.SIunits.Angle alpha "input angle";
77+
input Modelica.Units.SI.Angle alpha "input angle";
7878
output Real y "output value";
7979
algorithm
8080
y := 1 / tanh(alpha);

‎BioChem/Units/package.mo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ package Units "Units used in BioChem"
33
extends Icons.Library;
44
type VolumetricReactionRate= Real(quantity="Volumetric reaction rate", unit="mol/(s.l)") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
55
type VolumeChangeConstant= Real(quantity="Volume change constant", unit="l/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
6-
type Volume= Modelica.SIunits.Conversions.NonSIunits.Volume_litre annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
6+
type Volume= Modelica.Units.NonSI.Volume_litre annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
77
type StoichiometricCoefficient= Real(quantity="Stoichiometric coefficient", unit="1") "" annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
88
type ReactionRate= Real(quantity="Reaction rate", unit="mol/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
99
type ReactionCoefficient= Real(quantity="Reaction coefficient", unit="1") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
10-
type Pressure= Modelica.SIunits.Pressure annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
10+
type Pressure= Modelica.Units.SI.Pressure annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
1111
type MolarFlowRate= Real(quantity="Molar flow rate", unit="mol/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
1212
type IonicCharge= Integer(quantity="Ionic charge", unit="1") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
1313
type DilutionRate= Real(quantity="Dilution rate", unit="/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
1414
type Concentration= Real(quantity="Concentration", unit="mol/l", min=0) annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
15-
type Celcius= Modelica.SIunits.Conversions.NonSIunits.Temperature_degC annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
15+
type Celcius= Modelica.Units.NonSI.Temperature_degC annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
1616
type AmountOfSubstance= Real(quantity="AmountOfSubstance", unit="mol", min=0) annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
1717
type EquilibriumCoefficient= Real(quantity="Equilibrium coefficient", unit="1") "" annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
1818
annotation(Documentation(info="<html>

‎BioChem/package.mo

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,17 @@ Linköping University, and by MathCore Engineering AB.
105105
<h2>Versions</h2>
106106
<ul>
107107
<li>
108+
Version 1.0.3 (2021-04-06)
109+
<ul>
110+
<li>Conversion script to MSL 4.0.0</li>
111+
</ul>
112+
</li>
113+
<li>
114+
<li>
108115
Version 1.0.2 (2020-06-02)
109116
<ul>
110117
<li>All major components are separated into *.mo files</li>
111-
<li>MSL 3.2.3&nbsp;</li>
118+
<li>MSL 3.2.3</li>
112119
</ul>
113120
</li>
114121
<li>
@@ -122,8 +129,8 @@ Version 1.0.1 (2013-04-18)
122129
<li>Version 0.96 (2008-12-19)</li>
123130
</ul>
124131
</body></html>"),
125-
uses(Modelica(version = "3.2.3")),
126-
version = "1.0.2",
132+
uses(Modelica(version = "4.0.0")),
133+
version = "1.0.3",
127134
Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Line(origin = {3.55271e-15, 3.76}, points = {{-50, -60}, {-50, -27.52}, {10, -27.52}}, smooth = Smooth.Bezier), Line(origin = {-1.135, 4.09474}, points = {{-48.865, 10}, {-48.865, -27.61}, {11.135, -27.61}}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 30, smooth = Smooth.Bezier), Ellipse(origin = {30.4112, -23.4648}, lineColor = {0, 85, 0}, fillColor = {0, 170, 0}, fillPattern = FillPattern.Sphere, extent = {{-20.4112, -20}, {20.4112, 20}}), Ellipse(origin = {6.28735, -0.665395}, lineColor = {161, 107, 0}, fillColor = {250, 167, 0}, fillPattern = FillPattern.Sphere, extent = {{-76.2873, -79.3346}, {-35.4736, -39.3346}}), Ellipse(origin = {4.98569, -1.03187}, lineColor = {117, 0, 0}, fillColor = {170, 0, 0}, fillPattern = FillPattern.Sphere, extent = {{-75.8122, -6.13331}, {-34.9857, 33.8667}})}),
128135
Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
129136
end BioChem;

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ take place in-between these substances in a diverse number of biochemical pathwa
1515

1616
## Current release
1717

18-
Download [BioChem v1.0.2 for MSL v3.2.3 (2020-06-02)](../../archive/v1.0.2.zip)
18+
Download [BioChem v1.0.3 for MSL v4.0.0 (2021-04-06)](../../archive/v1.0.3.zip)
1919

2020
#### Release notes
2121

22-
* [Version v1.0.2 (2020-06-02)](../../archive/v1.0.1.zip)
22+
* [Version v1.0.3 (2021-04-06)](../../archive/v1.0.3.zip)
23+
* Conversion script to MSL 4.0.0
24+
* [Version v1.0.2 (2020-06-02)](../../archive/v1.0.2.zip)
2325
* Summary: All major components into separate *.mo files, Converted to MSL 3.2.3
2426
* [Version v1.0.1 (2013-04-18)](../../archive/v1.0.1.zip)
2527
* Summary: Converted to MSL 3.2.1

0 commit comments

Comments
 (0)