Skip to content

Convert to MSL 4.0.0 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AtiyahElsheikh merged 2 commits into from
Apr 6, 2021
Merged

Convert to MSL 4.0.0 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5243c81
Convert to MSL 4.0.0
sjoelund Mar 31, 2021
10a6333
Update version number to 1.0.3
sjoelund Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions BioChem/Math/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package Math
end factorial;

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

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

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

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

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

function coth "hyperbolic cotangent trigonometric function"
input Modelica.SIunits.Angle alpha "input angle";
input Modelica.Units.SI.Angle alpha "input angle";
output Real y "output value";
algorithm
y := 1 / tanh(alpha);
Expand Down
6 changes: 3 additions & 3 deletions BioChem/Units/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ package Units "Units used in BioChem"
</html>", revisions=""), Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Text(origin={0,-13.3333}, fillPattern=FillPattern.Solid, extent={{-100,-86.6667},{73.34,43.3333}}, textString="C", fontName="Arial"),Text(origin={0,-10}, fillPattern=FillPattern.Solid, extent={{6.51,6.81},{50,53.19}}, textString="o", fontName="Arial")}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
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})));
end Units;
13 changes: 10 additions & 3 deletions BioChem/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,17 @@ Linköping University, and by MathCore Engineering AB.
<h2>Versions</h2>
<ul>
<li>
Version 1.0.3 (2021-04-06)
<ul>
<li>Conversion script to MSL 4.0.0</li>
</ul>
</li>
<li>
<li>
Version 1.0.2 (2020-06-02)
<ul>
<li>All major components are separated into *.mo files</li>
<li>MSL 3.2.3&nbsp;</li>
<li>MSL 3.2.3</li>
</ul>
</li>
<li>
Expand All @@ -122,8 +129,8 @@ Version 1.0.1 (2013-04-18)
<li>Version 0.96 (2008-12-19)</li>
</ul>
</body></html>"),
uses(Modelica(version = "3.2.3")),
version = "1.0.2",
uses(Modelica(version = "4.0.0")),
version = "1.0.3",
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}})}),
Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
end BioChem;
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ take place in-between these substances in a diverse number of biochemical pathwa

## Current release

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

#### Release notes

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