flopy 3.2.1__zip → 3.2.2__zip

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfoc88.py

@@ -152,7 +152,7 @@ class ModflowOc88(Package):
         self.chedfm = chedfm
         self.cddnfm = cddnfm
 
-        #--using words
+        # using words
         if words is not None:
 
             hflag,dflag = False,False
@@ -164,12 +164,12 @@ class ModflowOc88(Package):
             self.words = []
             self.compact = compact
 
-            #--first try for simple 1-d list
+            # first try for simple 1-d list
             try:
                 for w in words:
                     self.words.append(w.upper())
 
-                #--build a list of word output options
+                # build a list of word output options
                 word_list = []
 
                 if save_head_every is None:
@@ -197,7 +197,7 @@ class ModflowOc88(Package):
 
 
 
-            #--try for a 2-d list
+            # try for a 2-d list
             except:
                 word_list = []
                 self.words = []
@@ -222,7 +222,7 @@ class ModflowOc88(Package):
                     word_list.append('\n')
                 self.word_list = (word_list)
 
-        #--numeric codes
+        # numeric codes
         else:
             self.words = None
             #dummy, self.item2 = self.assign_layer_row_column_data(item2, 4, zerobase=False)  # misuse of this function - zerobase needs to be False
@@ -265,7 +265,7 @@ class ModflowOc88(Package):
         f_oc.write('%s\n' % self.heading)
         nstp = self.parent.get_package('DIS').nstp
                 
-        #--words option
+        # words option
         if self.words is not None:            
            
             f_oc.write('HEAD PRINT FORMAT {0:3.0f}\n'\
@@ -289,7 +289,7 @@ class ModflowOc88(Package):
             for i in self.word_list:
                 f_oc.write(i)
         
-        #--numeric codes option     
+        # numeric codes option
         else:                                  
             f_oc.write('%3i%3i%5i%5i\n' % \
                       (self.ihedfm, self.iddnfm, self.unit_number[1],\
@@ -469,7 +469,7 @@ class ModflowOc88(Package):
         if len(wordrec) > 3:
             words.append(wordrec)
 
-        #--reset unit numbers
+        # reset unit numbers
         unitnumber=[14, 51, 52, 53]
         if ihedun > 0:
             model.add_pop_key_list(ihedun)
@@ -478,7 +478,7 @@ class ModflowOc88(Package):
             model.add_pop_key_list(iddnun)
             #unitnumber[2] = iddnun
 
-        #--create instance of oc class
+        # create instance of oc class
         oc = ModflowOc88(model, ihedfm=ihedfm, iddnfm=iddnfm,
                  extension=['oc','hds','ddn','cbc'],
                  unitnumber=unitnumber, words=words, compact=compact,

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfpar.py

@@ -72,7 +72,9 @@ class ModflowPar(object):
             try:
                 self.zone = ModflowZon.load(zone.filename, model,
                                             ext_unit_dict=ext_unit_dict)
-                sys.stdout.write('   {} package load...success\n'.format(self.zone.name[0]))
+                if model.verbose:
+                    sys.stdout.write('   {} package load...success\n'\
+                              .format(self.zone.name[0]))
                 ext_unit_dict.pop(zone_key)
                 model.remove_package("ZONE")
             except BaseException as o:
@@ -115,7 +117,9 @@ class ModflowPar(object):
             try:
                 self.mult = ModflowMlt.load(mult.filename, model,
                                             ext_unit_dict=ext_unit_dict)
-                sys.stdout.write('   {} package load...success\n'.format(self.mult.name[0]))
+                if model.verbose:
+                    sys.stdout.write('   {} package load...success\n'\
+                              .format(self.mult.name[0]))
                 ext_unit_dict.pop(mult_key)
                 model.remove_package("MULT")
             except BaseException as o:
@@ -160,7 +164,9 @@ class ModflowPar(object):
             try:
                 self.pval = ModflowPval.load(pval.filename, model,
                                              ext_unit_dict=ext_unit_dict)
-                sys.stdout.write('   {} package load...success\n'.format(self.pval.name[0]))
+                if model.verbose:
+                    sys.stdout.write('   {} package load...success\n'\
+                              .format(self.pval.name[0]))
                 ext_unit_dict.pop(pval_key)
                 model.remove_package("PVAL")
             except BaseException as o:
@@ -196,7 +202,7 @@ class ModflowPar(object):
 
 
         """
-        #--read parameter data
+        # read parameter data
         if npar > 0:
             parm_dict = {}
             par_types = []
@@ -222,13 +228,13 @@ class ModflowPar(object):
                     for iv in t[3:]:
                         try:
                             iz = int(np.int(iv))
-                            if iz > 0:
+                            if iz != 0:
                                 iarr.append(iz)
                         except:
                             break
 
                     clusters.append([lay, mltarr, zonarr, iarr])
-                #--add parnam to parm_dict
+                # add parnam to parm_dict
                 parm_dict[parnam] = {'partyp':partyp, 'parval':parval, 'nclu':nclu, 'clusters':clusters}
 
         return par_types, parm_dict
@@ -306,14 +312,14 @@ class ModflowPar(object):
                         else:
                             mult_save = np.copy(mult)
                             za = model.mfpar.zone.zone_dict[zonarr.lower()][:, :]
-                            #--build a multiplier for all of the izones
+                            # build a multiplier for all of the izones
                             mult = np.zeros(shape, dtype=dtype)
                             for iz in izones:
                                 filtarr = za == iz
                                 mult[filtarr] += np.copy(mult_save[filtarr])
-                            #--calculate parameter value for this cluster
+                            # calculate parameter value for this cluster
                             cluster_data = pv * mult
-                        #--add data
+                        # add data
                         data += cluster_data
 
         return data

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfparbc.py

@@ -73,7 +73,7 @@ class ModflowParBc(object):
 
         """
         nitems = len(dt.names)
-        #--read parameter data
+        # read parameter data
         if npar > 0:
             bc_parms = {}
             for idx in range(npar):
@@ -97,7 +97,7 @@ class ModflowParBc(object):
                         timeVarying = True
                 pinst = {}
                 for inst in range(numinst):
-                    #--read instance name
+                    # read instance name
                     if timeVarying:
                         line = f.readline()
                         t = line.strip().split()
@@ -112,7 +112,7 @@ class ModflowParBc(object):
                         for jdx in range(nitems):
                             #if jdx < 3:
                             if issubclass(dt[jdx].type, np.integer):
-                                #--conversion to zero-based occurs in package load method in mbase.
+                                # conversion to zero-based occurs in package load method in mbase.
                                 bnd.append(int(t[jdx]))
                             else:
                                 bnd.append(float(t[jdx]))
@@ -149,7 +149,7 @@ class ModflowParBc(object):
 
 
         """
-        #--read parameter data
+        # read parameter data
         if npar > 0:
             bc_parms = {}
             for idx in range(npar):
@@ -169,7 +169,7 @@ class ModflowParBc(object):
                         timeVarying = True
                 pinst = {}
                 for inst in range(numinst):
-                    #--read instance name
+                    # read instance name
                     if timeVarying:
                         line = f.readline()
                         t = line.strip().split()
@@ -261,12 +261,12 @@ class ModflowParBc(object):
                 else:
                     mult_save = np.copy(mult)
                     za = model.mfpar.zone.zone_dict[zonarr.lower()][:, :]
-                    #--build a multiplier for all of the izones
+                    # build a multiplier for all of the izones
                     mult = np.zeros(shape, dtype=dtype)
                     for iz in izones:
                         filtarr = za == iz
                         mult[filtarr] += np.copy(mult_save[filtarr])
-                    #--calculate parameter value for this instance
+                    # calculate parameter value for this instance
                     t = pv * mult
                 data += t
 

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfpcg.py

@@ -242,10 +242,10 @@ class ModflowPcg(Package):
             if damp < 0.:
                 dampt = float(line[70:80].strip())
 
-        #--close the open file
+        # close the open file
         f.close()
 
-        #--create instance of pcg class
+        # create instance of pcg class
         pcg = ModflowPcg(model, mxiter=mxiter, iter1=iter1, npcond=npcond, ihcofadd=ihcofadd,\
                          hclose=hclose, rclose=rclose, relax=relax, nbpol=nbpol,\
                          iprpcg=iprpcg, mutpcg=mutpcg, damp=damp, dampt=dampt)

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfpcgn.py

@@ -45,10 +45,10 @@ class ModflowPcgn(Package):
         self.mcnvg = mcnvg
         self.rate_c = rate_c
         self.ipunit = ipunit
-        #--error trapping
+        # error trapping
         if self.ifill < 0 or self.ifill > 1:
             raise TypeError('PCGN: ifill must be 0 or 1 - an ifill value of {0} was specified'.format( self.ifill ))
-        #--add package
+        # add package
         self.parent.add_package(self)
 
 
@@ -111,7 +111,7 @@ class ModflowPcgn(Package):
 
         print('   Warning: load method not completed. default pcgn object created.')
 
-        #--close the open file
+        # close the open file
         f.close()
 
         pcgn = ModflowPcgn(model)

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfpks.py

@@ -201,7 +201,7 @@ class ModflowPks(Package):
 
         print('   Warning: load method not completed. default pks object created.')
 
-        #--close the open file
+        # close the open file
         f.close()
 
         pks = ModflowPks(model)

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfrch.py

@@ -78,10 +78,10 @@ class ModflowRch(Package):
         self.nrchop = nrchop
         self.ipakcb = ipakcb
         self.rech = transient_2d(model, (nrow, ncol), np.float32,
-                                 rech, name = "rech_")
+                                 rech, name = 'rech_')
         if self.nrchop == 2:
             self.irch = transient_2d(model, (nrow, ncol), np.int,
-                                     irch+1, name = "irch_")  # irch+1, as irch is zero based
+                                     irch+1, name = 'irch_')  # irch+1, as irch is zero based
         else:
             self.irch = None
         self.np = 0
@@ -111,7 +111,7 @@ class ModflowRch(Package):
                 inirch, file_entry_irch = self.irch.get_kper_entry(kper)
             else:
                 inirch = -1
-            f_rch.write('{0:10d}{1:10d} # {2:s}\n'.format(inrech, 
+            f_rch.write('{0:10d}{1:10d} # {2:s}\n'.format(inrech,
                         inirch, "Stress period " + str(kper + 1)))
             if (inrech >= 0):
                 f_rch.write(file_entry_rech)
@@ -185,7 +185,7 @@ class ModflowRch(Package):
         except:
             pass
 
-        #--dataset 3 and 4 - parameters data
+        # dataset 3 and 4 - parameters data
         pak_parms = None
         if npar > 0:
             pak_parms = mfparbc.loadarray(f, npar, model.verbose)

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfriv.py

@@ -80,9 +80,10 @@ class ModflowRiv(Package):
 
     >>> import flopy
     >>> m = flopy.modflow.Modflow()
-    >>> lrcd = [[[2, 3, 4, 15.6, 1050., -4]]]  #this river boundary will be
-    >>>                                        #applied to all stress periods
-    >>> riv = flopy.modflow.ModflowRiv(m, layer_row_column_data=lrcd)
+    >>> lrcd = {}
+    >>> lrcd[0] = [[2, 3, 4, 15.6, 1050., -4]]  #this river boundary will be
+    >>>                                         #applied to all stress periods
+    >>> riv = flopy.modflow.ModflowRiv(m, stress_period_data=lrcd)
 
     """
 
@@ -106,7 +107,8 @@ class ModflowRiv(Package):
             self.dtype = dtype
         else:
             self.dtype = self.get_default_dtype(structured=self.parent.structured)
-        self.stress_period_data = mflist(model, self.dtype, stress_period_data)
+        #self.stress_period_data = mflist(model, self.dtype, stress_period_data)
+        self.stress_period_data = mflist(self, stress_period_data)
         self.parent.add_package(self)
 
     def __repr__(self):

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfsip.py

@@ -84,7 +84,7 @@ class ModflowSip(Package):
         Write the package input file.
 
         """
-        #--Open file for writing
+        # Open file for writing
         f = open(self.fn_path, 'w')
         f.write('{:10d}{:10d}\n'.format(self.mxiter, self.nparm))
         f.write('{:10.3f}{:10.3f}{:10d}{:10.3f}{:10d}\n'.format(self.accl, self.hclose, self.ipcalc, self.wseed, self.iprsip))
@@ -132,7 +132,7 @@ class ModflowSip(Package):
 
         print('   Warning: load method not completed. default sip object created.')
 
-        #--close the open file
+        # close the open file
         f.close()
 
         sip = ModflowSip(model)

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfsor.py

@@ -72,11 +72,11 @@ class ModflowSor(Package):
 
         print('   Warning: load method not completed. default sor object created.')
 
-        #--close the open file
+        # close the open file
         f.close()
 
-        #--create sor object
+        # create sor object
         sor = ModflowSor(model)
 
-        #--return sor object
+        # return sor object
         return sor

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfswi2.py

@@ -190,7 +190,7 @@ class ModflowSwi2(Package):
         nrow, ncol, nlay, nper = self.parent.nrow_ncol_nlay_nper
         self.heading = '# Salt Water Intrusion (SWI2) package file for MODFLOW-2005, generated by Flopy.'
         
-        #--options
+        # options
         self.fsssopt, self.adaptive = False, False
         if isinstance(options, list):
             if len(options) < 1:
@@ -249,22 +249,22 @@ class ModflowSwi2(Package):
         f = open(self.fn_path, 'w')
         # First line: heading
         f.write('{}\n'.format(self.heading))  # Writing heading not allowed in SWI???
-        #--write dataset 1
-        f.write('#--Dataset 1\n')
+        # write dataset 1
+        f.write('# Dataset 1\n')
         f.write(
             '{:10d}{:10d}{:10d}{:10d}{:10d}{:10d}'.format(self.nsrf, self.istrat, self.nobs, self.iswizt, self.iswibd,
                                                           self.iswiobs))
-        #--write SWI2 options
+        # write SWI2 options
         if self.options != None:
             for o in self.options:
                 f.write(' {}'.format(o))
         f.write('\n')
-        #--write dataset 2a
-        f.write('#--Dataset 2a\n')
+        # write dataset 2a
+        f.write('# Dataset 2a\n')
         f.write('{:10d}{:10d}{:10d}\n'.format(self.nsolver, self.iprsol, self.mutsol))
-        #--write dataset 2b
+        # write dataset 2b
         if self.nsolver == 2:
-            f.write('#--Dataset 2b\n')
+            f.write('# Dataset 2b\n')
             f.write('{:10d}'.format(self.solver2params['mxiter']))
             f.write('{:10d}'.format(self.solver2params['iter1']))
             f.write('{:10d}'.format(self.solver2params['npcond']))
@@ -274,33 +274,33 @@ class ModflowSwi2(Package):
             f.write('{:10d}'.format(self.solver2params['nbpol']))
             f.write('{:14.6g}'.format(self.solver2params['damp']))
             f.write('{:14.6g}\n'.format(self.solver2params['dampt']))
-        #--write dataset 3a
-        f.write('#--Dataset 3a\n')
+        # write dataset 3a
+        f.write('# Dataset 3a\n')
         f.write('{:14.6g}{:14.6g}'.format(self.toeslope, self.tipslope))
         if self.alpha is not None:
             f.write('{:14.6g}{:14.6g}'.format(self.alpha, self.beta))
         f.write('\n')
-        #--write dataset 3b
+        # write dataset 3b
         if self.adaptive is True:
-            f.write('#--Dataset 3b\n')
+            f.write('# Dataset 3b\n')
             f.write('{:10d}{:10d}{:14.6g}\n'.format(self.nadptmx, self.nadptmn, self.adptfct))
-        #--write dataset 4
-        f.write('#--Dataset 4\n')
+        # write dataset 4
+        f.write('# Dataset 4\n')
         f.write(self.nu.get_file_entry())
-        #--write dataset 5
-        f.write('#--Dataset 5\n')
+        # write dataset 5
+        f.write('# Dataset 5\n')
         for isur in range(self.nsrf):
             for ilay in range(nlay):
                 f.write(self.zeta[isur][ilay].get_file_entry())
-        #--write dataset 6
-        f.write('#--Dataset 6\n')
+        # write dataset 6
+        f.write('# Dataset 6\n')
         f.write(self.ssz.get_file_entry())
-        #--write dataset 7
-        f.write('#--Dataset 7\n')
+        # write dataset 7
+        f.write('# Dataset 7\n')
         f.write(self.isource.get_file_entry())
-        #--write dataset 8
+        # write dataset 8
         if self.nobs > 0:
-            f.write('#--Dataset 8\n')
+            f.write('# Dataset 8\n')
             for i in range(self.nobs):
                 #f.write(self.obsnam[i] + 3 * '%10i' % self.obslrc + '\n')
                 f.write('{} '.format(self.obsnam[i]))
@@ -308,7 +308,7 @@ class ModflowSwi2(Package):
                     f.write('{:10d}'.format(v))
                 f.write('\n')
                 
-        #--close swi2 file
+        # close swi2 file
         f.close()
 
 
@@ -386,7 +386,7 @@ class ModflowSwi2(Package):
             if 'adaptive' in t[idx].lower():
                 adaptive = True
 
-        #--read dataset 2a
+        # read dataset 2a
         if model.verbose:
             sys.stdout.write('  loading swi2 dataset 2a\n')
         while True:
@@ -398,7 +398,7 @@ class ModflowSwi2(Package):
         iprsol = int(t[1])
         mutsol = int(t[2])
 
-        #--read dataset 2b
+        # read dataset 2b
         solver2params = {}
         if nsolver == 2:
             if model.verbose:
@@ -418,7 +418,7 @@ class ModflowSwi2(Package):
             solver2params['damp'] = float(t[7])
             solver2params['dampt'] = float(t[8])
 
-        #--read dataset 3a
+        # read dataset 3a
         if model.verbose:
             sys.stdout.write('  loading swi2 dataset 3a\n')
         while True:
@@ -437,7 +437,7 @@ class ModflowSwi2(Package):
             except:
                 pass
 
-        #--read dataset 3b
+        # read dataset 3b
         nadptmx, nadptmn, adptfct = None, None, None
         if adaptive:
             if model.verbose:
@@ -451,7 +451,7 @@ class ModflowSwi2(Package):
             nadptmn = int(t[1])
             adptfct = float(t[2])
 
-        #--read dataset 4
+        # read dataset 4
         if model.verbose:
             print('   loading nu...')
         if istrat == 1:
@@ -468,7 +468,7 @@ class ModflowSwi2(Package):
                           ext_unit_dict)
         nu = nu.array.reshape((nnu))
 
-        #--read dataset 5
+        # read dataset 5
         if model.verbose:
             print('   loading initial zeta surfaces...')
         while True:
@@ -483,7 +483,7 @@ class ModflowSwi2(Package):
             zeta.append(util_3d.load(f, model, (nlay, nrow, ncol),
                                      np.float32, ctxt, ext_unit_dict))
 
-        #--read dataset 6
+        # read dataset 6
         if model.verbose:
             print('   loading initial ssz...')
         while True:
@@ -495,7 +495,7 @@ class ModflowSwi2(Package):
         ssz = util_3d.load(f, model, (nlay, nrow, ncol), np.float32,
                            'ssz', ext_unit_dict)
 
-        #--read dataset 7
+        # read dataset 7
         if model.verbose:
             print('   loading initial isource...')
         while True:
@@ -507,7 +507,7 @@ class ModflowSwi2(Package):
         isource = util_3d.load(f, model, (nlay, nrow, ncol), np.int,
                                'isource', ext_unit_dict)
 
-        #--read dataset 8
+        # read dataset 8
         obsname = []
         obslrc = []
         if nobs > 0:
@@ -531,7 +531,7 @@ class ModflowSwi2(Package):
                 obslrc.append([kk, ii, jj])
                 nobs = len(obsname)
 
-        #--create swi2 instance
+        # create swi2 instance
         swi2 = ModflowSwi2(model, nsrf=nsrf, istrat=istrat, nobs=nobs, iswizt=iswizt, iswibd=iswibd,
                            iswiobs=iswiobs,options=options,
                            nsolver=nsolver, iprsol=iprsol, mutsol=mutsol, solver2params=solver2params,
@@ -540,5 +540,5 @@ class ModflowSwi2(Package):
                            nu=nu, zeta=zeta, ssz=ssz, isource=isource,
                            obsnam=obsname, obslrc=obslrc)
 
-        #--return swi2 instance
+        # return swi2 instance
         return swi2

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfswr1.py

@@ -119,18 +119,18 @@ class ModflowSwr1(Package):
         if model.verbose:
             sys.stdout.write('loading swr1 process file...\n')
 
-        #--todo: everything
+        # todo: everything
         if not hasattr(f, 'read'):
             filename = f
             f = open(filename, 'r')
 
         print('   Warning: load method not completed. default swr1 object created.')
 
-        #--close open file
+        # close open file
         f.close()
 
-        #--create swr1 object instance
+        # create swr1 object instance
         swr1 = ModflowSwr1(model)
 
-        #--return swr object
+        # return swr object
         return swr1

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfupw.py

@@ -170,12 +170,12 @@ class ModflowUpw(Package):
         if iwetdry > 0:
             raise Exception('LAYWET should be 0 for UPW')
 
-        #--get parameters
+        # get parameters
         par_types = []
         if npupw > 0:
             par_types, parm_dict = mfpar.load(f, nplpf, model.verbose)
 
-        #--get arrays
+        # get arrays
         transient = not model.get_package('DIS').steady.all()
         hk = [0] * nlay
         hani = [0] * nlay
@@ -243,14 +243,14 @@ class ModflowUpw(Package):
                     t = mfpar.parameter_fill(model, (nrow, ncol), 'vkcb', parm_dict, findlayer=k)
                 vkcb[k] = t
 
-        #--create upw object
+        # create upw object
         upw = ModflowUpw(model, iupwcb=iupwcb, iphdry=iphdry, hdry=hdry,
                          noparcheck=noparcheck,
                          laytyp=laytyp, layavg=layavg, chani=chani,
                          layvka=layvka, laywet=laywet,
                          hk=hk, hani=hani, vka=vka, ss=ss, sy=sy, vkcb=vkcb)
 
-        #--return upw object
+        # return upw object
         return upw
 
     def plot(self):

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfuzf1.py

@@ -460,16 +460,16 @@ class ModflowUzf1(Package):
             line = f.readline()
             if line[0] != '#':
                 break
-        #--dataset 1
+        # dataset 1
 
-        #--todo: everything
+        # todo: everything
         print('   Warning: load method not completed. default uzf object created.')
 
-        #--close the file
+        # close the file
         f.close()
 
-        #--create uzf object
+        # create uzf object
         uzf = ModflowUzf1(model)
 
-        #--return default uzf object
+        # return default uzf object
         return uzf

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfwel.py

@@ -88,7 +88,6 @@ class ModflowWel(Package):
     >>> import flopy
     >>> m = flopy.modflow.Modflow()
     >>> lrcq = {0:[[2, 3, 4, -100.]], 1:[[2, 3, 4, -100.]]}
-    >>>                              #periods
     >>> wel = flopy.modflow.ModflowWel(m, stress_period_data=lrcq)
 
     """
@@ -122,7 +121,7 @@ class ModflowWel(Package):
             self.dtype = dtype
         else:
             self.dtype = self.get_default_dtype(structured=self.parent.structured)
-        self.stress_period_data = mflist(model, self.dtype, stress_period_data)
+        self.stress_period_data = mflist(self, stress_period_data)
 
     def __repr__(self):
         return 'Well package class'

{flopy-3.2.1 → flopy-3.2.2}/flopy/modflow/mfzon.py

@@ -151,10 +151,10 @@ class ModflowZon(Package):
                 zonnam = t[0].lower()
             if model.verbose:
                 sys.stdout.write('   reading data for "{:<10s}" zone\n'.format(zonnam))
-            #--load data
+            # load data
             t = util_2d.load(f, model, (nrow, ncol), np.int, zonnam,
                              ext_unit_dict)
-            #--add unit number to list of external files in ext_unit_dict to remove.
+            # add unit number to list of external files in ext_unit_dict to remove.
             if t.locat is not None:
                 model.add_pop_key_list(t.locat)
             zone_dict[zonnam] = t