Commit e49c8d2e authored by cmaffeo2's avatar cmaffeo2
Browse files

Fixed small things broken by merge

parent 17550c85
...@@ -1569,10 +1569,10 @@ class SegmentModel(ArbdModel): ...@@ -1569,10 +1569,10 @@ class SegmentModel(ArbdModel):
self.DEBUG = DEBUG self.DEBUG = DEBUG
if DEBUG > 0: print("Building ARBD Model") if DEBUG > 0: print("Building ARBD Model")
ArbdModel.__init__(self,segments, ArbdModel.__init__(self,segments,
dimensions, origin, origin, dimensions,
temperature, timestep, cutoff, temperature, timestep, integrator, cutoff,
decompPeriod, pairlistDistance=None, decompPeriod, pairlist_distance=None,
nonbondedResolution = 0, nonbonded_resolution = 0,
extra_bd_file_lines = extra_bd_file_lines extra_bd_file_lines = extra_bd_file_lines
) )
...@@ -1705,7 +1705,7 @@ class SegmentModel(ArbdModel): ...@@ -1705,7 +1705,7 @@ class SegmentModel(ArbdModel):
return twist_spring_from_lp(sep, Lp, self.temperature) return twist_spring_from_lp(sep, Lp, self.temperature)
def extend(self, other, copy=True, include_strands=False): def extend(self, other, copy=True, include_strands=True):
assert( isinstance(other, SegmentModel) ) assert( isinstance(other, SegmentModel) )
try: try:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment