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

Initial surfaces code #897

Merged
merged 5 commits into from
Jun 21, 2022
Merged

Initial surfaces code #897

merged 5 commits into from
Jun 21, 2022

Conversation

aerkiaga
Copy link
Collaborator

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

@ghutchis ghutchis added enhancement feature changes / API changes rendering labels May 22, 2022
@ghutchis ghutchis linked an issue May 22, 2022 that may be closed by this pull request
3 tasks
@avo-bot
Copy link

avo-bot commented May 27, 2022

This pull request has been mentioned on Avogadro Discussion. There might be relevant details there:

https://discuss.avogadro.cc/t/may-2022-development-progress/3836/1

* No probe radius
* No refinement
* No optimizations

Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
@github-actions
Copy link
Contributor

Here are the build results
macOS-arm64.dmg
Artifacts will only be retained for 90 days.

Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
@github-actions
Copy link
Contributor

Here are the build results
macOS-arm64.dmg
Artifacts will only be retained for 90 days.

@github-actions
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
macOS.dmg
Ubuntu-2004.tar.gz
Win64.exe
Artifacts will only be retained for 90 days.

@aerkiaga aerkiaga marked this pull request as ready for review June 20, 2022 21:43
@ghutchis
Copy link
Member

In the future, it might be nice to have an option to set the solvent radius beyond water. I think I have a set of radii (e.g., acetone, acetonitrile) somewhere.

@ghutchis
Copy link
Member

I think we probably also want to add some mesh smoothing later this summer. It's really easy to see artifacts from the Marching Cubes.

@ghutchis
Copy link
Member

Otherwise, this looks okay. I'm not going to merge until concurrency is working because right now, calculating a surface locks the main thread and the program is unresponsive (e.g., 6vxx)

@aerkiaga
Copy link
Collaborator Author

I hope to get concurrency working today in this PR. I'd also like to add implementing SES to our checklist, since the this code currently doesn't do it...

Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
@aerkiaga aerkiaga changed the title WIP surfaces code Initial surfaces code Jun 21, 2022
@github-actions
Copy link
Contributor

Here are the build results
macOS-arm64.dmg
Artifacts will only be retained for 90 days.

const float mdist = probeRadius;

thread_local Array<Index> *neighbors = nullptr;
QFuture future = QtConcurrent::map(*indices, [=](Vector3i &in) {

Check notice

Code scanning

Parameter 'in' can be declared with const

Parameter 'in' can be declared with const
const Vector3 min = m_cube->min();
const float mdist = probeRadius;

thread_local Array<Index> *neighbors = nullptr;

Check notice

Code scanning

Local static variable: neighbors

Local static variable: neighbors
@github-actions
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
macOS.dmg
Ubuntu-2004.tar.gz
Win64.exe
Artifacts will only be retained for 90 days.

@ghutchis
Copy link
Member

Okay, much better. Still slow on 6vxx but at least it doesn't lock the UI.

@ghutchis ghutchis merged commit a70ed7c into OpenChemistry:master Jun 21, 2022
@aerkiaga aerkiaga deleted the surfaces-wip branch June 21, 2022 14:50
@github-actions
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
macOS.dmg
Ubuntu-2004.tar.gz
Win64.exe
Artifacts will only be retained for 90 days.

@avo-bot
Copy link

avo-bot commented Jun 23, 2022

This pull request has been mentioned on Avogadro Discussion. There might be relevant details there:

https://discuss.avogadro.cc/t/june-2022-development-update/3879/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement feature changes / API changes rendering
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Molecular surfaces (van der Waals, solvent excluded, solvent accessible)
3 participants