Skip to content
This repository has been archived by the owner on Sep 27, 2021. It is now read-only.

for/development/electrostatics joshs development #381

Closed
wants to merge 371 commits into from
Closed

for/development/electrostatics joshs development #381

wants to merge 371 commits into from

Conversation

JoshuaSBrown
Copy link
Contributor

@JoshuaSBrown JoshuaSBrown commented Jun 23, 2019 •
edited
Loading

This pull request must be merged at the same time as:
tools
csg
xtp
csgapps

@JoshuaSBrown
Completed test for BeadMap
5d510d7
@JoshuaSBrown
Added test for converter
4f66435
@JoshuaSBrown
Added method for returning the types of the topology object, and tested
ee0eb2f
@JoshuaSBrown
Added more testing to converter
97c3678
@JoshuaSBrown
Fixed error with csgapplication, atomistic and cg topologies were swi…
366f688 
…tched
@JoshuaSBrown
Updated csg_dump file
b6aa52d
@JoshuaSBrown
Updated csg_dump.out file to take into account changes
aab5c9d
@JoshuaSBrown
Added comments to type container
a688c19
@JoshuaSBrown
Added documentation to cgmoleculestencil
9924b34
@JoshuaSBrown
Added commting and rearranged code to cleanup beadmap
27a942b
@JoshuaSBrown
Removed unused iterator and old commented out code
2185485
@JoshuaSBrown
Switched bead_count to size_t type
25daefa
@JoshuaSBrown
cast numatoms to size_t when comparing with BeadCount()
0979fe6
@JoshuaSBrown
cast to size_t numatoms when comparing with BeadCount()
b91f703
@JoshuaSBrown
cast num atoms to size_t when comparing with BeadCount()
cdb635a
@JoshuaSBrown
cast to size_t when comparing with BeadCount
ec19e2b
@JoshuaSBrown
cast to size_t when comparing with BeadCount
9ff4841
@JoshuaSBrown
Removed stray +
9236605
@JoshuaSBrown
Added missing return statement
378e5dc
@JoshuaSBrown
Removed old commented out code and cout statements
d4e687b
@JoshuaSBrown
pass in vector<string> by const reference for cgmoleculestencil
e1d3962
@JoshuaSBrown
Used const reference for itemline in lammpsdumpreader
4b52fd5
@JoshuaSBrown
removed unused varaibles, and commented out code
3af2b2d
@JoshuaSBrown
removed unused variable in pdbwriter
4502114
@JoshuaSBrown
Updated typecontainer const reference for exist methods and removed u…
376e781 
…nused variable from test_csg_topology
@JoshuaSBrown
Removed commented out code
58a41ed
@JoshuaSBrown
removed bead_type_name and corrected bead_type triplelist test
63353dd
@JoshuaSBrown
Initialized _traj_reader with nullptr in csgapplication
3141f26
@JoshuaSBrown
Fixed header guard to match standard
007b585
@JoshuaSBrown
Fixed placement of &
5d5a72e
@JoshuaSBrown JoshuaSBrown changed the base branch from master to development June 23, 2019 04:54
@JoshuaSBrown JoshuaSBrown changed the title For/development/electrostatics joshs development for/development/electrostatics joshs development Jun 23, 2019
This was referenced Jun 23, 2019
Merged
Closed
Closed
@junghans junghans changed the base branch from development to master September 17, 2019 01:53
@junghans
Copy link
Member

@JoshuaSBrown not sure about the conflicts here....

@JensWehner
Copy link
Member

This PR needs a lot more documentation. The work is good, but I need more explanation.

@JoshuaSBrown JoshuaSBrown mentioned this pull request Oct 18, 2019
Closed
@JoshuaSBrown JoshuaSBrown mentioned this pull request Nov 22, 2019
Merged
@junghans junghans marked this pull request as draft April 27, 2020 01:02
@junghans junghans deleted the for/development/electrostatics-joshs-development branch May 22, 2020 16:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@JensWehner JensWehner Awaiting requested review from JensWehner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JoshuaSBrown @junghans @JensWehner