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.

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

Add shapes HollowCylinderCircumferentialFlux and Toroid #3226

Merged
merged 46 commits into from
Dec 15, 2019

Conversation

AHaumer
Copy link
Contributor

@AHaumer AHaumer commented Nov 12, 2019

according to #3218:
added shape HollowCylinderCircumferentialFlux and a test example
added shape Toroid (with circular cross section) and a test example

@AHaumer AHaumer added enhancement New feature or enhancement L: Magnetic.FluxTubes Issue addresses Modelica.Magnetic.FluxTubes labels Nov 12, 2019
@AHaumer AHaumer added this to the MSL4.0.0 milestone Nov 12, 2019
@AHaumer AHaumer self-assigned this Nov 12, 2019
@AHaumer AHaumer mentioned this pull request Nov 12, 2019
7 tasks
@DrMartinKuhn
Copy link

I know, this is about the example, but could you please confirm the correct layout of the toroid?
Toroid

AHaumer and others added 6 commits December 1, 2019 10:07
…eAirgap.mo

Co-Authored-By: Thomas Beutlich <modelica@tbeu.de>
…eAirgap.mo

Co-Authored-By: Thomas Beutlich <modelica@tbeu.de>
…eQuadraticCrossSection.mo

Co-Authored-By: Thomas Beutlich <modelica@tbeu.de>
…eQuadraticCrossSection.mo

Co-Authored-By: Thomas Beutlich <modelica@tbeu.de>
@AHaumer
Copy link
Contributor Author

AHaumer commented Dec 2, 2019

Why has this PR been closed?

@AHaumer AHaumer reopened this Dec 2, 2019
@DrMartinKuhn DrMartinKuhn self-requested a review December 2, 2019 21:33
AHaumer and others added 7 commits December 8, 2019 20:47
…rcumferentialFlux.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
…rcumferentialFlux.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
@beutlich
Copy link
Member

beutlich commented Dec 8, 2019

Fixed the merge conflict in Modelica.Magnetic.FluxTubes.Icons va rebasing. This is how it Looks now:

image

@AHaumer
Copy link
Contributor Author

AHaumer commented Dec 9, 2019

@beutlich Thanks for fixing the merge conflict. Yes that's how they should look. We need one more approval for merging.

@AHaumer
Copy link
Contributor Author

AHaumer commented Dec 11, 2019

@christiankral are all your change requests satisfied?

Copy link
Member

@dietmarw dietmarw left a comment

Choose a reason for hiding this comment

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

Please accept the documentation improvements.

AHaumer and others added 7 commits December 12, 2019 20:33
…eAirgap.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
…eQuadraticCrossSection.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
…rcumferentialFlux.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
…rcumferentialFlux.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
…rcumferentialFlux.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
AHaumer and others added 2 commits December 12, 2019 21:22
…dardLibrary into FluxTubes04NewShapes

# Conflicts:
#	Modelica/Magnetic/FluxTubes/Examples/BasicExamples/ToroidalCoreAirgap.mo
#	Modelica/Magnetic/FluxTubes/Examples/BasicExamples/ToroidalCoreQuadraticCrossSection.mo
#	Modelica/Magnetic/FluxTubes/Icons/package.mo
#	Modelica/Magnetic/FluxTubes/Icons/package.order
#	Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo
#	Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Toroid.mo
…rcumferentialFlux.mo

Co-Authored-By: Dietmar Winkler <dietmar.winkler@dwe.no>
@AHaumer AHaumer dismissed dietmarw’s stale review December 15, 2019 06:37

should be resolved

@AHaumer AHaumer merged commit d74ec15 into modelica:master Dec 15, 2019
@beutlich beutlich changed the title Flux tubes04 Add shapes HollowCylinderCircumferentialFlux and Toroid Dec 15, 2019
@AHaumer AHaumer deleted the FluxTubes04 branch January 8, 2020 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or enhancement L: Magnetic.FluxTubes Issue addresses Modelica.Magnetic.FluxTubes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants