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

Implement Solvent Excluded Surfaces #972

Merged
merged 6 commits into from
Jun 24, 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.

Now the cube calculation step is 100 - 200x faster (QElapsedTimer)

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.

avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
avogadro/qtplugins/surfaces/surfaces.cpp Fixed Show fixed Hide fixed
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.

@ghutchis ghutchis added the enhancement feature changes / API changes label Jun 23, 2022
@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

Copy link
Member

@ghutchis ghutchis left a comment

Choose a reason for hiding this comment

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

A few things. I'd check out the underlying Cube class and consider whether you can replace some of these loops with fill() methods. Certainly there should be a default fill() (no parameters) that would be much faster than your loop.

These are minor optimizations, but probably still useful for larger / higher-resolution surfaces.

avogadro/qtplugins/surfaces/surfaces.cpp Outdated Show resolved Hide resolved
avogadro/qtplugins/surfaces/surfaces.cpp Outdated Show resolved Hide resolved
avogadro/qtplugins/surfaces/surfaces.cpp Outdated Show resolved Hide resolved
avogadro/qtplugins/surfaces/surfaces.cpp Outdated Show resolved Hide resolved
avogadro/qtplugins/surfaces/surfaces.h Show resolved Hide resolved
@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
macOS-arm64.dmg
Artifacts will only be retained for 90 days.

avogadro/core/cube.cpp Fixed Show fixed Hide fixed
avogadro/core/cube.cpp Fixed Show resolved Hide resolved
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.

avogadro/core/cube.cpp Outdated Show resolved Hide resolved
@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.

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.

@ghutchis
Copy link
Member

I think this is a good step.

@ghutchis ghutchis merged commit f5fd115 into OpenChemistry:master Jun 24, 2022
@aerkiaga aerkiaga deleted the ses-surfaces branch June 24, 2022 18:21
@github-actions
Copy link
Contributor

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

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

Successfully merging this pull request may close these issues.

3 participants