Skip to content

Fix for headers in par files (when index_cols are str type) #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2020
Merged

Fix for headers in par files (when index_cols are str type) #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 50 additions & 2 deletions autotest/pst_from_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyemu/prototypes/pst_from.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down