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

Update to hoomd version 4, improved API #33

Merged
merged 92 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
503b57e
add dihedral class
chrisjonesBSU Sep 16, 2022
63d3ef0
add import and table entry for dihedrals
chrisjonesBSU Sep 16, 2022
e4ffe7f
add dihedral optimization func
chrisjonesBSU Sep 16, 2022
0c6e54b
add dihedrals to runscript func
chrisjonesBSU Sep 16, 2022
d952c64
add dihedral entrys
chrisjonesBSU Sep 16, 2022
c4f132e
add dihedral to imports
chrisjonesBSU Sep 16, 2022
9ec4135
fix variable name
chrisjonesBSU Sep 16, 2022
1cc9abe
fix variable names, update dihedral pot file in optimize
chrisjonesBSU Sep 16, 2022
de5fd56
pass in dihedrals to state run script func
chrisjonesBSU Sep 18, 2022
a0b20f9
fix variable names
chrisjonesBSU Sep 18, 2022
147382e
comment out setting pair.rswitch
chrisjonesBSU Sep 18, 2022
db2d6ab
fix typo
chrisjonesBSU Sep 18, 2022
4c8930d
add tests for Angle class
chrisjonesBSU Sep 18, 2022
43c21c5
syntax fixes for consistency
chrisjonesBSU Sep 29, 2022
2cdebed
add 1 to iteration print statement
chrisjonesBSU Sep 29, 2022
905ef7c
couple of minor fixes
chrisjonesBSU Oct 6, 2022
44ea103
Merge branch 'add/dihedrals' of github.com:chrisjonesBSU/msibi into a…
chrisjonesBSU Oct 6, 2022
8f785ad
move exclude_bonded parameter to Pair's init func
chrisjonesBSU Oct 6, 2022
41af2e2
move exclude bonded param to State init func
chrisjonesBSU Oct 6, 2022
0cbe3c6
use LJ table func for table pots instead of mie
chrisjonesBSU Oct 10, 2022
234f1d6
move max_frames parameter from global (opt) to state specific
chrisjonesBSU Oct 18, 2022
b316a28
add optional param for setting num target frames different than max_f…
chrisjonesBSU Oct 24, 2022
0dd9d1c
add rmin and rmax attributes when setting Pair from a file
chrisjonesBSU Oct 25, 2022
96d3d11
add dr attribute for pair when setting from file
chrisjonesBSU Oct 25, 2022
717de8d
fix typo
chrisjonesBSU Oct 25, 2022
abe865c
add 1 to iteration num in ffit printout
chrisjonesBSU Oct 26, 2022
f298a36
making smoothing of pot during iterations optional
chrisjonesBSU Oct 26, 2022
d3df58c
add smoothing window as a parameter
chrisjonesBSU Oct 26, 2022
4e89256
copy file to potentials dir when starting from a file
chrisjonesBSU Oct 27, 2022
47e4480
clean up smoothing func calls
chrisjonesBSU Oct 27, 2022
b669379
add smoothing window param
chrisjonesBSU Nov 1, 2022
250f8b7
add missing parameter
chrisjonesBSU Nov 1, 2022
baf9f10
pass in missing parameters
chrisjonesBSU Nov 1, 2022
8f8b5ef
add missing parameter
chrisjonesBSU Nov 1, 2022
1cf0ffe
cleaning up doc strings and comments
chrisjonesBSU Nov 15, 2022
887d864
fix unit tests
chrisjonesBSU Nov 16, 2022
8599811
fix some unit tests
chrisjonesBSU Nov 16, 2022
bff073c
update some unit tests
chrisjonesBSU Nov 17, 2022
314b114
fix variable name
chrisjonesBSU Nov 30, 2022
3167e74
fix variable name
chrisjonesBSU Nov 30, 2022
58ddcd6
remove mdtraj check from set up
chrisjonesBSU Feb 23, 2023
866f7ce
fix indentation in initializing angles
chrisjonesBSU Feb 23, 2023
0d1dd84
hidden func to manually set target dist
chrisjonesBSU Mar 2, 2023
d4aa3c9
fix dl in bonds, change slope window
chrisjonesBSU Mar 22, 2023
0be9868
update version
chrisjonesBSU Mar 29, 2023
58bd5f0
create forces.py with Force class, change name in env files
chrisjonesBSU Mar 29, 2023
883852f
updating some attributes
chrisjonesBSU Mar 29, 2023
9bc929d
Merge branch 'add/dihedrals' into refactor
chrisjonesBSU Mar 29, 2023
9013ced
create Pair class
chrisjonesBSU Mar 29, 2023
a4bc14f
clean up optimize fucns, add state in force classes
chrisjonesBSU Mar 29, 2023
5b10250
cleaning up optimize functions
chrisjonesBSU Apr 1, 2023
0efc0c3
creating hoomd3 templates
chrisjonesBSU Apr 1, 2023
3da1a38
keeping track of formatting
chrisjonesBSU Apr 1, 2023
7d687ed
adding some fixes
chrisjonesBSU Apr 1, 2023
b0fe6be
set n_frames property in State
chrisjonesBSU Apr 5, 2023
fc21023
move add_state call location; add plotting function to Force
chrisjonesBSU Apr 5, 2023
84b155b
fix variable names
chrisjonesBSU Apr 5, 2023
efe2bc0
add optimize parameter to Force classes
chrisjonesBSU Apr 5, 2023
26aa530
updating variable names
chrisjonesBSU Apr 6, 2023
3d32ea0
use the nbins property
chrisjonesBSU Apr 6, 2023
5b89c7f
set correction func attribute, fix variable names
chrisjonesBSU Apr 6, 2023
cc398d3
remove old files, syntax changes
chrisjonesBSU Apr 6, 2023
c74b608
fix init imports
chrisjonesBSU Apr 6, 2023
01d0137
set only one add_ function in MSIBI class
chrisjonesBSU Apr 6, 2023
0d82877
Add repr functions, new force attributes in optimize
chrisjonesBSU Apr 7, 2023
8410191
fixing _initialize func
chrisjonesBSU Apr 7, 2023
e5b3c86
fix update_potential func, smoothing checks
chrisjonesBSU Apr 7, 2023
ec114ee
fix smoothing check
chrisjonesBSU Apr 7, 2023
2d3a2d0
add some to dos
chrisjonesBSU Apr 7, 2023
b4a423d
store history of head and tail corrections
chrisjonesBSU Apr 7, 2023
71236b7
finish set_harmonic functions
chrisjonesBSU Apr 7, 2023
4c7708c
finish set_harmonic funcs for all classes
chrisjonesBSU Apr 7, 2023
bed82ab
cleaning up some of the odd files sitting around
chrisjonesBSU Apr 7, 2023
110204b
re-arranging script stuff for hoomd3
chrisjonesBSU Apr 7, 2023
a53784d
adding more to hoomd script
chrisjonesBSU Apr 7, 2023
10fa58e
more work on simulation script
chrisjonesBSU Apr 7, 2023
7da8b78
update env files
chrisjonesBSU Apr 7, 2023
a75d4f4
update force init and entry attributes
chrisjonesBSU Apr 8, 2023
73359ad
fix force init attrs, add matplotlib to envs
chrisjonesBSU Apr 8, 2023
5da2879
updating MSIBI class
chrisjonesBSU Apr 8, 2023
2d6f1a2
fixes for hoomd script
chrisjonesBSU Apr 8, 2023
2c94027
adding some comments
chrisjonesBSU Apr 9, 2023
faab1a6
fix smoothing of target dist when adding a state
chrisjonesBSU Apr 10, 2023
b3533be
pin gsd version
chrisjonesBSU Aug 23, 2023
b264176
use hoomd4
chrisjonesBSU Feb 21, 2024
c78c747
fix param arg, add cuda version to env
chrisjonesBSU Feb 21, 2024
76c9771
add creation of thermostat
chrisjonesBSU Feb 21, 2024
635adda
make sure dist and potential have same shape
chrisjonesBSU Feb 22, 2024
a7210c3
use _table_entry instead of force_entry for forces that use tables
chrisjonesBSU Feb 22, 2024
ee9a635
add some plotting functions
chrisjonesBSU Feb 22, 2024
77a7663
remove old env files, move tutorials dir
chrisjonesBSU Feb 23, 2024
e684423
change env name
chrisjonesBSU Feb 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 0 additions & 20 deletions environment-cpu.yml

This file was deleted.

20 changes: 0 additions & 20 deletions environment-gpu.yml

This file was deleted.

17 changes: 0 additions & 17 deletions environment-nohoomd.yml

This file was deleted.

10 changes: 10 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: msibi
channels:
- conda-forge
dependencies:
- cuda-version==11.8
- freud>=2.13
- gsd>=3.0
- hoomd>=4.0
- cmeutils
- more-itertools
4 changes: 2 additions & 2 deletions msibi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from msibi.optimize import MSIBI
from msibi.pair import Pair
from msibi.bonds import Bond, Angle
from msibi.forces import Pair, Bond, Angle, Dihedral
from msibi.potentials import *
from msibi.state import State
from msibi.__version__ import __version__
Expand All @@ -13,5 +12,6 @@
"State",
"Bond",
"Angle",
"Dihedral",
"utils"
]
2 changes: 1 addition & 1 deletion msibi/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.0"
__version__ = "1.0.0"
Loading
Loading