From 55f8e0298ca4bb8756da2a1369d71cbfcf2458d7 Mon Sep 17 00:00:00 2001 From: Su Tian Date: Tue, 13 Oct 2020 05:42:07 -0400 Subject: [PATCH] 1013 --- __pycache__/analysis.cpython-37.pyc | Bin 3058 -> 3264 bytes __pycache__/presg.cpython-37.pyc | Bin 6950 -> 7057 bytes analysis.py | 6 ++++-- ms/__pycache__/iogebt.cpython-37.pyc | Bin 7362 -> 7835 bytes presg.py | 6 ++++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/__pycache__/analysis.cpython-37.pyc b/__pycache__/analysis.cpython-37.pyc index 015c94a7f1e95ff02cc60166450b502f23c64b2f..e01b471384eb3e5878a31b8b0810b223dfae6c37 100644 GIT binary patch delta 702 zcma)(&ubGw6vub=cM{u1h)pV1$I}v;MtW+g7pb5XJP2toMJb!iCRwsS!px*Ua2AmY zf(NC}RVBH2@EZRBPyP|{sNmhdz&9JQ9(}v-v+uq6&YK_mtNLYSac5znsDZuz@Zzw! zbiVlMnWa*&0=Nx+7o5EYaBYl)CXmpDF)<(OnU&dG7Zy|uVGHxjLK-&+IztFlL?7t1 zFAQS9_aQgOmavFf)g~x&k{Z-4s1t6Foq1i@6FqZ;v))pZZ5X6UjW_}gZ2Aghu388r zu5eo#0k0SQeSO+SFHwCs?8F3bW5#I_|FK6j7}B&8FqTr>N#od0NK^jM5AL%LP0|qu zeLGE~1|~t*A4MGR(NXYsdh0mkojy*xcu2#9he;2!G&%|>j-jRB3z*z8-d!ym*sOPW z5=S%FPyFbVg=}W!+mSzwTc{$d=9AT0#V8vtQcpQ|6R3ksr)tLw@RCkP)}h)UMpQkYw~s}y0NSZs(&t?ulY}F`L$Fx8pQ{{0g0@tN&o-= delta 468 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 QY8XY;{eQZ z9zA%{0TKKIJa`ZZcohWkCiEoCAK+2&=Fxc*ur0c!tF)`tN-_@iA@n2kAQUB3br_Y4(8D+q zng^$lP*CG1I!CpM*4@sGu1#{&=zVYw4|KtPj5(-Ic_e@V+#W{gMqd_)<#;q8tes^7 znY{?Z2xSS?lE}G%*&r*CDf7Yz|7P@c97Fmz|7ncZ#-u5-mgkx6i^g%UGwKN4rw&wc z+XaNhUc^imktUqs^SQp<&g!GwQ|)%^SMH&n+}Pra-CO*3&+z71d9<2@Nx1+%2hJmO zAao)q;sRP(1PocK8#A;)f;G#FNwr(O9Hx-n{c^a7KBeq`-VCY(o7*i=>JPvrJT!uE z1)(j1wCaXW{1pPsqyeBFFoWL0j#pdGI$TBO8ZvnjIA-Xg97v#KFpDsUfRe%WgiH!& z(7b_g6X6y=TD-7Jxktr8Z7+XOe5Wn6rb>Ogx2XaRXk^E*W<{}7U8HG5d$$HujLvZS;6*=H= z67S3Ytx&a4Bz-1y2p_Ai3f-ow|7iXgWO*q1jo>+79(Xbfm{$WGm!e1qvEN*WRlGg# zvqqDS`)quLSU!Z(*Df!QY^Ke!hDgevS1LobWsEqDpa%QzB)}s2Fwu^3)G*Zeqso|G H&W!v4VLTwb diff --git a/presg.py b/presg.py index 841f9f8..912c029 100644 --- a/presg.py +++ b/presg.py @@ -278,7 +278,7 @@ def preSG1D(xr_sg, smdim): return sg -def preSG(sg_xml, analysis, solver='swiftcomp', write_input=True, scrnout=True): +def preSG(sg_xml, analysis, ppcmd='prevabs', solver='swiftcomp', write_input=True, scrnout=True): """ Preprocessor of a structure gene. Parameters @@ -294,6 +294,8 @@ def preSG(sg_xml, analysis, solver='swiftcomp', write_input=True, scrnout=True): * f - initial failure strength * fe - initial failure envelope * fi - initial failure indices and strength ratios + ppcmd : str, default 'prevabs' + Preprocessor command. solver : str, default 'swiftcomp' Format of the generated input file ('vabs' or 'swiftcomp') write_input : bool @@ -319,7 +321,7 @@ def preSG(sg_xml, analysis, solver='swiftcomp', write_input=True, scrnout=True): if xr_sg.tag == 'cross_section': smdim = 1 - cmd = ['prevabs', '-i', sg_xml] + cmd = [ppcmd, '-i', sg_xml] if 'vabs' in solver: cmd.append('-vabs') elif 'swiftcomp' in solver: