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

Move test-only models TestWallFriction and TestWallFrictionAndGravity to ModelicaTest #3383

Merged
merged 1 commit into from
Feb 3, 2020
Merged

Move test-only models TestWallFriction and TestWallFrictionAndGravity to ModelicaTest #3383

merged 1 commit into from
Feb 3, 2020

Conversation

beutlich
Copy link
Member

Move the test-only models

  • Modelica.Fluid.Fittings.BaseClasses.QuadraticTurbulent.TestWallFriction
  • Modelica.Fluid.Pipes.BaseClasses.WallFriction.TestWallFrictionAndGravity

to ModelicaTest.Fluid.BaseClasses.

Closes #3378.

@beutlich beutlich added L: Fluid Issue addresses Modelica.Fluid (excl. Dissipation) L: ModelicaTest Issue addresses ModelicaTest, ModelicaTestConversion4 or ModelicaTestOverdetermined task General work that is not related to a bug or feature labels Jan 31, 2020
@beutlich beutlich added this to the MSL4.0.0 milestone Jan 31, 2020
@beutlich beutlich self-assigned this Jan 31, 2020
casella
casella reviewed Feb 1, 2020
View reviewed changes
Copy link
Contributor

@casella casella left a comment

Choose a reason for hiding this comment

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

The idea sounds good to me, I do not understand what the conflict reported by github actually means

@beutlich
Copy link
Member Author

beutlich commented Feb 1, 2020

The idea sounds good to me, I do not understand what the conflict reported by github actually means

This was due to the SIunits renaming that happened on the same lines as removed by this PR. It is resolved now.

@beutlich beutlich requested a review from casella February 2, 2020 12:18
@beutlich beutlich removed the request for review from casella February 3, 2020 09:57
@beutlich beutlich merged commit c53aa26 into modelica:master Feb 3, 2020
@beutlich beutlich deleted the remove-test-only-models branch February 3, 2020 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@casella casella casella left review comments

@dietmarw dietmarw dietmarw approved these changes

@wischhusen wischhusen wischhusen approved these changes

Assignees

@beutlich beutlich

Labels
L: Fluid Issue addresses Modelica.Fluid (excl. Dissipation) L: ModelicaTest Issue addresses ModelicaTest, ModelicaTestConversion4 or ModelicaTestOverdetermined task General work that is not related to a bug or feature
Projects
None yet
Milestone
MSL4.0.0
Development

Successfully merging this pull request may close these issues.

TestWallFriction fails with pedantic check
4 participants
@beutlich @dietmarw @wischhusen @casella