Skip to content

Conversation

@mkrack
Copy link
Member

@mkrack mkrack commented Dec 8, 2023

The new keyword IGNORE_CONVERGENCE_FAILURE can be set to obtain the old permissive behaviour. It replaces the keyword NOTCONV_STOPALL which enforced until now the strict behaviour which is now the default.

@oschuett
Copy link
Member

oschuett commented Dec 8, 2023

Oh wow, how did you format all our test input files? Should we maybe make that a separate commit so we can later add it to .git-blame-ignore-revs?

@mkrack
Copy link
Member Author

mkrack commented Dec 8, 2023

Oh wow, how did you format all our test input files?

vi with some macro support.

Should we maybe make that a separate commit so we can later add it to .git-blame-ignore-revs?

No objections.

@oschuett
Copy link
Member

oschuett commented Dec 8, 2023

To separate out the actual changes you could try git format-patch --ignore-space-change ....

@mkrack
Copy link
Member Author

mkrack commented Dec 8, 2023

To separate out the actual changes you could try git format-patch --ignore-space-change ....

Got two patch files ... ?

@oschuett
Copy link
Member

oschuett commented Dec 8, 2023

I was thinking you could do something like this:

  1. Use git format-patch --ignore-space-change to save your manual modification as patch files.
  2. Reset your branch.
  3. Run your vim macros again.
  4. Make a first commit, which contains only the formatting.
  5. Apply the patch files.
  6. Make a second commit, which contains the NOTCONV_STOPALL changes.

@mkrack
Copy link
Member Author

mkrack commented Dec 9, 2023

Step 3 was not an automated process, because I still edited all files by hand.

@oschuett
Copy link
Member

oschuett commented Dec 9, 2023

Step 3 was not an automated process, because I still edited all files by hand.

Ok, I think I found a way. Please do not merge.

The new keyword IGNORE_CONVERGENCE_FAILURE can be set to obtain the old permissive behaviour.
It replaces the keyword NOTCONV_STOPALL which enforced until now the strict behaviour which is now the default.
@mkrack
Copy link
Member Author

mkrack commented Dec 11, 2023

Ok, I think I found a way. Please do not merge.

@oschuett Thanks for the patch file. The test is clean now after some minor fixes. OK to merge?

@oschuett
Copy link
Member

Yes, all good. This nicely solves a long standing usage pitfall.

@mkrack mkrack merged commit 6292a7e into cp2k:master Dec 11, 2023
dft_control%qs_control%cdft_control%total_steps = &
dft_control%qs_control%cdft_control%total_steps + total_steps

IF (.NOT. converged) CPWARN("SCF run NOT converged")
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should keep the old warning message? I'd expect it's hard coded in many places.

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.

2 participants