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 inconsistent partial model naming in Modelica.Magnetic #2998

Merged
merged 16 commits into from
Jul 16, 2019
Merged

Fix inconsistent partial model naming in Modelica.Magnetic #2998

merged 16 commits into from
Jul 16, 2019

Conversation

christiankral
Copy link
Contributor

@christiankral christiankral commented Jun 22, 2019 •
edited by beutlich

close #496

@christiankral christiankral added L: Magnetic.FundamentalWave Issue addresses Modelica.Magnetic.FundamentalWave L: Magnetic.QuasiStatic Issue addresses Modelica.Magnetic.QuasiStatic labels Jun 22, 2019
@christiankral christiankral added this to the MSL4.0.0 milestone Jun 22, 2019
beutlich
beutlich reviewed Jun 25, 2019
View reviewed changes
Copy link
Member

@beutlich beutlich left a comment

Choose a reason for hiding this comment

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

Do you also want to rename the classes in Magnetic.FluxTubes.Interfaces (since #496 also is on Magnetic.FluxTubes)?

@christiankral
Copy link
Contributor Author

christiankral commented Jun 26, 2019 •
edited

Yes, I will include it in this PR in the next couple days:

  • I will remove the "Partial" from the names
  • I will leave the remaining names as they are

The partial heat port actually will be covered by #359. I will not rename it by now.

christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Move FixedShape and Leakage to BaseClasses
7b4f478 
Based on comments of modelica#2997
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Move BasicMachine to BaseClasses.Machine
931c31e 
Based on comment of modelica#2997
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Add conversion script to BaseClasses
4483b0e
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Move BaseMachine to BaseClasses.Machine
f6cd813
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Fix wrong path in conversion script
2e8f220
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Update HTML documentation of BaseClasses
7fdea9f
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Add conversion script to BaseClasses
5dd887f
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Move BaseMachine to BaseClasses.Machine
e0a0f9f
christiankral added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral
Refs modelica#2998: Fix wrong path in conversion script
341644d
@christiankral
Copy link
Contributor Author

christiankral commented Jul 2, 2019 •
edited

Grrrmpf! Where do these conflicts come from? I do not know how to deal with that. @beutlich Please help again -- this somehow happened after I force-pushed a wrong commit message through GitKraken: what did I wrong?

@beutlich
Copy link
Member

beutlich commented Jul 2, 2019

Will do. Hang on.

beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral @beutlich
Refs modelica#2998: Move FixedShape and Leakage to BaseClasses
85cc735 
Based on comments of modelica#2997
beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral @beutlich
Refs modelica#2998: Move BasicMachine to BaseClasses.Machine
86b86c6 
Based on comment of modelica#2997
beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral @beutlich
Refs modelica#2998: Update HTML documentation of BaseClasses
4e8e193
beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral @beutlich
Refs modelica#2998: Add conversion script to BaseClasses
40d0053
beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral @beutlich
Refs modelica#2998: Move BaseMachine to BaseClasses.Machine
727f9d7
beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 2, 2019
@christiankral @beutlich
Refs modelica#2998: Fix wrong path in conversion script
e1157d0
@beutlich
Copy link
Member

beutlich commented Jul 2, 2019

@beutlich Please help again

Done.

@christiankral
Copy link
Contributor Author

Thanks a lot!

beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 13, 2019
@christiankral @beutlich
Refs modelica#2998: Add conversion script to BaseClasses
c13c0fd
beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 13, 2019
@christiankral @beutlich
Refs modelica#2998: Move BaseMachine to BaseClasses.Machine
77a1083
beutlich pushed a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 13, 2019
@christiankral @beutlich
Refs modelica#2998: Fix wrong path in conversion script
1efefda
beutlich added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 13, 2019
@beutlich
refs modelica#2998: Fix merge conflicts
a5b2fa8
@AHaumer
Copy link
Contributor

AHaumer commented Jul 13, 2019

Merging that PR, wouldn't we spill the big amount of work done for renaming MulitPhase to Polyphase, AsynchronousInductionMachine to InductionMachine and so on?

@beutlich
Copy link
Member

beutlich commented Jul 13, 2019 •
edited

Merging that PR, wouldn't we spill the big amount of work done for renaming MulitPhase to Polyphase, AsynchronousInductionMachine to InductionMachine and so on?

No, (hopefully) all save to merge, since I rebased and resolved the conflicts (several times).

beutlich added a commit to christiankral/ModelicaStandardLibrary that referenced this pull request Jul 14, 2019
@beutlich
refs modelica#2998: Fix merge conflicts
09ee6f7
AHaumer
AHaumer approved these changes Jul 15, 2019
View reviewed changes
Copy link
Contributor

@AHaumer AHaumer left a comment

Choose a reason for hiding this comment

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

provided the mentioned renaming isn't spoiled ...

christiankral and others added 16 commits July 16, 2019 09:54
@christiankral @beutlich
Refs modelica#496: Remove Partial from name and fix naming of interfa…
31d33fd 
…ce models

Magnetic.FundamentalWave
@christiankral @beutlich
Revert "Refs modelica#496: Remove Partial from name and fix naming of…
fbc9588 
… interface models"

This reverts commit 074762f.
@christiankral @beutlich
Refs modelica#496: Fix naming of interface models
9bd21bd 
Magnetic.FundamentalWave
@christiankral @beutlich
Refs modelica#496: Fix naming of interface models
51e67d8 
Magnetic.QuasiStatic.FundamentalWave
@christiankral @beutlich
Refs modelica#496: Fix naming of interface models
657c437 
Magnetic.QuasiStatic.FluxTubes
@christiankral @beutlich
Refs modelica#496: Create conversion script and conversion test models
b4bdc93
@christiankral @beutlich
Fix accidentally introduced dependency
6398ecc
@christiankral @beutlich
Fix naming and links of documentation
320931a
@christiankral @beutlich
Straighten structure of ModelicaTestConversion4.mo
901362f 
Remove unnecessary package structure
@christiankral @beutlich
Refs modelica#2998: Move FixedShape and Leakage to BaseClasses
08e502a 
Based on comments of modelica#2997
@christiankral @beutlich
Refs modelica#2998: Move BasicMachine to BaseClasses.Machine
0857efd 
Based on comment of modelica#2997
@christiankral @beutlich
Refs modelica#2998: Update HTML documentation of BaseClasses
c998997
@christiankral @beutlich
Refs modelica#2998: Add conversion script to BaseClasses
98230a3
@christiankral @beutlich
Refs modelica#2998: Move BaseMachine to BaseClasses.Machine
49bc5bd
@christiankral @beutlich
Refs modelica#2998: Fix wrong path in conversion script
dde728d
@beutlich
refs modelica#2998: Fix merge conflicts
dd5d968
@beutlich beutlich removed the request for review from dietmarw July 16, 2019 08:08
@beutlich beutlich added the task General work that is not related to a bug or feature label Jul 16, 2019
@beutlich beutlich merged commit 964f644 into modelica:master Jul 16, 2019
@beutlich beutlich mentioned this pull request Jul 16, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dietmarw dietmarw dietmarw left review comments

@AHaumer AHaumer AHaumer approved these changes

@beutlich beutlich beutlich approved these changes

Assignees

@beutlich beutlich

Labels
L: Magnetic.FundamentalWave Issue addresses Modelica.Magnetic.FundamentalWave L: Magnetic.QuasiStatic Issue addresses Modelica.Magnetic.QuasiStatic 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.

Inconsistent partial model naming in Modelica.Magnetic
4 participants
@christiankral @beutlich @AHaumer @dietmarw