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

Tchipev fixes mixing rules #76

Closed
wants to merge 5 commits into from
Closed

Conversation

tchipev
Copy link

@tchipev tchipev commented Apr 12, 2019

Fix #74 and #75 and many of #73 .

Copy link
Contributor

@pramathe pramathe left a comment

Choose a reason for hiding this comment

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

I think this ugly lines distributed on many spots in the code should be removed completely. Mixing rules parameters should be read only via XML and be stored at only one reasonable location in the code.

Copy link
Contributor

@pramathe pramathe left a comment

Choose a reason for hiding this comment

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

I think we should get rid of this check in Simulation.cpp completely. There should be a check at the location directly when reading in the mixing rule parameters, if they are corrupted like to less or to many values specified.

Copy link
Contributor

@pramathe pramathe left a comment

Choose a reason for hiding this comment

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

I dont think that this is correct. Should be symmetric.

@SteffenSeckler
Copy link
Member

@tchipev any update on this?

@tchipev
Copy link
Author

tchipev commented Apr 29, 2019

Hi, I've modified the changes accordingly, but not pushed them yet. I need to test them and can then commit. Will try to get to it today or tomorrow.

@tchipev
Copy link
Author

tchipev commented Apr 30, 2019

OK, should be good now.

@SteffenSeckler
Copy link
Member

the tests are failing for this PR. Can you adapt them?

@tchipev
Copy link
Author

tchipev commented Aug 5, 2019

Sorry, I don't have the code in my head anymore. Could you please take over?

I think I added more safety checks and changed the program to abort in case of dubious input (when only some mixing rules are specified). This, however, breaks backwards compatibility which were the failing checks, if I remember correctly. Since this breaks backwards compatibility, maybe you can briefly discuss it with application users.

Thanks!

Copy link
Member

@SteffenSeckler SteffenSeckler left a comment

Choose a reason for hiding this comment

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

not mergable as tests have to be adapted

@tchipev
Copy link
Author

tchipev commented Jan 29, 2021 via email

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.

Initialization of special mixing rules in XML is order dependent and ignores the "cid1" and "cid2" values
3 participants