Skip to content
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

Jump to bottom

Fix definition of specificInternalEnergy in MoistAir #3204

Merged
merged 2 commits into from
Nov 7, 2019
Merged

Fix definition of specificInternalEnergy in MoistAir #3204

merged 2 commits into from
Nov 7, 2019

Conversation

beutlich
Copy link
Member

@beutlich beutlich commented Nov 6, 2019

Closes #3099.

@beutlich
refs modelica#3099: Remove superfluous function output
3abbcc0 
The function output `u` must not be defined again (especially not with a different type) in case of redeclare extends.
@beutlich
refs modelica#3099: Also test specificInternalEnergy
1c7401e
@beutlich beutlich added bug Critical/severe issue L: Media Issue addresses Modelica.Media labels Nov 6, 2019
@beutlich beutlich added this to the MSL4.0.0 milestone Nov 6, 2019
@beutlich beutlich self-assigned this Nov 6, 2019
maltelenz
maltelenz approved these changes Nov 7, 2019
View reviewed changes
Copy link
Contributor

@maltelenz maltelenz left a comment

Choose a reason for hiding this comment

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

Now passes error checking in SystemModeler.

@beutlich beutlich assigned dietmarw and unassigned beutlich Nov 7, 2019
@beutlich beutlich removed the request for review from HansOlsson November 7, 2019 22:00
@beutlich beutlich assigned beutlich and unassigned dietmarw Nov 7, 2019
@beutlich beutlich merged commit e774040 into modelica:master Nov 7, 2019
@beutlich beutlich deleted the fix-specificInternalEnergy-definition branch November 7, 2019 22:01
@beutlich beutlich mentioned this pull request Nov 7, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thorade thorade thorade approved these changes

@maltelenz maltelenz maltelenz approved these changes

Assignees

@beutlich beutlich

Labels
bug Critical/severe issue L: Media Issue addresses Modelica.Media
Projects
None yet
Milestone
MSL4.0.0
Development

Successfully merging this pull request may close these issues.

Non-identical declarations in Media.Air.MoistAir
4 participants
@beutlich @thorade @maltelenz @dietmarw