Skip to content
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.

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

Develop #29

Merged
merged 36 commits into from
Oct 4, 2022
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
433f825
teset parsing the special actions
Sep 2, 2022
5a14e1e
save SA Actions to store
Sep 2, 2022
fdaf598
retrieve SA from uci?
Sep 2, 2022
ee58ec3
integer needs non na default
Sep 2, 2022
fa3071d
try to add specactions property to h5 object
Sep 2, 2022
42d0e56
print specactions to see
Sep 2, 2022
efbc63d
print specactions to see
Sep 2, 2022
d1b6782
tabs not spaces
Sep 2, 2022
4e12067
tabs not spaces
Sep 2, 2022
a840f0b
debug
Sep 2, 2022
d2044bb
debug
Sep 2, 2022
e7b6f8b
debug
Sep 2, 2022
4ed4cd8
debug
Sep 2, 2022
8b3ec85
some debug off
Sep 2, 2022
6af81e5
change name to be compatible with hdf5 and python tables package
Sep 26, 2022
d5b9aca
2nd location change name to be compatible with hdf5 and python tables…
Sep 26, 2022
0f7c9c6
adjust tabs in specl def in csv
Sep 26, 2022
5c5fa9e
adjust tabs in specl def in csv
Sep 26, 2022
5839456
shortened specl block for testing
Sep 26, 2022
04362fa
adjusted line header detectors to correct length
Sep 26, 2022
b323128
debug
Sep 26, 2022
167dc79
debug
Sep 26, 2022
1e3f7ae
adjusted string matching for exclusive end of pair, i.e., the 1st 3 c…
Sep 26, 2022
46f507d
adjusted parseTable for exclusive ending, tho this is likely not goin…
Sep 26, 2022
1931b1d
debug
Sep 26, 2022
2e143e4
update parse reference, maybe?
Sep 26, 2022
aa63669
debug
Sep 26, 2022
4eaa025
add elifs
Sep 26, 2022
724db4c
correct the match length
Sep 26, 2022
b1ddb69
indicate enclsosure in IF
Sep 26, 2022
7afedb8
fix add to d
Sep 26, 2022
d2389a2
clean up if-then draft
Sep 27, 2022
61dfb9b
debug off
Sep 27, 2022
08dd5ac
newline
rburghol Sep 27, 2022
ab608e0
ignore hdf5 in case someone tests in tree
rburghol Sep 27, 2022
504f3ec
Merge pull request #102 from HARPgroup/psa
PaulDudaRESPEC Sep 30, 2022
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
Prev Previous commit
Next Next commit
adjust tabs in specl def in csv
Burgholzer authored and Burgholzer committed Sep 26, 2022
commit 0f7c9c62eaf680065027a59cb0b2749a847f0a76
41 changes: 21 additions & 20 deletions HSP2tools/data/ParseTable.csv
Original file line number Diff line number Diff line change
@@ -2395,23 +2395,24 @@
2331,GENER,OPCODE,GENER,OPCODES,OPCODE,I,11,16,0
2332,GENER,PARM,GENER,INFO,OPNID,C,0,10,0
2332,GENER,PARM,GENER,INFO,K,R,11,21,0.0E0
2333,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,OPTYP,C,0,9,na
2334,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,RANGE,C,9,6,na
2335,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,DC,C,15,3,na
2336,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,DS,C,18,3,na
2337,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,YR,C,20,4,na
2338,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,MO,C,25,2,na
2339,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,DA,C,28,2,na
2340,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,HR,C,31,2,na
2341,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,MN,C,34,2,na
2342,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,D,C,36,2,na
2343,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,T,I,38,2,2
2344,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,VARI,C,40,8,na
2345,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,S1,C,48,3,na
2346,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,S2,C,51,3,na
2347,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,S3,C,54,3,na
2348,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,AC,C,57,3,na
2349,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,VALUE,R,60,10,0
2350,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,TC,C,70,3,na
2351,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,TS,C,74,4,na
2352,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,NUM,C,74,3,na
2333,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,OPTYP,C,0,8,na
2334,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,RANGE1,C,8,3,na
2335,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,RANGE2,C,11,4,na
2336,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,DC,C,15,3,na
2337,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,DS,C,18,3,na
2338,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,YR,C,20,4,na
2339,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,MO,C,25,2,na
2340,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,DA,C,28,2,na
2341,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,HR,C,31,2,na
2342,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,MN,C,34,2,na
2343,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,D,C,36,2,na
2344,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,T,I,38,2,2
2345,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,VARI,C,40,8,na
2346,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,S1,C,48,3,na
2347,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,S2,C,51,3,na
2348,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,S3,C,54,3,na
2349,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,AC,C,57,3,na
2350,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,VALUE,R,60,10,0
2351,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,TC,C,70,3,na
2352,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,TS,C,74,4,na
2353,SPEC-ACTIONS,ACTIONS,SPEC-ACTIONS,SPEC-ACTIONS,NUM,C,74,3,na
2 changes: 1 addition & 1 deletion HSP2tools/readUCI.py
Original file line number Diff line number Diff line change
@@ -452,7 +452,7 @@ def specactions(info, llines):
store, parse, path, *_ = info
lines = iter(llines)
sa_actions = [] # referred to as "classic" in old HSPF code comments
head_actions = ['OPERATION','RANGE','DC','DS','YR','MO','DA','HR','MN','D','T','VARI', 'S1','S2','AC','VALUE','TC','TS','NUM']
head_actions = ['OPERATION','RANGE1','RANGE2','DC','DS','YR','MO','DA','HR','MN','D','T','VARI', 'S1','S2','AC','VALUE','TC','TS','NUM']
sa_mult = []
head_mult = []
sa_uvquan = []