Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
249 commits
Select commit Hold shift + click to select a range
d887aae
Start InternalCoords class
drroe Mar 4, 2022
0b22ac5
Add NO_ATOM
drroe Mar 4, 2022
06a57ae
Merge branch 'master' into internal.coords
drroe Mar 4, 2022
c1256f4
Start Zmatrix
drroe Mar 4, 2022
b370997
InternalCoords implementation
drroe Mar 4, 2022
eeba724
Start Zmatrix implementation
drroe Mar 4, 2022
ce57aa5
First seed atom
drroe Mar 4, 2022
ddea7e3
Add comments
drroe Mar 4, 2022
2af6f54
Skip building libcpptraj_cluster, not really needed.
drroe Mar 7, 2022
a730818
Merge branch 'master' into internal.coords
drroe Mar 19, 2022
f27f0c8
Merge remote-tracking branch 'refs/remotes/origin/internal.coords' in…
drroe Sep 25, 2023
ccd0c7b
Add assignment and copy constructor
drroe Sep 25, 2023
b50cac6
Start adding internal to cartesian routine
drroe Sep 25, 2023
b4d9f2d
Add files to the build
drroe Sep 25, 2023
40baa92
Remove xyz coords from InternalCoords
drroe Sep 25, 2023
8e0c099
Update depends
drroe Sep 25, 2023
8fcf1dc
Start reading amber prep files
drroe Sep 25, 2023
dc77a30
Start setting up topology and z matrix
drroe Sep 25, 2023
a8df0a1
Add bonds to top
drroe Sep 25, 2023
a802f2e
Add ability to add atoms as a seed
drroe Sep 25, 2023
35eb86d
Do frame setup
drroe Sep 25, 2023
5074294
Find next atom to set
drroe Sep 25, 2023
1c34304
Build the rest of the coordinates
drroe Sep 25, 2023
ba3e4ea
Do not create separate topology data set. Remove dummy atoms.
drroe Sep 26, 2023
e991c33
Put prep residue read in separate function, read past section 9
drroe Sep 26, 2023
7acec66
Separate routines for reading sections. Add bonds from LOOP sections
drroe Sep 26, 2023
0b3d096
Add Test
drroe Sep 26, 2023
43b4346
Make exe
drroe Sep 26, 2023
9c81033
Improve check for STOP
drroe Sep 26, 2023
364f086
Hide some debug info. Warn about non-zero bond cutoff
drroe Sep 26, 2023
e7cd25f
Add debug level to Zmatrix
drroe Sep 26, 2023
8b5376e
Fix when warning is printed
drroe Sep 26, 2023
b329d14
Enable read prep test
drroe Sep 26, 2023
0049ba6
Hide debug info
drroe Sep 26, 2023
5517a02
Hide more debug info. Set parm name right after it is instantiated.
drroe Sep 26, 2023
83490ab
errStat not needed in this function
drroe Sep 26, 2023
7dbaaba
Add bond search when cutoff greater than 0
drroe Sep 26, 2023
f3fe997
More descriptive variable names
drroe Sep 26, 2023
fbc5eb0
Add reference to natural reference frame paper
drroe Sep 26, 2023
5e6f1a0
Start calculating Zmatrix from frame/top
drroe Sep 26, 2023
0609056
Start with the idea of a topology index
drroe Sep 27, 2023
f99a2f3
Allow ability to set positions
drroe Sep 27, 2023
1f81636
Update depends
drroe Sep 27, 2023
fd80344
Set seeds from specified atoms
drroe Sep 27, 2023
f70a401
Number of ICs should not have to match up with number of atoms. Store
drroe Sep 27, 2023
1c9f81f
Reenable seed positions
drroe Sep 27, 2023
34abb9d
Enable set seed positions
drroe Sep 27, 2023
5f5fe35
Try using fake dummy atoms
drroe Sep 27, 2023
1eb3382
Try to choose the best 3 atoms as seeds
drroe Sep 27, 2023
64ae64c
Finish initial seeds
drroe Sep 27, 2023
c26bad2
Print seed atoms in the correct order
drroe Sep 27, 2023
b9f12b4
No need for dummy atoms and fake ICs. Just store the positions of the
drroe Sep 28, 2023
0633c99
Comment out function
drroe Sep 28, 2023
7c29b56
Get rid of obsolete code
drroe Sep 28, 2023
a6c1b2a
Start using molecule info
drroe Sep 28, 2023
641f5fa
Finish setting IC from Cart
drroe Sep 28, 2023
cbc890c
Test the back-conversion from generated ICs to cart
drroe Sep 28, 2023
e7bfba8
Remove more code, add code docs
drroe Sep 28, 2023
9a470a0
Properly increase search indices when suitable atom not found. Init seed
drroe Sep 28, 2023
547bd97
Add more debug info
drroe Sep 28, 2023
8aeee55
Add Zmatrix data set class
drroe Sep 28, 2023
5cc7d10
Add zmatrix enum
drroe Sep 28, 2023
736dc7b
Add zmatrix data set to DSL
drroe Sep 28, 2023
a66d857
Add zmatrix command
drroe Sep 28, 2023
b7e1be9
Add more zmatrix data set routines
drroe Sep 29, 2023
d86f869
Add out keyword to zmatrix. Set dimension for zmatrix set
drroe Sep 29, 2023
a8aa4a5
Do proper casting for printf
drroe Sep 29, 2023
b0653c8
Add zmatrix test
drroe Sep 29, 2023
dd137e5
Enable zmatrix test
drroe Sep 29, 2023
043f0b6
Start harder sugar test
drroe Sep 29, 2023
95e7e0e
Split out seed set functionality
drroe Sep 29, 2023
611e843
Start new Zmatrix conversion function
drroe Sep 29, 2023
6732f79
Start doing the new search
drroe Sep 29, 2023
31adf3f
More progress on the new trace routine
drroe Sep 29, 2023
792cd38
Finish the trace algorithm
drroe Sep 29, 2023
0d167f0
Enable sugar test
drroe Sep 29, 2023
39660b7
Deal with impropers on second seed atom
drroe Sep 29, 2023
ce5a6b9
Split off functionality
drroe Sep 29, 2023
6c4fa0d
Update set name
drroe Sep 29, 2023
d3aee7b
Test going from extracted internal coords to cartesian
drroe Sep 29, 2023
bd3a57e
Add MEX test molecule
drroe Sep 29, 2023
85eb00c
Try to test new way to do seeds
drroe Sep 29, 2023
f2b896f
When following branches off of seed1 ignore seed0 and seed2
drroe Sep 30, 2023
96c1b2a
Do not use internal coord seeds if cartesian seeds have been set/used.
drroe Sep 30, 2023
82d094c
Update zmatrix output for new algorithm
drroe Sep 30, 2023
ecb600a
Comment out old algorithm
drroe Sep 30, 2023
b9c7199
Ensure IC seeds are added for Cart. seed atoms so each atom has an as…
drroe Sep 30, 2023
671bc55
Update zmatrix output for IC seeds
drroe Sep 30, 2023
39d884e
Dont add IC seed if the seed atom isnt set
drroe Sep 30, 2023
9c532d5
Only have one version of AddIC, automatically determine IC seed
drroe Oct 2, 2023
2b415dc
Hide debug info. Allow one to specify a different topology if desired
drroe Oct 2, 2023
d2259e0
Start adding a graft using internal coords mode
drroe Oct 2, 2023
38af6e6
Do topology modification
drroe Oct 2, 2023
d8b86f1
Calculate zmatrix for combined structure
drroe Oct 2, 2023
ddeff83
Regenerate molecule info after bonds are added
drroe Oct 2, 2023
16d7286
First attempt at "fixing" internal coords
drroe Oct 2, 2023
4ad70e4
Ensure mol info regened
drroe Oct 2, 2023
09ed564
Add some debug
drroe Oct 3, 2023
e3782d0
Try to Figure out a pattern
drroe Oct 3, 2023
20f7d0c
DNA graft test
drroe Oct 5, 2023
736fcfe
Try to take into account ICs bonded to the same atom
drroe Oct 5, 2023
9fed850
Merge branch 'master' into internal.coords
drroe Oct 13, 2023
592666c
Get rid of duplicated test
drroe Oct 13, 2023
13b7a5d
Add ability to save atom indices sorted by priority in Chirality
drroe Oct 15, 2023
0c3f565
Start Model namespace
drroe Oct 15, 2023
a0ce486
Add Model, start trying a better phi assignment
drroe Oct 15, 2023
ccdde25
Update depenencies
drroe Oct 15, 2023
d344635
Make unknown chirality a warning, but trap it as an error when determ…
drroe Oct 15, 2023
d07772a
Add concept of 'known' and 'unknown' atom positions to graft. Idea is…
drroe Oct 15, 2023
eabe003
Dont hardcode the number of bonds. Start trying to determine a reason…
drroe Oct 15, 2023
3ec253a
Fix saving priorities. Code for assigning phi based on atom priority.…
drroe Oct 16, 2023
4ee92e7
Actually assign phi
drroe Oct 16, 2023
fc288bc
Add angle assignment routine. Use new assignment routines.
drroe Oct 16, 2023
f5d82da
Try to be more clever about what atom positions are known
drroe Oct 16, 2023
2fcfb8c
Fix phi assignment based on valid internal chiralities
drroe Oct 16, 2023
4957cee
Might not need to worry about chirality
drroe Oct 16, 2023
b9cc83e
Add a test save
drroe Oct 16, 2023
8154bf6
Trap 2 bond case
drroe Oct 16, 2023
0a65481
Get chirality before the bond is added. Try to preserve that chiralit…
drroe Oct 17, 2023
9bf611a
Print original chirality instead of new
drroe Oct 17, 2023
1e52402
Update test save
drroe Oct 17, 2023
3e41bed
Test grafting phosphate onto base sugar with IC
drroe Oct 17, 2023
5da298d
Try to be smarter about hybridization
drroe Oct 17, 2023
efed8b9
Use separate routine for coords. Add routine to find ic indices
drroe Oct 17, 2023
f6f1d6d
Use InternalCoords printIC
drroe Oct 17, 2023
ff000c5
Clean up IC printing
drroe Oct 17, 2023
6078af8
Update dependencies
drroe Oct 19, 2023
99abe79
Clean up Zmatrix. Add routine where some initial Frame positions can be
drroe Oct 19, 2023
060ca6a
Get rid of extra zmatrix command
drroe Oct 19, 2023
5f6b215
Start SetFromFrameAroundBond() function
drroe Oct 19, 2023
8a14f27
Select K and L atom candidates for initial IC, set up initial IC.
drroe Oct 19, 2023
075fb75
Print the new z matrix
drroe Oct 19, 2023
cca82fc
Print values
drroe Oct 19, 2023
3b950fd
Model in the J K and K L ICs
drroe Oct 19, 2023
df04b2c
Mark known atoms as having an IC
drroe Oct 19, 2023
8ac3965
Add some debug print. Dont put atomk on the next atoms list when
drroe Oct 19, 2023
619db99
Only trace remaining branches once all the ICs to be modeled in have
drroe Oct 19, 2023
d8ac49d
Just in case, dont add a K L IC if we've already modeled it from
drroe Oct 19, 2023
404df07
Use bondZmatrix to set coordinates instead of zmatrix
drroe Oct 19, 2023
3f5603d
Update output for new graft ic behavior.
drroe Oct 19, 2023
2fff3af
Change name of output for DNA graft with charges test
drroe Oct 20, 2023
49f66e6
Write out IC nucleotide pdb
drroe Oct 20, 2023
cd76373
Debug print zmatrix with atom names
drroe Oct 20, 2023
b1d15ca
Add atom names to zmatrix print if topology is given. When modelling
drroe Oct 20, 2023
a59de6b
Update test results
drroe Oct 20, 2023
42a4e1b
Add test for building nucleotide with internal coords
drroe Oct 20, 2023
ac28c23
Protect topology append when only some bonds have parameters
drroe Oct 21, 2023
cf0f1f2
If some bond parameters are present, warn if any bonds are missing pa…
drroe Oct 21, 2023
cd6c477
Start Builder class
drroe Oct 21, 2023
ce7e4cd
Fix typo
drroe Oct 22, 2023
8fe3c25
Start the combine function
drroe Oct 22, 2023
35262e5
Create the bond
drroe Oct 22, 2023
1797c1c
Ensure the smaller fragment is merged into the larger one
drroe Oct 22, 2023
a24e27d
Reposition the function
drroe Oct 22, 2023
c1b5bd0
Comment out unused array
drroe Oct 22, 2023
6ea8edd
Add code comment
drroe Oct 23, 2023
6dc9f40
Fix chirality determination for fragment 1
drroe Oct 23, 2023
5c04a6d
Save atom priorities
drroe Oct 23, 2023
a32f7bf
Move Chirality into the Structure namespace
drroe Oct 23, 2023
9868c65
Use new chirality
drroe Oct 23, 2023
a281047
Have Builder use new Chirality and BuildAtom
drroe Oct 23, 2023
5fbe437
Use new Chirality
drroe Oct 23, 2023
e4e1e6d
Use new Chirality
drroe Oct 23, 2023
1cf3f97
Use new Chirality
drroe Oct 23, 2023
b578874
Remove reference to old Chirality.cpp
drroe Oct 23, 2023
43a6eb6
Fix enum
drroe Oct 23, 2023
592a0f7
Add clear() routine
drroe Oct 23, 2023
3e91fe4
Have Model use BuildAtom
drroe Oct 23, 2023
8d3578a
Dont hold position status. Return chirality/priority
drroe Oct 23, 2023
0843363
Use BuildAtom. Change function name
drroe Oct 23, 2023
08f8f0d
Do Zmatrix construction
drroe Oct 23, 2023
508f19c
Use new builder class
drroe Oct 23, 2023
dfbbb78
Fix location of printf newline
drroe Oct 23, 2023
f1f2c01
Revert to not using Builder class, make sure changes to the Zmatrix and
drroe Oct 23, 2023
7f1d0b3
Remove unused code/includes
drroe Oct 23, 2023
30c5ded
Add file containing Structure enums
drroe Oct 23, 2023
d8b9dae
Just pass in chiral info for the atoms we need
drroe Oct 23, 2023
cb41b76
Only get chirality and priorities for the 2 bonded atoms
Oct 24, 2023
c989bee
Put heavy atom count function into Topology
Oct 24, 2023
5d7c779
Make the routine in builder the same as what is in graft
Oct 24, 2023
769dd2b
Print the atoms being bonded
Oct 24, 2023
1f74789
Builder is now working!
Oct 24, 2023
bb520ae
Create routine explicitly for setting atom priority
Oct 24, 2023
b37cd30
Get rid of old code
Oct 24, 2023
d25be0c
Fix memory leak
Oct 24, 2023
6e7bb07
Refactor graft so rms fit and IC have a common base to work from
Oct 24, 2023
69184ad
For debug, Print nbonds and element name for each atom when modeling …
drroe Oct 24, 2023
9d51edd
Start amber off file reader
drroe Oct 25, 2023
a310d4a
Ensure we can read all the sections. Skip unknown ones
drroe Oct 25, 2023
f03e704
Add ability to set mass from element
drroe Oct 25, 2023
12fd7ed
Read atoms and connectivity
drroe Oct 25, 2023
eefa758
Read positions, create COORDS data set for units
drroe Oct 25, 2023
7585b69
When assigning a phi and need to guess initial phi, make branch with a
drroe Oct 26, 2023
5854d73
Allow depth of 2 to be cis as well
drroe Oct 26, 2023
40c1961
Update tests
drroe Oct 26, 2023
7e4c7d0
Add Ainfo routine
drroe Oct 26, 2023
34a14bc
Split AssociatedData file into separate classes
drroe Oct 26, 2023
8c89bd2
Start adding connect atoms as associated data
drroe Oct 26, 2023
a5b1e87
Fill out Ainfo function
drroe Oct 26, 2023
fde5a7e
Read the connect atoms
drroe Oct 26, 2023
84dbafa
Associate the connect data
drroe Oct 27, 2023
808590e
Start sequence command
drroe Oct 27, 2023
60b5580
Add output set
drroe Oct 27, 2023
dc76e8d
Search for units
drroe Oct 27, 2023
833f265
Enable the sequence command for testing
drroe Oct 27, 2023
5292da1
Set up bonding atoms
drroe Oct 27, 2023
1f772ee
Fix use of connect atoms
drroe Oct 27, 2023
9ec233c
Update connect 1 indices, not connect 0 indices. Do the combining into
drroe Oct 27, 2023
79699ae
Hide some debug info
drroe Oct 27, 2023
d2c05b6
Remove old code
drroe Oct 27, 2023
092b9dd
Hide debug info
drroe Oct 27, 2023
4882b99
Start hiding debug info
drroe Oct 27, 2023
0705dce
Add debug arg
drroe Oct 27, 2023
d194551
Use model debug level
drroe Oct 27, 2023
8f4b690
Hide some debug
drroe Oct 27, 2023
ff8d9ef
Hide more debug. Put printing of ICs behind debug checks
drroe Oct 27, 2023
1e3a4ef
Add comment
drroe Oct 27, 2023
4bc957d
Add OFF read test
drroe Oct 27, 2023
56303cc
Enable test
drroe Oct 27, 2023
d5f848e
Make blank connect a warning, happens with terminii
drroe Oct 27, 2023
13c3408
Protect against bad connect atoms
drroe Oct 27, 2023
5303a4f
Add destructor to free memory
Oct 31, 2023
a049d33
Add help text
drroe Nov 1, 2023
2cd7328
Fix processing of arguments depending on zmatrix mode
drroe Nov 1, 2023
038aa2f
Add zmatrix manual entry
drroe Nov 1, 2023
232593a
Add test lib file
drroe Nov 1, 2023
123b45c
Start sequence test
drroe Nov 1, 2023
3c39980
Try to check for SP2 nitrogens with 3 bonds (partial double bond
drroe Nov 1, 2023
8f54647
Add test save
drroe Nov 1, 2023
36a3baa
Enable sequence test
drroe Nov 1, 2023
089cbd3
Test libset keyword
drroe Nov 1, 2023
2cadda1
Update depends
drroe Nov 1, 2023
400eede
Add stub for arg process function
drroe Nov 1, 2023
b0d315d
Make arg processing function virtual
drroe Nov 1, 2023
da9c3fa
Create arg routine for connect associated data
drroe Nov 1, 2023
5b61646
Add help text
drroe Nov 1, 2023
6141c0f
Make const pointer
drroe Nov 1, 2023
080d4b0
Start connect data set command
drroe Nov 1, 2023
d89eff6
Start connect data set command
drroe Nov 1, 2023
68d9bcf
Fix printf statement
drroe Nov 1, 2023
726974b
Test setting head/tail atoms
drroe Nov 1, 2023
93e3989
Add headmask and tailmask keywords to dataset connect. Ensure existing
drroe Nov 1, 2023
64add9b
Test using headmask/tailmask
drroe Nov 1, 2023
5a57813
Add manual entries for sequence and dataset connect
drroe Nov 1, 2023
04442c0
Add notes about reading prep and lib formats
drroe Nov 1, 2023
1624174
Fix up help and manual entry for graft
drroe Nov 1, 2023
9c92433
Version 6.21.0. Minor version bump for the addition of internal
drroe Nov 1, 2023
5b5f87f
Fix LD_LIBRARY_PATH in YML
drroe Nov 2, 2023
15b414f
Do clang tests even if not on osx
drroe Nov 2, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/merge-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
make install
cd ..
export PATH=$HOME/bin:$PATH
export LD_LIBRARY_PATH=$HOME/lib:$PATH
export LD_LIBRARY_PATH=$HOME/lib:$LD_LIBRARY_PATH
export DO_PARALLEL="mpirun -n 2"
if [ $USE_OPENMP = "yes" ]; then
export OMP_NUM_THREADS=1
Expand Down
13 changes: 7 additions & 6 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2342,10 +2342,7 @@ EOF
CXXFLAGS="$CXXFLAGS -DMPICH_IGNORE_CXX_SEEK"
fi
fi
# ----- Mac OSX --------------------------------
if [ "$PLATFORM" = 'Darwin' ] ; then
SHARED_SUFFIX='.dylib'
if [ "$COMPILERS" = 'clang' ] ; then
if [ "$COMPILERS" = 'clang' ] ; then
# On OSX with clang, some libraries may be built with libstdc++ and will
# fail to link without this flag.
cat > testp.cpp <<EOF
Expand All @@ -2358,7 +2355,7 @@ EOF
# Test with stdlib flag
TestProgram quiet "With stdlib flag" "$CXX" "$CXXFLAGS" testp.cpp "-stdlib=libstdc++"
if [ $? -eq 1 ] ; then
Err "Could not link properly with clang++ on OSX"
Err "Could not link libstdc++ properly with clang++"
fi
LDFLAGS="$LDFLAGS -stdlib=libstdc++"
fi
Expand Down Expand Up @@ -2409,7 +2406,11 @@ EOF
fi
echo "OK"
fi
fi # End if clang
fi # End if clang
# ----- Mac OSX --------------------------------
if [ "$PLATFORM" = 'Darwin' ] ; then
SHARED_SUFFIX='.dylib'

# ----- Windows/Cygwin -------------------------
elif [ "$PLATFORM" = 'windows' ] ; then
SHARED_SUFFIX='.dll.a'
Expand Down
Loading