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

Added solvation option to Orca job adapter #666

Closed
wants to merge 2 commits into from
Closed

Added solvation option to Orca job adapter #666

wants to merge 2 commits into from

Conversation

alongd
Copy link
Member

@alongd alongd commented Jun 1, 2023

Added SMD and PCM solvation types
Note that the keywords here are for Orca 4 and not Orca 5, this should still be fixed

Tests added

@codecov
Copy link

codecov bot commented Jun 1, 2023

Codecov Report

Merging #666 (f5d8e4d) into main (6b51ce5) will decrease coverage by 0.30%.
The diff coverage is 94.73%.

❗ Current head f5d8e4d differs from pull request most recent head 1f1b930. Consider uploading reports for the commit 1f1b930 to get more accurate results

@@            Coverage Diff             @@
##             main     #666      +/-   ##
==========================================
- Coverage   73.52%   73.23%   -0.30%     
==========================================
  Files          99       99              
  Lines       26602    26378     -224     
  Branches     5542     5516      -26     
==========================================
- Hits        19559    19317     -242     
- Misses       5673     5692      +19     
+ Partials     1370     1369       -1     
Flag Coverage Δ
unittests 73.23% <94.73%> (-0.30%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
arc/job/adapters/orca_test.py 100.00% <100.00%> (ø)
arc/job/adapters/orca.py 48.20% <80.00%> (+1.18%) ⬆️

... and 29 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@alongd
Copy link
Member Author

alongd commented Jul 4, 2023

@Lilachn91, what's the status of this PR? The errors in the tests seem trivial to fix

@Lilachn91
Copy link
Contributor

@alongd I fixed the tests, should be fine. Note it's a temporary fix until I figure out parallelization in Atlas.
After I'll edit the adapter to work also with solvation on Orca 5 and test it, we can merge.

Thanks :)

Copy link
Member Author

@alongd alongd left a comment

Choose a reason for hiding this comment

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

Thanks! I added one comment, I guess we're waiting to figure out the cpu/memory handling?

@@ -316,7 +316,7 @@ def write_input_file(self) -> None:
if self.level.solvation_method.lower() == 'smd':
self.add_to_args(val=f"""
%cpcm SMD true
SMDsolvent "{self.level.solvent}"
Copy link
Member Author

Choose a reason for hiding this comment

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

I'd like this commit to be split with the orca.py changes eventually squashed into the original orca.py commit in this PR, and the orca_test.py changes becoming a new commit with a clearer commit message

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