diff --git a/autotest/pst_from_tests.py b/autotest/pst_from_tests.py index aecedb78f..0043456cb 100644 --- a/autotest/pst_from_tests.py +++ b/autotest/pst_from_tests.py @@ -522,7 +522,7 @@ def mf6_freyberg_test(): fw.write("# comment line explaining this external file\n") for line in lines: fw.write(line) - # doctor some of the list par files to add a comment string + with open( os.path.join('temp_pst_from', "freyberg6.wel_stress_period_data_2.txt"), 'r') as fr: @@ -533,6 +533,27 @@ def mf6_freyberg_test(): for line in lines[0:3] + ["# comment mid table \n"] + lines[3:]: fw.write(line) + with open( + os.path.join('temp_pst_from', + "freyberg6.wel_stress_period_data_3.txt"), 'r') as fr: + lines = [line for line in fr] + with open(os.path.join('temp_pst_from', + "freyberg6.wel_stress_period_data_3.txt"), 'w') as fw: + fw.write("#k i j flux \n") + for line in lines: + fw.write(line) + + with open( + os.path.join('temp_pst_from', + "freyberg6.wel_stress_period_data_4.txt"), 'r') as fr: + lines = [line for line in fr] + with open(os.path.join('temp_pst_from', + "freyberg6.wel_stress_period_data_4.txt"), 'w') as fw: + fw.write("# comment line explaining this external file\n" + "#k i j flux\n") + for line in lines: + fw.write(line) + template_ws = "new_temp" # sr0 = m.sr @@ -611,8 +632,35 @@ def mf6_freyberg_test(): pargp="wel_{0}".format(kper), index_cols=[0, 1, 2], use_cols=[3], upper_bound=1.5, lower_bound=0.5, geostruct=gr_gs, mfile_skip='#') + kper = 2 + list_file = "freyberg6.wel_stress_period_data_{0}.txt".format(kper+1) + pf.add_parameters(filenames=list_file, par_type="constant", + par_name_base="twel_mlt_{0}".format(kper), + pargp="twel_mlt".format(kper), index_cols=['#k', 'i', 'j'], + use_cols=['flux'], upper_bound=1.5, lower_bound=0.5, + datetime=dts[kper], geostruct=rch_temporal_gs) + # add temporally indep, but spatially correlated wel flux pars + pf.add_parameters(filenames=list_file, par_type="grid", + par_name_base="wel_grid_{0}".format(kper), + pargp="wel_{0}".format(kper), index_cols=['#k', 'i', 'j'], + use_cols=['flux'], upper_bound=1.5, lower_bound=0.5, + geostruct=gr_gs) + kper = 3 + list_file = "freyberg6.wel_stress_period_data_{0}.txt".format(kper+1) + pf.add_parameters(filenames=list_file, par_type="constant", + par_name_base="twel_mlt_{0}".format(kper), + pargp="twel_mlt".format(kper), index_cols=['#k', 'i', 'j'], + use_cols=['flux'], upper_bound=1.5, lower_bound=0.5, + datetime=dts[kper], geostruct=rch_temporal_gs, + mfile_skip=1) + # add temporally indep, but spatially correlated wel flux pars + pf.add_parameters(filenames=list_file, par_type="grid", + par_name_base="wel_grid_{0}".format(kper), + pargp="wel_{0}".format(kper), index_cols=['#k', 'i', 'j'], + use_cols=['flux'], upper_bound=1.5, lower_bound=0.5, + geostruct=gr_gs, mfile_skip=1) list_files = ["freyberg6.wel_stress_period_data_{0}.txt".format(t) - for t in range(3, m.nper+1)] + for t in range(5, m.nper+1)] for list_file in list_files: kper = int(list_file.split(".")[1].split('_')[-1]) - 1 # add spatially constant, but temporally correlated wel flux pars diff --git a/pyemu/prototypes/pst_from.py b/pyemu/prototypes/pst_from.py index 2d9f85768..952b578c5 100644 --- a/pyemu/prototypes/pst_from.py +++ b/pyemu/prototypes/pst_from.py @@ -565,7 +565,7 @@ def _par_prep(self, filenames, index_cols, use_cols, fmts=None, seps=None, if df.columns.is_integer(): hheader = False else: - hheader = 0 + hheader = df.columns self.logger.statement("loaded list '{0}' of shape {1}" "".format(file_path, df.shape))