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

Split Thermal.{FluidHeatFlow, HeatTransfer} into single files #3061

Merged
merged 2 commits into from
Jul 23, 2019

Conversation

AHaumer
Copy link
Contributor

@AHaumer AHaumer commented Jul 18, 2019

Since for Thermal there are no open PRs at this time, I'd want to grab the opportunity and split the sublibraries into single files

@AHaumer AHaumer added enhancement New feature or enhancement L: Thermal.FluidHeatFlow Issue addresses Modelica.Thermal.FluidHeatFlow L: Thermal.HeatTransfer Issue addresses Modelica.Thermal.HeatTransfer P: highest Highest priority issue labels Jul 18, 2019
@AHaumer AHaumer added this to the MSL4.0.0 milestone Jul 18, 2019
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.

Sorry, I am not a supporter of these changes.

@AHaumer
Copy link
Contributor Author

AHaumer commented Jul 18, 2019

@beutlich what's the reason?

@beutlich
Copy link
Member

  • Probably a personal aspect: I do all my editing (basically the many renaming bulk changes) in Notepad++. The less files I see the more convenient it gets w.r.t. to opened files in Notepad++.

  • I assigned @dietmarw who will be happy to merge it though. 😛

@beutlich
Copy link
Member

Same holds for Search+Replace. If I want to check if the "Ah" issue is resolved in the other PR, I previously only needed to search in Batteries.mo. Now I need to check 36 files (excluding the package.order files) to see which file it actually was in. Thus in Notepad++ I can no longer do a single file search but need to do a directory search (where search hits are given as list). For me it simply is less convenient.

@DrMartinKuhn
Copy link

So it is more a matter of tools. Dymola itself got quite efficient with renaming and search for usage by other components. Nevertheless, I would prefer files since changes for one model do not affect a whole sub-library. @AHaumer : I think this is a very general problem and should be agreed among the library officers.

@christiankral
Copy link
Contributor

@DrMartinKuhn The library officers of both Thermal libraries are @AHaumer and @christiankral and we are both very much in favor of splitting the sub-libraries into single files. However, we need two positive approvals in order to be able to merge to PR into the master branch.

Copy link

@DrMartinKuhn DrMartinKuhn left a comment

Choose a reason for hiding this comment

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

In this case I approve the change and invite Thomas to have a beer discussion on tool issues

@beutlich
Copy link
Member

However, we need two positive approvals in order to be able to merge to PR into the master branch.

To be exact: At least two positive approvals and no negative review.

@beutlich beutlich added task General work that is not related to a bug or feature and removed enhancement New feature or enhancement labels Jul 23, 2019
@beutlich beutlich changed the title split Thermal.{FluidHeatFlow, HeatTransfer} into single files Split Thermal.{FluidHeatFlow, HeatTransfer} into single files Jul 23, 2019
@AHaumer
Copy link
Contributor Author

AHaumer commented Jul 23, 2019

Hm I've no idea how to resolve the conflicts. Seems to be the old "all-in-one" files that should be deleted, merging the directorires (with single files). Who could help me, please?

@beutlich
Copy link
Member

Hm I've no idea how to resolve the conflicts. Seems to be the old "all-in-one" files that should be deleted, merging the directorires (with single files). Who could help me, please?

Done.

@AHaumer
Copy link
Contributor Author

AHaumer commented Jul 23, 2019

@beurlich thanks a lot - just to learn: how did you do that?

@AHaumer AHaumer merged commit 093bd78 into modelica:master Jul 23, 2019
@beutlich beutlich removed the request for review from dietmarw July 23, 2019 15:29
@beutlich beutlich assigned AHaumer and unassigned dietmarw Jul 23, 2019
@AHaumer AHaumer deleted the SplitThermal branch July 23, 2019 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
L: Thermal.FluidHeatFlow Issue addresses Modelica.Thermal.FluidHeatFlow L: Thermal.HeatTransfer Issue addresses Modelica.Thermal.HeatTransfer P: highest Highest priority issue task General work that is not related to a bug or feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants