Made engine designs consistent w.r.t. the whole design scenario #3133

christoff-buerger · 2019-10-04T10:57:29Z

This pull request fixes the inconsistencies between the Engine1a, Engine1b and Engine1b_analytic models of Mechanics.MultiBody.Examples.Loops. For details about these, please cf. Section 4.2 of Modelica language extensions for practical non-monotonic modelling: on the need for selective model extension.

The pull request fixes #3132.

The changes are:

Consistent stop times:
- Engine1b, Engine1b_analytic: stop time set from 0.5 to 5 (the time of Engine1a)
Consistent inertias:
- Engine1bBase (=> Engine1b, Engine1b_analytic): set inertia(J = 1 "kg m^2") (the inertia of Engine1a)
Consistent FixedTranslation of cycle position:
- Engine1bBase (=> Engine1b, Engine1b_analytic): set cylPosition(r = {0.15,0.45,0}) (the cycle position of Engine1a)
Consistent piston <-> cylinder connections:
- Engine1b: connected pistion.a with cyclinder.b instead of rod3.a (the connection of Engine1a)
Consistent bearings:
- Engine1b:
  - switched bearings b1 and b2 (according to Engine1a)
  - turned rod1 and connectingRod respectively
  - set rod1.r and connectingRod.r to {0,-0.2,0} (according to Engine1a)
Improved, consistent graphical layout

Goal: Integrate the Modelica_Synchronous library into the MSL 4.0.0 under the name Modelica.Clocked. Reference to the code which is the starting point of this integration task: modelica/Modelica_Synchronous@0416c85

Manually fix remaining text occurences related to the switch from "Modelica_Synchronous" to Modelica.Clocked.

The models in WorkInProgress.mo are experimental and nobody worked at them for a long time. Should be moved out of the main repository (may preserve the package in a feature branch in my fork of the main repo).

Fixes modelica#2949#discussion_r286627826.

Fixes modelica#2949 (comment).

Using the suffix _der to denote a derivative is more idiomatic Modelica code

Removed as requested in review, related to discussion in modelica#2494.

Replaced assert(not trigger_interval==0, "...") by assert(trigger_interval > 0 or trigger_interval < 0, "...")

beutlich

Very nice.

…Library

…ModelicaStandardLibrary

…e now diagramatically represented, improved diagram layout, improved documentation, eliminated rotational clock duplicate and use of engine synchronization instead as single source of sampling).

dietmarw · 2019-10-08T15:02:23Z

Please rebase on current master.

beutlich · 2019-10-08T18:03:36Z

@christoff-buerger Can we please have two separate fixes here:

One, targeting the existing models of MultiBody which I already reviewed.
Another one, targeting Modelica.Clocked which you can directly commit to the corresponding feature branch (since Modelica.Clocked is new in MSL anyway).

@beutlich

…lings are now diagramatically represented, improved diagram layout, improved documentation, eliminated rotational clock duplicate and use of engine synchronization instead as single source of sampling)." This reverts commit 9dc348d. As requested in modelica#3132 by @beutlich.

@beutlich

…lings are now diagramatically represented, improved diagram layout, improved documentation, eliminated rotational clock duplicate and use of engine synchronization instead as single source of sampling)." This reverts commit ad35571. As requested in modelica#3132 by @beutlich.

…-thiele/ModelicaStandardLibrary" This reverts commit b2d0067, reversing changes made to 11fd222.

christoff-buerger · 2019-10-09T10:23:41Z

@christoff-buerger Can we please have two separate fixes here:

One, targeting the existing models of MultiBody which I already reviewed.

Another one, targeting Modelica.Clocked which you can directly commit to the corresponding feature branch (since Modelica.Clocked is new in MSL anyway).

@beutlich: I am sorry for the chaos; I merged the synchronous stuff in by accident due to missing rights. It should be alright now again (I reverted the problematic commit for the pull-request).

beutlich · 2019-10-09T14:51:42Z

I am sorry for the chaos

I'll do a squash-merge later such that the back-and-forth commits will be removed from history,

tobolar

Well, some consistency requirements are really tough, e.g.

Consistent piston <-> cylinder connections:
Engine1b: connected pistion.a with cyclinder.b instead of rod3.a (the connection of Engine1a)

But fine to me. Now I even changed Engine1a to extend from Engine1bBase as well.

beutlich · 2019-10-09T15:20:46Z

For the future, it is safer if you do not create PRs from master. You should use dedicated branches instead.

christoff-buerger · 2019-10-10T09:42:41Z

Now I even changed Engine1a to extend from Engine1bBase as well.

