1013

wenbinyugroup · Oct 13, 2020 · 55f8e02 · 55f8e02
1 parent 4075928
commit 55f8e02
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/__pycache__/analysis.cpython-37.pyc b/__pycache__/analysis.cpython-37.pyc
diff --git a/__pycache__/presg.cpython-37.pyc b/__pycache__/presg.cpython-37.pyc
diff --git a/analysis.py b/analysis.py
@@ -9,7 +9,7 @@
 import msgpi.io.iovabs as miovabs
 
 
-def solve(sg_xml, analysis, solver, scrnout=True):
+def solve(sg_xml, analysis, ppcmd, solver, scrnout=True):
     """Solve
 
     Parameters
@@ -24,14 +24,16 @@ def solve(sg_xml, analysis, solver, scrnout=True):
         * f - initial failure strength
         * fe - initial failure envelope
         * fi - initial failure indices and strength ratios
+    ppcmd : str
+        Preprocessor command.
     solver : str
         Format of the generated input file ('vabs' or 'swiftcomp').
     scrnout : bool, default True
         Switch of printing solver messages.
     """
 
     # Preprocess
-    sg_in, smdim = psg.preSG(sg_xml, analysis, solver)
+    sg_in, smdim = psg.preSG(sg_xml, analysis, ppcmd, solver)
 
     # Solve
     run(sg_in, analysis, solver, smdim, scrnout)

diff --git a/ms/__pycache__/iogebt.cpython-37.pyc b/ms/__pycache__/iogebt.cpython-37.pyc
diff --git 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: