Issue flash-center#4: replaced xrange by range

MANIFEST.in

@@ -1,3 +1,4 @@
 include README.md
 recursive-include opacplot2 *.py
 recursive-include opacplot2 *.h5
+recursive-include opacplot2 *.cn4

opacplot2/avgopac.py

@@ -66,7 +66,7 @@ def weight_planck(en):
 
     opavg = np.empty(len(ebnds)-1)
 
-    for i in xrange(len(opavg)):
+    for i in range(len(opavg)):
         numerator = quad(f, ebnds[i], ebnds[i+1], limit=500, epsrel=0.001)
         denominator = quad(weight, ebnds[i], ebnds[i+1], limit=500, epsrel=1.0e-06)
         opavg[i] = numerator[0]/denominator[0]

opacplot2/convert_opl.py

@@ -10,7 +10,7 @@ def listToGrid(opllist, ndens, ntemps):
     rho  = np.empty(opllist.nopacs)
     tele = np.empty(opllist.nopacs)
 
-    for n in xrange(opllist.nopacs):
+    for n in range(opllist.nopacs):
         rho[n], tele[n] = opllist.getDensTemp(n)
         # print "%15.6e%15.6e" % (rho[n],tele[n])
 
@@ -49,17 +49,17 @@ def listToTempGrid(opllist, ntemps):
     dt       = np.empty(opllist.nopacs-1)
     trads    = np.empty(ntemps)
 
-    for n in xrange(opllist.nopacs):
+    for n in range(opllist.nopacs):
         rhos[n], alltrads[n] = opllist.getDensTemp(n)
 
     alltrads.sort()
 
-    for n in xrange(opllist.nopacs-1): 
+    for n in range(opllist.nopacs-1): 
         dt[n] = alltrads[n+1] - alltrads[n]
     idxs = np.argsort(dt)
 
     trads[0] = alltrads[-1]
-    for n in xrange(1,ntemps):
+    for n in range(1,ntemps):
         i = -ntemps + n
         trads[n] = alltrads[idxs[i]]
 
@@ -68,9 +68,9 @@ def listToTempGrid(opllist, ntemps):
     # trads now contains a sorted list of the temperatures. For each
     # temperature, make a sorted list of densities.
     rhos = []
-    for i in xrange(ntemps):
+    for i in range(ntemps):
         current_rho = []
-        for n in xrange(opllist.nopacs):
+        for n in range(opllist.nopacs):
             rho, trad = opllist.getDensTemp(n)
             if abs(trad-trads[i])/trads[i] <= 1.0e-12:
                 current_rho.append(rho)
@@ -80,7 +80,7 @@ def listToTempGrid(opllist, ntemps):
 
     # Check to ensure same group structure used:
     energies = opllist.getEnergies(0)
-    for n in xrange(opllist.nopacs):
+    for n in range(opllist.nopacs):
         if len(energies) != len(opllist.getEnergies(n)):
             raise ValueError("Invalid group structure")
 

opacplot2/opac_plotter.py

@@ -18,7 +18,7 @@ def draw(self):
         self.fig.clf()
         ax = self.fig.add_subplot(111)
 
-        for n in xrange(self.nopacs):
+        for n in range(self.nopacs):
             ax.plot(self.opacs[n][0], self.opacs[n][1], **self.mplkwargs[n])
 
         ax.loglog()

opacplot2/opg_inferno.py

@@ -46,7 +46,7 @@ def __init__(self, fn):
     def __splitline(self, line):
         words = line.split()
 
-        for i in xrange(len(words)):
+        for i in range(len(words)):
             if(words[i][6] == '-'):
                 words[i] = words[i][:6] + "E-" + words[i][7:]
 
@@ -84,7 +84,7 @@ def __readOpac(self):
         # isn't really needed because we have rho and zbar.
         self.file.readline()
 
-        for n in xrange(npts):
+        for n in range(npts):
             numbers = self.__splitline(self.file.readline())
 
             energies[n]  = numbers[0]

opacplot2/opg_ionmix.py

@@ -160,9 +160,9 @@ def read_opac(self):
         arr_pe = self.get_block(nd*nt*ng)
 
         i = 0
-        for g in xrange(ng):
-            for d in xrange(nd):
-                for t in xrange(nt):
+        for g in range(ng):
+            for d in range(nd):
+                for t in range(nt):
                     self.rosseland[d,t,g]     = arr_ro[i]
                     self.planck_absorb[d,t,g] = arr_pa[i]
                     self.planck_emiss[d,t,g]  = arr_pe[i]
@@ -222,7 +222,7 @@ def convert(num):
 
         def write_block(var):
             count = 0
-            for n in xrange(len(var)):
+            for n in range(len(var)):
                 count += 1
 
                 f.write("%s" % convert(var[n]))
@@ -235,9 +235,9 @@ def write_block(var):
 
         def write_opac_block(var):
             count = 0
-            for g in xrange(self.ngroups):
-                for jd in xrange(self.ndens):
-                    for jt in xrange(self.ntemp):
+            for g in range(self.ngroups):
+                for jd in range(self.ndens):
+                    for jt in range(self.ntemp):
                         count += 1
 
                         f.write("%s" % convert(var[jd,jt,g]))
@@ -437,7 +437,7 @@ def convert(num):
 
     def write_block(var):
         count = 0
-        for n in xrange(len(var)):
+        for n in range(len(var)):
             count += 1
 
             f.write("%s" % convert(var[n]))
@@ -450,9 +450,9 @@ def write_block(var):
 
     def write_opac_block(var):
         count = 0
-        for g in xrange(ngroups):
-            for jd in xrange(ndens):
-                for jt in xrange(ntemps):
+        for g in range(ngroups):
+            for jd in range(ndens):
+                for jt in range(ntemps):
                     count += 1
 
                     f.write("%s" % convert(var[jd,jt,g]))

opacplot2/opg_qeos.py

@@ -42,8 +42,8 @@ def getnext(self):
     def getblock(self):
         data = np.empty((self.ndens, self.ntemps))
 
-        for jt in xrange(self.ntemps):
-            for jd in xrange(self.ndens):
+        for jt in range(self.ntemps):
+            for jd in range(self.ndens):
                 data[jd,jt] = float(self.getnext())
 
         return data
@@ -66,7 +66,7 @@ def parse(self):
         self.denss = np.empty(self.ndens)
         if self.verbose: 
             print("%i Densities [g/cc]:" % self.ndens)
-        for i in xrange(self.ndens):
+        for i in range(self.ndens):
             num = self.getnext()
             if num == "           -inf":
                 self.denss[i] = 0.0
@@ -81,7 +81,7 @@ def parse(self):
         self.temps = np.empty(self.ntemps)
         if self.verbose: 
             print("\n%i Temperatures [eV]:" % self.ntemps)
-        for i in xrange(self.ntemps):
+        for i in range(self.ntemps):
             num = self.getnext()
             if num == "           -inf":
                 self.temps[i] = 0.0

opacplot2/opg_sesame.py

@@ -184,10 +184,10 @@ def readEntries(self,nentries):
         data = np.empty(nentries)
 
         string = ""
-        for i in xrange(nlines):
+        for i in range(nlines):
             string += self.fhand.readline()[:self.WORDS_PER_LINE*self.entry_len]
 
-        for i in xrange(nentries):
+        for i in range(nentries):
             word = string[self.entry_len*i:self.entry_len*(i+1)]
             if word[-4] == '-': word = word[:-4] + "E" + word[-4:]
             data[i] = float(word)

opacplot2/opg_tabop.py

@@ -42,7 +42,7 @@ def __init__(self, fn, e0, verbose=False):
         self.temps = np.empty(n)
         if self.verbose: print("\nNumber of temperatures =", n)
 
-        for i in xrange(n): 
+        for i in range(n): 
             self.temps[i] = 1000.0 * math.e**float(self.data.pop(0))
             if self.verbose: print("%6i  %13.6e" % (i,self.temps[i]))
 
@@ -52,7 +52,7 @@ def __init__(self, fn, e0, verbose=False):
         self.dens = np.empty(n)
         if self.verbose: print("\nNumber of Densities =", n)
 
-        for i in xrange(n): 
+        for i in range(n): 
             self.dens[i] = math.e**float(self.data.pop(0))
             if self.verbose: print("%6i  %13.6e" % (i,self.dens[i]))
 
@@ -64,7 +64,7 @@ def __init__(self, fn, e0, verbose=False):
         if self.verbose: print("\nNumber of Energy Groups =", n)
 
         if self.verbose: print("%6i  %13.6e" % (0,self.energies[0]))
-        for i in xrange(n): 
+        for i in range(n): 
             self.energies[i+1] = float(self.data.pop(0))**2/self.energies[i]
             if self.verbose: print("%6i  %13.6e" % (i+1,self.energies[i+1]))
 
@@ -75,9 +75,9 @@ def __init__(self, fn, e0, verbose=False):
         self.data.pop(0)
         self.opac = np.empty((len(self.dens),len(self.temps),(len(self.energies)-1)))
 
-        for g in xrange(len(self.energies)-1):
-            for jd in xrange(len(self.dens)):
-                for jt in xrange(len(self.temps)):
+        for g in range(len(self.energies)-1):
+            for jd in range(len(self.dens)):
+                for jt in range(len(self.temps)):
                     self.opac[jd,jt,g] = math.e**float(self.data.pop(0))
 
         OplGrid.__init__(self,self.dens, self.temps, self.energies, 

opacplot2/opg_yac.py

@@ -193,9 +193,9 @@ def parse(self):
         self.rosseland = np.empty((ndopac, ntopac, self.ngroups))
 
         i = 0
-        for g in xrange(self.ngroups):
-            for d in xrange(ndopac):
-                for t in xrange(ntopac):
+        for g in range(self.ngroups):
+            for d in range(ndopac):
+                for t in range(ntopac):
                     # Read opacity and convert to units of 1/cm:
                     self.rosseland[d,t,g] = data[i]
                     i += 1
@@ -208,9 +208,9 @@ def parse(self):
         self.planck_emiss = np.empty((ndopac, ntopac, self.ngroups))
 
         i = 0
-        for g in xrange(self.ngroups):
-            for d in xrange(ndopac):
-                for t in xrange(ntopac):
+        for g in range(self.ngroups):
+            for d in range(ndopac):
+                for t in range(ntopac):
                     # Read opacity and convert to units of 1/cm:
                     self.planck_emiss[d,t,g] = data[i]
                     i += 1
@@ -224,9 +224,9 @@ def parse(self):
         self.planck_absorb = np.empty((ndopac, ntopac, self.ngroups))
 
         i = 0
-        for g in xrange(self.ngroups):
-            for d in xrange(ndopac):
-                for t in xrange(ntopac):
+        for g in range(self.ngroups):
+            for d in range(ndopac):
+                for t in range(ntopac):
                     # Read opacity and convert to units of 1/cm:
                     self.planck_absorb[d,t,g] = data[i]
                     i += 1

opacplot2/opl_list.py

@@ -17,7 +17,7 @@ def findExact(self, rho, temp, rtol = 1.0e-04, ttol = 1.0e-04, hist=False, verbo
         according to some tolerance.
         """
 
-        for n in xrange(self.nopacs):
+        for n in range(self.nopacs):
             rho_n, temp_n = self.getDensTemp(n)
 
             if( (abs(rho  - rho_n )/rho_n  <= rtol) and

opacplot2/opl_tempgrid.py

@@ -25,8 +25,8 @@ def __init__(self, dens, temps, energies, getOpac):
 
         def map(n):
             count = 0
-            for jt in xrange(len(self.temps)):
-                for jd in xrange(len(self.dens[jt])):
+            for jt in range(len(self.temps)):
+                for jd in range(len(self.dens[jt])):
                     if count == n:
                         return jd, jt
                     count += 1
@@ -41,7 +41,7 @@ def getListOpac(n):
             return self.go(jd,jt)
 
         nopac = 0
-        for jt in xrange(len(self.temps)):
+        for jt in range(len(self.temps)):
             nopac += len(self.dens[jt])
 
         OplList.__init__(self, nopac,
@@ -60,7 +60,7 @@ def interp(self, rho, temp, log=False):
         if log == True:
             rho   = np.log10(rho)
             temp  = np.log10(temp)
-            for jt in xrange(len(temps)) : dens[jt] = np.log10(dens[jt])
+            for jt in range(len(temps)) : dens[jt] = np.log10(dens[jt])
             temps = np.log10(temps)
 
         # First, find the temperatures that straddle temp:
@@ -114,9 +114,9 @@ def interp(self, rho, temp, log=False):
 
     def __str__(self):
         string = ""
-        for jt in xrange(len(self.temps)):
+        for jt in range(len(self.temps)):
             string += "%13.6e  |  " % self.temps[jt]
-            for jd in xrange(len(self.dens[jt])):
+            for jd in range(len(self.dens[jt])):
                 string += "%15.6e" % self.dens[jt][jd]
 
             string += "\n"