Skip to content

Comments

Convert to MSL 4.0.0#19

Merged
AtiyahElsheikh merged 2 commits intomasterfrom
convert-msl-4.0.0
Apr 6, 2021
Merged

Convert to MSL 4.0.0#19
AtiyahElsheikh merged 2 commits intomasterfrom
convert-msl-4.0.0

Conversation

@sjoelund
Copy link
Member

With #18 in place, I got this smaller diff from OMC when applying the conversion script.

Copy link
Collaborator

@AtiyahElsheikh AtiyahElsheikh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can now make a new version and tag of Biochem. Consider modifying the ReadMe file.

@sjoelund sjoelund force-pushed the convert-msl-4.0.0 branch from 77d52cd to 10a6333 Compare April 6, 2021 07:14
@sjoelund
Copy link
Member Author

sjoelund commented Apr 6, 2021

I have updated the version. I'll tag it after it's merged.

@AtiyahElsheikh AtiyahElsheikh merged commit 517a996 into master Apr 6, 2021
@sjoelund sjoelund deleted the convert-msl-4.0.0 branch April 6, 2021 07:36
AtiyahElsheikh added a commit that referenced this pull request Apr 6, 2021
* MSL version 3.2.3

* separate Interfaces/Substances/package.mo into separate components

* separate the components within the package Interfaces.Compartments

* Decompose the package BioChem.Interfaces.Nodes into separate components

* Separate all components within Biochem/Interfaces/Reactions/package.mo into separate *.mo components

* Decompose package BioChem/Interfaces/Reactions/Basics/package.mo into separate components

* Separate BioChem/Interfaces/Reactions/Modifiers/package.mo into separate components

* remove extra spaces from several modified package.mo

* keep model declaration using partial or without partial identical to the original version

* package.order files to be included in the repository

* decompose BioChem/Compartments/package.mo into separate components

* decompose BioChem/Substances/package.mo into separate components

* Separate the Icons package within BioChem/package.mo into separate directory

* Separate Biochem.Math package into a separate directory

* Separate top models within the Biochem.Examples package

* Separate all subpackages within Biochem.Examples into separate *.mo files. Each subpackage corresponds to a standalone example

* Separate Biochem.Reactions.MichaelisMenten into separate components

* separate Biochem.Reactions.MassAction.Reversible into separate components

* decompose package Reactions.MassAction.Irreversible into separate components

* Decompose Reactions.Inhibition into separate components

* decompoase Reactions.FastEquilibrium into separate components

* Decompose package Reactions into separate components

* ignore backup files

* annotations for version 1.0.2

* Revert "ignore backup files"

This reverts commit 898a667.

* remove backup files

* announcing version 1.0.2

