From 0c60adaa8ca92b3d894c5a85de55ea56982e90c3 Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Mon, 10 Apr 2017 11:00:20 -0500
Subject: [PATCH] Modified run script
---
run.py | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/run.py b/run.py
index 1872462..def8738 100644
--- a/run.py
+++ b/run.py
@@ -67,7 +67,7 @@ def simulateDesign(inFile, outPrefix, gpu=0, shiftEulerZ=0):
# ------------------------------- #
out = outPrefix + "-1"
- coarsestModel.simulate(out, outputDirectory='output', numSteps=40000000, timestep=400e-6,
+ coarsestModel.simulate(out, outputDirectory='output', numSteps=40000000, timestep=200e-6,
arbd="/home/cmaffeo2/development/cuda/arbd.dev/src/arbd", gpu=gpu)
coarsestModelCoords = readArbdCoords( "output/%s.0.restart" % out )
@@ -98,29 +98,24 @@ def simulateDesign(inFile, outPrefix, gpu=0, shiftEulerZ=0):
gpu=0
for f in glob.glob('json/*twist-mod2.json'):
out = re.match('json/(.*).json',f).group(1)
- # simulateDesign(f,out,gpu=gpu)
-gpu+=1
+ simulateDesign(f,out,gpu=gpu)
for f in list(reversed(glob.glob('json/bend-*')))[1::2]:
out = re.match('json/(.*).json',f).group(1)
- # simulateDesign(f,out,gpu=gpu,shiftEulerZ=180)
-gpu+=1
+ simulateDesign(f,out,gpu=gpu,shiftEulerZ=180)
for f in list(reversed(glob.glob('json/bend-*')))[::2]:
out = re.match('json/(.*).json',f).group(1)
- # simulateDesign(f,out,gpu=gpu,shiftEulerZ=180)
-gpu+=1
+ simulateDesign(f,out,gpu=gpu,shiftEulerZ=180)
files = ('pointer_v1_12_from_dietz', 'nuc_ring_v7.11','robot_v1.9_bent',
'gear180-mod', 'Lowerring_V2_sticky_2_opt_allT')
files = ["json/%s.json" % f for f in files]
-gpu=0
for f in files[::2]:
out = re.match('json/(.*).json',f).group(1)
- # simulateDesign(f,out,gpu=gpu)
-gpu+=1
+ simulateDesign(f,out,gpu=gpu)
for f in files[1::2]:
out = re.match('json/(.*).json',f).group(1)
--
GitLab