ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/utilities/md2md
(Generate patch)

Comparing trunk/src/applications/utilities/md2md (file contents):
Revision 1383 by gezelter, Thu Oct 22 19:12:14 2009 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 24 | Line 24 | __author__ = "Dan Gezelter (gezelter@nd.edu)"
24   """
25  
26   __author__ = "Dan Gezelter (gezelter@nd.edu)"
27 < __version__ = "$Revision: 1.4 $"
28 < __date__ = "$Date: 2009-10-22 19:12:14 $"
27 > __version__ = "$Revision: 1.5 $"
28 > __date__ = "$Date: 2009-11-25 20:01:59 $"
29   __copyright__ = "Copyright (c) 2009 by the University of Notre Dame"
30 < __license__ = "OOPSE"
30 > __license__ = "OpenMD"
31  
32   import sys
33   import getopt
# Line 52 | Line 52 | def readFile(mdFileName):
52  
53   def readFile(mdFileName):
54      mdFile = open(mdFileName, 'r')        
55 <    # Find OOPSE version info first
55 >    # Find OpenMD version info first
56      line = mdFile.readline()
57      while 1:
58 <        if '<OOPSE version=' in line:
59 <            OOPSEversion = line
58 >        if '<OOPSE version=' in line or '<OpenMD version=' in line:
59 >            OpenMDversion = line
60              break
61          line = mdFile.readline()
62          
# Line 153 | Line 153 | def writeFile(outputFileName,repeatX,repeatY,repeatZ):
153   def writeFile(outputFileName,repeatX,repeatY,repeatZ):
154      outputFile = open(outputFileName, 'w')
155  
156 <    outputFile.write("<OOPSE version=4>\n");
156 >    outputFile.write("<OpenMD version=1>\n");
157  
158      print "writing MetaData"
159      for metaline in metaData:
# Line 187 | Line 187 | def writeFile(outputFileName,repeatX,repeatY,repeatZ):
187      deco = [ (index, i) for i, index in enumerate(indices) ]
188      deco.sort()
189      whichSD = 0
190 <    for index in range(len(deco)):
191 <        (index,i) = deco[index]
192 <        print i
193 <        for ii in range(repeatX):
194 <            for jj in range(repeatY):
195 <                for kk in range(repeatZ):                    
190 >    for ii in range(repeatX):
191 >        for jj in range(repeatY):
192 >            for kk in range(repeatZ):
193 >                for index in range(len(deco)):
194 >                    (index,i) = deco[index]
195 >                    print i
196                      myP = []
197                      myP.append(p[i][0] + ii*Hmat[0][0] + jj*Hmat[1][0] + kk*Hmat[2][0])
198                      myP.append(p[i][1] + ii*Hmat[0][1] + jj*Hmat[1][1] + kk*Hmat[2][1])
# Line 206 | Line 206 | def writeFile(outputFileName,repeatX,repeatY,repeatZ):
206  
207      outputFile.write("    </StuntDoubles>\n")
208      outputFile.write("  </Snapshot>\n")
209 <    outputFile.write("</OOPSE>\n")
209 >    outputFile.write("</OpenMD>\n")
210      outputFile.close()
211  
212   def roundMe(x):

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines