Skip to content

patching for primary marker with spaces #161

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
Aug 5, 2020
Merged

patching for primary marker with spaces #161

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
3 changes: 3 additions & 0 deletions autotest/ins/primary.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
datetime,dif_bgs_H_mean
2017-07-22 16:00:00,0.0
2017-07-22 17:00:00,-0.01093397575757582
3 changes: 3 additions & 0 deletions autotest/ins/primary.dat.ins
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pif @
@2017-07-22 16:00:00,@ !20170722_16_dif_wlev_bgs_H!
@2017-07-22 17:00:00,@ !20170722_17_dif_wlev_bgs_H!
4 changes: 2 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 @@ -1303,7 +1303,7 @@ def mf6_freyberg_direct_test():
if __name__ == "__main__":
#freyberg_test()
#freyberg_prior_build_test()
#mf6_freyberg_test()
mf6_freyberg_shortnames_test()
mf6_freyberg_test()
#mf6_freyberg_shortnames_test()
#mf6_freyberg_da_test()
#mf6_freyberg_direct_test()
12 changes: 9 additions & 3 deletions autotest/pst_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,11 @@ def try_process_ins_test():
import pandas as pd
import pyemu

ins_file = os.path.join("ins","primary.dat.ins")
i = pyemu.pst_utils.InstructionFile(ins_file)
df2 = i.read_output_file(ins_file.replace(".ins", ""))
print(df2)

ins_file = os.path.join("utils", "BH.mt3d.processed.ins")
i = pyemu.pst_utils.InstructionFile(ins_file)
df2 = i.read_output_file(ins_file.replace(".ins",""))
Expand All @@ -507,6 +512,7 @@ def try_process_ins_test():




def sanity_check_test():
import os
import pyemu
Expand Down Expand Up @@ -864,14 +870,14 @@ def new_format_path_mechanics_test():

if __name__ == "__main__":

process_output_files_test()
#process_output_files_test()
#change_limit_test()
#new_format_test()
#lt_gt_constraint_names_test()
csv_to_ins_test()
#csv_to_ins_test()
#pst_from_flopy_geo_draw_test()
#pst_from_flopy_specsim_draw_test()
#try_process_ins_test()
try_process_ins_test()
# write_tables_test()
#res_stats_test()
# test_write_input_files()
Expand Down
2 changes: 1 addition & 1 deletion pyemu/pst/pst_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ def find_all(a_str, sub):
yield start
start += len(sub)
midx = list(find_all(line,self._marker))
midx.append(len(line)-1)
midx.append(len(line))
first =line[:midx[0]].strip()
tokens = []
if len(first) > 0:
Expand Down