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

Issue302 inverse x #304

Merged
merged 24 commits into from Aug 12, 2015
Merged

Issue302 inverse x #304

merged 24 commits into from Aug 12, 2015

Conversation

mwetter
Copy link
Contributor

@mwetter mwetter commented Aug 11, 2015

This is ready to merge when the fixme's are addressed by @marcusfuchs in #301.

This merge contains the reimplementation of the flow functions for #301 and a bug fix for #302 .
The example Annex60.Utilities.Math.Functions.Examples.InverseXRegularized has been revised to also plot the 1st and 2nd derivative of Annex60.Utilities.Math.Functions.inverseXRegularized which has been newly implemented as the old implementation was only once continuously differentiable.

@mwetter
Copy link
Contributor Author

mwetter commented Aug 11, 2015

@marcusfuchs
Please hold off with reviewing inverseXRegularized as I am working on a more efficient implementation.
The other changes from #301 won't be affect, hence they are ready for review.

@mwetter
Copy link
Contributor Author

mwetter commented Aug 11, 2015

@marcusfuchs
This is ready to be merged. I merged it already to the master of the Buildings library in lbl-srg/modelica-buildings#448

Across a few large test models, the simulation time is about 5% to 10% faster.

@marcusfuchs
Copy link
Contributor

@mwetter : Github warns of conflicts for this merge. Should I go ahead and resolve these conflicts or is there something wrong with the current version?

marcusfuchs added 2 commits August 12, 2015 12:00
 into issue302_inverseX

Conflicts:
	Annex60/Fluid/Interfaces/StaticTwoPortConservationEquation.mo
	Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_HeatExchangers_Validation_ConstantEffectiveness.txt
	Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_Interfaces_Examples_Humidifier_u.txt
@marcusfuchs
Copy link
Contributor

I now deleted FirstDerivative, SecondDerivative and FlowFunctions as suggested in #301 and fixed the merge conflicts by using the more recent versions of the 3 files.
@mwetter: If this is ok with you, I (or you again) can merge this, as from my side all changes appear to be fine.

@mwetter mwetter merged commit 8cffd18 into master Aug 12, 2015
@mwetter mwetter deleted the issue302_inverseX branch August 12, 2015 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants