From e49c8d2e80f0d97017828dbbbcf18de44dee9983 Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Tue, 18 Feb 2020 18:31:10 -0600
Subject: [PATCH] Fixed small things broken by merge
---
mrdna/segmentmodel.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mrdna/segmentmodel.py b/mrdna/segmentmodel.py
index 7b97f93..54e7f6e 100644
--- a/mrdna/segmentmodel.py
+++ b/mrdna/segmentmodel.py
@@ -1569,10 +1569,10 @@ class SegmentModel(ArbdModel):
self.DEBUG = DEBUG
if DEBUG > 0: print("Building ARBD Model")
ArbdModel.__init__(self,segments,
- dimensions, origin,
- temperature, timestep, cutoff,
- decompPeriod, pairlistDistance=None,
- nonbondedResolution = 0,
+ origin, dimensions,
+ temperature, timestep, integrator, cutoff,
+ decompPeriod, pairlist_distance=None,
+ nonbonded_resolution = 0,
extra_bd_file_lines = extra_bd_file_lines
)
@@ -1705,7 +1705,7 @@ class SegmentModel(ArbdModel):
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) )
try:
--
GitLab