@tobolar: I do not understand how that can be done? Engine1a is a model without the gas force of the cylinder; the intention of Engine1bBase is to introduce the gas force such that Engine1b and Engine1b_analytic consider the gas-force. The whole catch of this inheritance hierarchy is that it is cross-cutting and cannot be modeled as a straight forward inheritance.

I think your commit fa75454 is wrong and should be undone!

christoff-buerger · 2019-10-10T10:26:35Z

I checked now the version with the last changes of @tobolar, particular fa75454.

We should revisit this. The now common base model Engine1bBase has as description "Model of one cylinder engine with gas force", but the gas-force has been removed in it. Instead, Engine1b and Engine1b_analytic individually reintroduce it.

I see two approaches to fix this:

Undo fa75454

or the following steps

Change the description of Engine1bBase to "Common model of one cylinder engine without gas force."
Introduce another new base-class, Engine1bBase_GasForce, which also includes the gas-force and inherits from Engine1bBase; its description would be "Common model of one cylinder engine with gas force."
Let Engine1b and Engine1b_analytic inherit from Engine1bBase_GasForce and Engine1a inherit from Engine1bBase.

@beutlich: How do you like us to proceed? New branch and pull request?

beutlich · 2019-10-10T12:52:29Z

New branch and pull request?

Exactly. Thank you.

Fix for last-minute errors of #3133 pull request

bernhard-thiele and others added 30 commits May 22, 2019 17:16

Move Modelica_Synchronous to Modelica.Clocked (modelica#2862)

a0e8b43

Goal: Integrate the Modelica_Synchronous library into the MSL 4.0.0 under the name Modelica.Clocked. Reference to the code which is the starting point of this integration task: modelica/Modelica_Synchronous@0416c85

Modelica.Clocked: Add/fix images (modelica#2862)

006d88c

Modelica.Clocked: Add "Documentation" resources (modelica#2862)

f774fc9

Modelica.Clocked: Fix internal links (modelica#2862)

4d51ba0

Modelica.Clocked: Manual text/code fixes (modelica#2862)

4e47019

Manually fix remaining text occurences related to the switch from "Modelica_Synchronous" to Modelica.Clocked.

Modelica.Clocked: Remove WorkInProgress.mo (modelica#2862)

e55a6d5

The models in WorkInProgress.mo are experimental and nobody worked at them for a long time. Should be moved out of the main repository (may preserve the package in a feature branch in my fork of the main repo).

Replace obsolete BlockIcon by Icons.Block (modelica#2862)

4967cfc

Fixes modelica#2949#discussion_r286627826.

Remove renaming import (modelica#2862)

3f2db7e

Fixes modelica#2949 (comment).

Start descriptions with upper-case letter (modelica#2862)

da3507a

Replaced xxx_dot by xxx_der (modelica#2862)

9c605f7

Using the suffix _der to denote a derivative is more idiomatic Modelica code

Unit attributes in the EngineThrottleControl example (modelica#2862)

9660ef1

Added references to EngineThrottleControl example (modelica#2862)

7f1204c

Resolved TODOs (modelica#2862)

68a576e

Removed quantity attributes (modelica#2862)

733c4df

Removed as requested in review, related to discussion in modelica#2494.

Replaced <b> by <strong> tags (modelica#2862)

f60deec

Replaced <i> by <em> tags (modelica#2862)

d9f9838

Fix typos (modelica#2862)

3f02e12

Remove dummy graphics annotation (modelica#2862)

2d619d6

Fix typo (modelica#2862)

b21e0cb

Rename Engine2 -> Engine

271f088

UsersGuide and package documentation updates (modelica#2862)

383a48c

Fix typos (modelica#2862)

ee60e44

Use lower-case HTML tags (modelica#2862)

1cdb024

Avoid Boolean comparison with Real in DynamicSelect (modelica#2862)

7f00189

Fixed documentation for ClockInput and ClockOutput (modelica#2862)

6642b85

Removed nonsensical DynamicSelect in ClockToBoolean (modelica#2862)

c62d324

Added alt attribute to figures in Clocked/UsersGuide.mo (modelica#2862)

93d85b3

Reformulate assert for better tool compatibility (modelica#2862)

9071714

Replaced assert(not trigger_interval==0, "...") by assert(trigger_interval > 0 or trigger_interval < 0, "...")

Added alt attributes to all figures in Clocked (modelica#2862)

a868be2

Fix syntax error (modelica#2862)

6b121de

beutlich approved these changes Oct 4, 2019

View reviewed changes

christoff-buerger added 4 commits October 7, 2019 09:54

Merge branch 'master' of https://github.com/modelica/ModelicaStandard…

11fd222

…Library

Merge branch 'feature/Clocked' of https://github.com/bernhard-thiele/…

b2d0067

…ModelicaStandardLibrary

modelica#2949: Improved 'EngineThrottleControl' example (samplings ar…

ad35571

…e now diagramatically represented, improved diagram layout, improved documentation, eliminated rotational clock duplicate and use of engine synchronization instead as single source of sampling).

modelica#2949: Improved 'EngineThrottleControl' example (samplings ar…

9dc348d

…e now diagramatically represented, improved diagram layout, improved documentation, eliminated rotational clock duplicate and use of engine synchronization instead as single source of sampling).

christoff-buerger added 3 commits October 9, 2019 12:17

Revert "Merge branch 'feature/Clocked' of https://github.com/bernhard…

53e4084

…-thiele/ModelicaStandardLibrary" This reverts commit b2d0067, reversing changes made to 11fd222.

tobolar added 3 commits October 9, 2019 16:47

Redesign object diagram

dfb1e2d

Extend from Engine1bBase (for consistency with other Engine1X examples)

fa75454

Change order of instances in model code

ff467a4

tobolar approved these changes Oct 9, 2019

View reviewed changes

tobolar changed the title ~~#3132: Made engine designs consistent w.r.t. the whole design scenario.~~ Made engine designs consistent w.r.t. the whole design scenario Oct 9, 2019

beutlich removed the request for review from MartinOtter October 9, 2019 15:11

beutlich merged commit e6c7cca into modelica:master Oct 9, 2019

christoff-buerger added a commit to christoff-buerger/ModelicaStandardLibrary that referenced this pull request Oct 10, 2019

Fixed problems of last-minute changes of modelica#3133.

0510c81

christoff-buerger added a commit to christoff-buerger/ModelicaStandardLibrary that referenced this pull request Oct 11, 2019

modelica#3133-fix

36ab280

christoff-buerger mentioned this pull request Oct 11, 2019

Fix for last-minute errors of #3133 pull request #3146

Merged

christoff-buerger added a commit to christoff-buerger/ModelicaStandardLibrary that referenced this pull request Oct 30, 2019

modelica#3133-fix: Incorporated review comments of @tobolar.

40f3681

beutlich pushed a commit to beutlich/ModelicaStandardLibrary that referenced this pull request Nov 29, 2019

refs modelica#3133, modelica#3146: Fix for erroneous last-minute changes

2ae72fa

beutlich pushed a commit to christoff-buerger/ModelicaStandardLibrary that referenced this pull request Dec 5, 2019

refs modelica#3133, modelica#3146: Fix for erroneous last-minute changes

c119e90

beutlich added a commit that referenced this pull request Dec 5, 2019

Merge pull request #3146 from christoff-buerger/#3133-fix

9bc17ef

Fix for last-minute errors of #3133 pull request

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Made engine designs consistent w.r.t. the whole design scenario #3133

Made engine designs consistent w.r.t. the whole design scenario #3133

christoff-buerger commented Oct 4, 2019 •

edited by beutlich

beutlich left a comment

dietmarw commented Oct 8, 2019

beutlich commented Oct 8, 2019 •

edited

christoff-buerger commented Oct 9, 2019

beutlich commented Oct 9, 2019

tobolar left a comment

beutlich commented Oct 9, 2019

christoff-buerger commented Oct 10, 2019 •

edited

christoff-buerger commented Oct 10, 2019 •

edited

beutlich commented Oct 10, 2019

Made engine designs consistent w.r.t. the whole design scenario #3133

Made engine designs consistent w.r.t. the whole design scenario #3133

Conversation

christoff-buerger commented Oct 4, 2019 • edited by beutlich

beutlich left a comment

Choose a reason for hiding this comment

dietmarw commented Oct 8, 2019

beutlich commented Oct 8, 2019 • edited

christoff-buerger commented Oct 9, 2019

beutlich commented Oct 9, 2019

tobolar left a comment

Choose a reason for hiding this comment

beutlich commented Oct 9, 2019

christoff-buerger commented Oct 10, 2019 • edited

christoff-buerger commented Oct 10, 2019 • edited

beutlich commented Oct 10, 2019

christoff-buerger commented Oct 4, 2019 •

edited by beutlich

beutlich commented Oct 8, 2019 •

edited

christoff-buerger commented Oct 10, 2019 •

edited

christoff-buerger commented Oct 10, 2019 •

edited