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

disabled homotopy for #1221 #1222

Merged
merged 14 commits into from
Nov 19, 2019
Merged

disabled homotopy for #1221 #1222

merged 14 commits into from
Nov 19, 2019

Conversation

Mathadon
Copy link
Member

closes #1221

@Mathadon Mathadon assigned Mathadon and unassigned mwetter Oct 21, 2019
@Mathadon
Copy link
Member Author

Mathadon commented Nov 9, 2019

@mwetter Only now I realize that only the JModelica unit tests are failing. Any chance that they are not yet using the latest version of MSL that includes the homotopy option?

@Mathadon Mathadon assigned mwetter and unassigned Mathadon Nov 12, 2019
@mwetter
Copy link
Contributor

mwetter commented Nov 13, 2019

@Mathadon : It looks like JModelica is not yet using the latest MSL that has the homotopy option.

@Mathadon
Copy link
Member Author

Not sure how to best approach that? It would make sense to use the same MSL version for the testing of the library. Alternatively we can duplicate the implementation of the model that was changed in the latest MSL release.

@mwetter
Copy link
Contributor

mwetter commented Nov 14, 2019

@Mathadon : The current JModelica trunk uses MSL 3.2.2, as does OMEdit, but the new limiter is from 3.2.3.
I think best would be to make the new limiter a protected class in LimPID and then use this until JModelica and OpenModelica updates to 3.2.3.

@Mathadon
Copy link
Member Author

@mwetter done. I did not exactly copy the implementation since this would require me to also copy Modelica.Blocks.Types.HomotopyType, which does not exist in MSL 3.2.2. Instead I stripped the homotopyType option from the implementation of MSL 3.2.3 and hardcoded the code for option NoHomotopy.

@mwetter mwetter merged commit e17ca51 into master Nov 19, 2019
@mwetter mwetter deleted the issue1221_limiterHomotopy branch November 19, 2019 19:38
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.

Unbounded limiter in MSL 3.2.3 causes negative phi
2 participants