* 1.0.2: major components in separate *.mo files / MSL 3.2.3 (#13)

* Issue07 separate component (#11)

* MSL version 3.2.3

* separate Interfaces/Substances/package.mo into separate components

* separate the components within the package Interfaces.Compartments

* Decompose the package BioChem.Interfaces.Nodes into separate components

* Separate all components within Biochem/Interfaces/Reactions/package.mo into separate *.mo components

* Decompose package BioChem/Interfaces/Reactions/Basics/package.mo into separate components

* Separate BioChem/Interfaces/Reactions/Modifiers/package.mo into separate components

* remove extra spaces from several modified package.mo

* keep model declaration using partial or without partial identical to the original version

* package.order files to be included in the repository

* decompose BioChem/Compartments/package.mo into separate components

* decompose BioChem/Substances/package.mo into separate components

* Separate the Icons package within BioChem/package.mo into separate directory

* Separate Biochem.Math package into a separate directory

* Separate top models within the Biochem.Examples package

* Separate all subpackages within Biochem.Examples into separate *.mo files. Each subpackage corresponds to a standalone example

* Separate Biochem.Reactions.MichaelisMenten into separate components

* separate Biochem.Reactions.MassAction.Reversible into separate components

* decompose package Reactions.MassAction.Irreversible into separate components

* Decompose Reactions.Inhibition into separate components

* decompoase Reactions.FastEquilibrium into separate components

* Decompose package Reactions into separate components

* Develop 1.0.2 (#12)

* MSL version 3.2.3

* separate Interfaces/Substances/package.mo into separate components

* separate the components within the package Interfaces.Compartments

* Decompose the package BioChem.Interfaces.Nodes into separate components

* Separate all components within Biochem/Interfaces/Reactions/package.mo into separate *.mo components

* Decompose package BioChem/Interfaces/Reactions/Basics/package.mo into separate components

* Separate BioChem/Interfaces/Reactions/Modifiers/package.mo into separate components

* remove extra spaces from several modified package.mo

* keep model declaration using partial or without partial identical to the original version

* package.order files to be included in the repository

* decompose BioChem/Compartments/package.mo into separate components

* decompose BioChem/Substances/package.mo into separate components

* Separate the Icons package within BioChem/package.mo into separate directory

* Separate Biochem.Math package into a separate directory

* Separate top models within the Biochem.Examples package

* Separate all subpackages within Biochem.Examples into separate *.mo files. Each subpackage corresponds to a standalone example

* Separate Biochem.Reactions.MichaelisMenten into separate components

* separate Biochem.Reactions.MassAction.Reversible into separate components

* decompose package Reactions.MassAction.Irreversible into separate components

* Decompose Reactions.Inhibition into separate components

* decompoase Reactions.FastEquilibrium into separate components

* Decompose package Reactions into separate components

* ignore backup files

* annotations for version 1.0.2

* Revert "ignore backup files"

This reverts commit 898a667.

* remove backup files

* announcing version 1.0.2

* missing partial declaration

* missing "partial" declaration

* "partial" missing

* Update ReadMe (MSL library version)

MSL 3.2.3 for version 1.0.2

* fix merging error. partial keyword retained

* reorganizing units and substances package icons into Icons directory

* MSL 4.0.0 instead of 3.2.3

* Icons package extends the standard Icon package of MSL 4.0.0

* notes on the difference between Biochem.Icons and Modelica.Icons.* in the documentation

* revision information

* making use of Modelica.Icons.InterfacesPackage

* Making use of Modelica.Icons.* when needed, however preferring Biochem Icons when available

* Back to MSL 3.2.3

Usage of MSL 4.0.0 after applying the conversion script

* Move annotations to the correct position in a class (#18)

The Modelica grammar does not allow annotations except at the end of a class.

* Convert to MSL 4.0.0 (#19)

* Convert to MSL 4.0.0

* Update version number to 1.0.3

* resolve conflict due to BioChem 1.0.3

* resolve conflict due to BioChem V 1.0.3

Co-authored-by: Martin Sjölund <martin@sjoelund.se>
AtiyahElsheikh added a commit that referenced this pull request Apr 17, 2021
* fix merging error. partial keyword retained

* reorganizing units and substances package icons into Icons directory

* MSL 4.0.0 instead of 3.2.3

* Icons package extends the standard Icon package of MSL 4.0.0

* notes on the difference between Biochem.Icons and Modelica.Icons.* in the documentation

* revision information

* making use of Modelica.Icons.InterfacesPackage

* Making use of Modelica.Icons.* when needed, however preferring Biochem Icons when available

* Back to MSL 3.2.3

Usage of MSL 4.0.0 after applying the conversion script

* Move annotations to the correct position in a class (#18)

The Modelica grammar does not allow annotations except at the end of a class.

* Convert to MSL 4.0.0 (#19)

* Convert to MSL 4.0.0

* Update version number to 1.0.3

* resolve conflict due to BioChem 1.0.3

* resolve conflict due to BioChem V 1.0.3

* Let UsersGuide package be the first one

* Base Icon for almost many components

* Icons for physical units

* removing unused older files

* Backward incompatible notes added

Co-authored-by: Martin Sjölund <martin@sjoelund.se>
AtiyahElsheikh added a commit that referenced this pull request Apr 29, 2021
* fix merging error. partial keyword retained

* reorganizing units and substances package icons into Icons directory

* MSL 4.0.0 instead of 3.2.3

* Icons package extends the standard Icon package of MSL 4.0.0

* notes on the difference between Biochem.Icons and Modelica.Icons.* in the documentation

* revision information

* making use of Modelica.Icons.InterfacesPackage

* Making use of Modelica.Icons.* when needed, however preferring Biochem Icons when available

* Back to MSL 3.2.3

Usage of MSL 4.0.0 after applying the conversion script

* Move annotations to the correct position in a class (#18)

The Modelica grammar does not allow annotations except at the end of a class.

* Convert to MSL 4.0.0 (#19)

* Convert to MSL 4.0.0

* Update version number to 1.0.3

* resolve conflict due to BioChem 1.0.3

* resolve conflict due to BioChem V 1.0.3

* Icons for package

* missing

* remove unnecessary annotations

* extra file not needed

* Icons within the Interfaces.Substances package

* order physical units alphabetically

* correct alphabetical order

* Alphabetical order

* employ Modelica.Icons.IconsPackage

* Variants of BioChem.Icons.Library

* move package annotations to BioChem.Icons.Substances instead of additional subpackage

* no need for extra package PackageIcon

* Move compartments annotations to a new Icons.Compartments package

* documentation

* Move Interfaces.Substances annotations to BioChem.Icons

* moving BioChem.Interfaces.Nodes.* annotation to the BioChem.Icons.Interfaces package

* complete package names after extend statements

* improve documentation

* Due to the implementation of OMEdit, interchange the two extend statements so that the icon remain in green as in previous release

* move annotations from BioChem.Interfaces.Compartments tp BioChem.Icons.Interfaces.Compartments

* mpve unit package annotations to BioChem.Icons.Units

* move graphical annotations of BioChem.Interfaces to BioChem.Icons.Interfaces

* remove unnecessary extra models

* complete package names

* Move graphical annotations of reactions to BioChem.Icons.Interfaces.Reactions package

* fix

* clean

* complete package name and remove unnecessary annotations

* clean

* icons to be classes instead of models. delete unnecessary icons.

Co-authored-by: Martin Sjölund <martin@sjoelund.se>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants