forgot also needed to make changes in method

Author: briochh

autotest/utils_tests.py

@@ -1518,6 +1518,7 @@ def hfb_zn_mult_test():
     for i in range(m.nrow)[21:]:
         hfb_data.append([0, i, jcol1, i, jcol2, 0.003])
     flopy.modflow.ModflowHfb(m, 0, 0, len(hfb_data), hfb_data=hfb_data)
+    orig_len = len(m.hfb6.hfb_data)
     m.change_model_ws("temp")
     m.write_input()
     m.exe_name = "mfnwt"
@@ -1528,19 +1529,20 @@ def hfb_zn_mult_test():
 
     orig_vals, tpl_file = pyemu.gw_utils.write_hfb_zone_multipliers_template(m)
     assert os.path.exists(tpl_file)
-    hfb_pars = pd.read_csv(os.path.join('temp', 'hfb6_pars.csv'))
+    hfb_pars = pd.read_csv(os.path.join(m.model_ws, 'hfb6_pars.csv'))
     hfb_tpl_contents = open(tpl_file, 'r').readlines()
     mult_str = ''.join(hfb_tpl_contents[1:]).replace(
         '~  hbz_0000  ~', '0.1').replace(
         '~  hbz_0001  ~', '1.0').replace(
         '~  hbz_0002  ~', '10.0')
     with open(hfb_pars.mlt_file.values[0], 'w') as mfp:
         mfp.write(mult_str)
-    pyemu.helpers.apply_hfb_pars(os.path.join('temp', 'hfb6_pars.csv'))
+    pyemu.helpers.apply_hfb_pars(os.path.join(m.model_ws, 'hfb6_pars.csv'))
     with open(hfb_pars.mlt_file.values[0], 'r') as mfp:
         for i, line in enumerate(mfp):
             pass
-    assert i-1 == m.hfb6.hfb_data.shape[0]
+    mhfb = flopy.modflow.ModflowHfb.load(hfb_pars.model_file.values[0], m)
+    assert i-1 == orig_len == len(mhfb.hfb_data)
 
 
 def read_runstor_test():

pyemu/utils/gw_utils.py

@@ -2362,7 +2362,7 @@ def write_hfb_zone_multipliers_template(m):
     header = hfb_file_contents[:skiprows]
 
     # read in the data
-    names = ['lay', 'irow1','icol1','irow2','icol2', 'hydchr']
+    names = ['lay', 'irow1', 'icol1', 'irow2', 'icol2', 'hydchr']
     hfb_in = pd.read_csv(hfb_file, skiprows=skiprows,
                          delim_whitespace=True, names=names).dropna()
     for cn in names[:-1]:
@@ -2386,7 +2386,7 @@ def write_hfb_zone_multipliers_template(m):
         ofp.write('ptf ~\n')
         [ofp.write('{0}\n'.format(line.strip())) for line in header]
         ofp.flush()
-        hfb_in[['lay', 'irow1','icol1','irow2','icol2', 'tpl']].to_csv(
+        hfb_in[['lay', 'irow1', 'icol1', 'irow2', 'icol2', 'tpl']].to_csv(
             ofp, sep=' ', quotechar=' ', header=None, index=None, mode='a')
 
     # make a lookup for lining up the necessary files to
@@ -2397,7 +2397,7 @@ def write_hfb_zone_multipliers_template(m):
         ofp.write('{0},{1},{2}\n'.format(
             os.path.join(m.model_ws, 'hfb6_org', m.hfb6.file_name[0]),
             os.path.join(m.model_ws, 'hfb6_mlt',
-                         os.path.basename(tpl_file).replace('.tpl','')),
+                         os.path.basename(tpl_file).replace('.tpl', '')),
             hfb_file))
 
     return hfb_mults, tpl_file

pyemu/utils/helpers.py

@@ -3600,31 +3600,34 @@ def apply_list_pars():
                     fmts += " %9G"
         np.savetxt(os.path.join(model_ext_path, fname), df_list.loc[:, names].values, fmt=fmts)
 
-def apply_hfb_pars():
+def apply_hfb_pars(par_file='hfb6_pars.csv'):
     """ a function to apply HFB multiplier parameters.  Used to implement
     the parameterization constructed by write_hfb_zone_multipliers_template()
 
-    This is to account for the horrible HFB6 format that differs from other BCs making this a special case
+    This is to account for the horrible HFB6 format that differs from other
+    BCs making this a special case
 
     Note
     ----
     requires "hfb_pars.csv"
 
     should be added to the forward_run.py script
     """
-    hfb_pars = pd.read_csv('hfb6_pars.csv')
+    hfb_pars = pd.read_csv(par_file)
 
     hfb_mults_contents = open(hfb_pars.mlt_file.values[0], 'r').readlines()
-    skiprows = sum([1 if i.strip().startswith('#') else 0 for i in hfb_mults_contents]) + 1
+    skiprows = sum([1 if i.strip().startswith('#') else 0
+                    for i in hfb_mults_contents]) + 1
     header = hfb_mults_contents[:skiprows]
 
     # read in the multipliers
     names = ['lay', 'irow1','icol1','irow2','icol2', 'hydchr']
-    hfb_mults = pd.read_csv(hfb_pars.mlt_file.values[0], skiprows=skiprows, delim_whitespace=True, names=names).dropna()
-
+    hfb_mults = pd.read_csv(hfb_pars.mlt_file.values[0], skiprows=skiprows,
+                            delim_whitespace=True, names=names).dropna()
 
     # read in the original file
-    hfb_org = pd.read_csv(hfb_pars.org_file.values[0], skiprows=skiprows, delim_whitespace=True, names=names).dropna()
+    hfb_org = pd.read_csv(hfb_pars.org_file.values[0], skiprows=skiprows,
+                          delim_whitespace=True, names=names).dropna()
 
     # multiply it out
     hfb_org.hydchr *= hfb_mults.hydchr
@@ -3633,11 +3636,12 @@ def apply_hfb_pars():
         hfb_mults[cn] = hfb_mults[cn].astype(np.int)
         hfb_org[cn] = hfb_org[cn].astype(np.int)
     # write the results
-    with open(hfb_pars.model_file.values[0], 'w') as ofp:
+    with open(hfb_pars.model_file.values[0], 'w', newline='') as ofp:
         [ofp.write('{0}\n'.format(line.strip())) for line in header]
+        ofp.flush()
+        hfb_org[['lay', 'irow1', 'icol1', 'irow2', 'icol2', 'hydchr']].to_csv(
+            ofp, sep=' ', header=None, index=None)
 
-        hfb_org[['lay', 'irow1','icol1','irow2','icol2', 'hydchr']].to_csv(ofp, sep=' ',
-                header=None, index=None)
 
 def write_const_tpl(name, tpl_file, suffix, zn_array=None, shape=None, spatial_reference=None,
                     longnames=False):