diff --git a/__pycache__/analysis.cpython-37.pyc b/__pycache__/analysis.cpython-37.pyc index 4f125c3..015c94a 100644 Binary files a/__pycache__/analysis.cpython-37.pyc and b/__pycache__/analysis.cpython-37.pyc differ diff --git a/__pycache__/presg.cpython-37.pyc b/__pycache__/presg.cpython-37.pyc index 64c1e61..839220b 100644 Binary files a/__pycache__/presg.cpython-37.pyc and b/__pycache__/presg.cpython-37.pyc differ diff --git a/__pycache__/sg.cpython-37.pyc b/__pycache__/sg.cpython-37.pyc index 2987494..6ac1824 100644 Binary files a/__pycache__/sg.cpython-37.pyc and b/__pycache__/sg.cpython-37.pyc differ diff --git a/__pycache__/utils.cpython-37.pyc b/__pycache__/utils.cpython-37.pyc index 0825f9d..3fe3ea1 100644 Binary files a/__pycache__/utils.cpython-37.pyc and b/__pycache__/utils.cpython-37.pyc differ diff --git a/analysis.py b/analysis.py index 8050950..cb87731 100644 --- a/analysis.py +++ b/analysis.py @@ -26,6 +26,8 @@ def solve(sg_xml, analysis, solver, scrnout=True): * fi - initial failure indices and strength ratios solver : str Format of the generated input file ('vabs' or 'swiftcomp'). + scrnout : bool, default True + Switch of printing solver messages. """ # Preprocess @@ -54,11 +56,9 @@ def run(input_name, analysis, solver, smdim, scrnout=True): Parameters ---------- - solver : str - Excect command string of the code ('vabs' or 'swiftcomp'). input_name : str Name of the input file. - analysis : str + analysis : {'h', 'd', 'l', 'f', 'fe', 'fi'} Analysis to be carried out. * h - homogenization @@ -66,10 +66,12 @@ def run(input_name, analysis, solver, smdim, scrnout=True): * f - initial failure strength * fe - initial failure envelope * fi - initial failure indices and strength ratios + solver : {'swiftcomp', 'vabs'} + Excect command string of the code ('vabs' or 'swiftcomp'). smdim : int Dimension of the macroscopic structural model. - scrnout : bool - Print solver messages. + scrnout : bool, default True + Switch of printing solver messages. """ try: analysis_long = { diff --git a/analysis.pyc b/analysis.pyc index 8f7a5bc..4a90ea5 100644 Binary files a/analysis.pyc and b/analysis.pyc differ diff --git a/doc/build/doctrees/analysis.doctree b/doc/build/doctrees/analysis.doctree index ff9fdc2..cc5f6ae 100644 Binary files a/doc/build/doctrees/analysis.doctree and b/doc/build/doctrees/analysis.doctree differ diff --git a/doc/build/doctrees/beam.doctree b/doc/build/doctrees/beam.doctree index f21bf63..d086ea7 100644 Binary files a/doc/build/doctrees/beam.doctree and b/doc/build/doctrees/beam.doctree differ diff --git a/doc/build/doctrees/environment.pickle b/doc/build/doctrees/environment.pickle index fcc5c6f..707f2d3 100644 Binary files a/doc/build/doctrees/environment.pickle and b/doc/build/doctrees/environment.pickle differ diff --git a/doc/build/doctrees/iogebt.doctree b/doc/build/doctrees/iogebt.doctree index 1ab29d6..43231e0 100644 Binary files a/doc/build/doctrees/iogebt.doctree and b/doc/build/doctrees/iogebt.doctree differ diff --git a/doc/build/doctrees/ioutils.doctree b/doc/build/doctrees/ioutils.doctree index 1061b3e..3647d54 100644 Binary files a/doc/build/doctrees/ioutils.doctree and b/doc/build/doctrees/ioutils.doctree differ diff --git a/doc/build/doctrees/iovabs.doctree b/doc/build/doctrees/iovabs.doctree index f42ed44..bec6eb4 100644 Binary files a/doc/build/doctrees/iovabs.doctree and b/doc/build/doctrees/iovabs.doctree differ diff --git a/doc/build/doctrees/ms_analysis.doctree b/doc/build/doctrees/ms_analysis.doctree index 11c7233..4c715c4 100644 Binary files a/doc/build/doctrees/ms_analysis.doctree and b/doc/build/doctrees/ms_analysis.doctree differ diff --git a/doc/build/doctrees/prebeam.doctree b/doc/build/doctrees/prebeam.doctree index 0dc8aad..6e52ea1 100644 Binary files a/doc/build/doctrees/prebeam.doctree and b/doc/build/doctrees/prebeam.doctree differ diff --git a/doc/build/doctrees/presg.doctree b/doc/build/doctrees/presg.doctree index 286b837..137fc71 100644 Binary files a/doc/build/doctrees/presg.doctree and b/doc/build/doctrees/presg.doctree differ diff --git a/doc/build/doctrees/sg.doctree b/doc/build/doctrees/sg.doctree index fe48717..25907bc 100644 Binary files a/doc/build/doctrees/sg.doctree and b/doc/build/doctrees/sg.doctree differ diff --git a/doc/build/doctrees/utils.doctree b/doc/build/doctrees/utils.doctree index 2c981fc..191c76b 100644 Binary files a/doc/build/doctrees/utils.doctree and b/doc/build/doctrees/utils.doctree differ diff --git a/doc/build/html/_sources/utils.rst.txt b/doc/build/html/_sources/utils.rst.txt index ba80118..710a790 100644 --- a/doc/build/html/_sources/utils.rst.txt +++ b/doc/build/html/_sources/utils.rst.txt @@ -10,3 +10,5 @@ Utility Functions .. autofunction:: msgpi.utils.calcRotationTensorFromParameters .. autofunction:: msgpi.utils.calcCab + +.. autofunction:: msgpi.utils.parseXML diff --git a/doc/build/html/analysis.html b/doc/build/html/analysis.html index 8660f26..33b8c68 100644 --- a/doc/build/html/analysis.html +++ b/doc/build/html/analysis.html @@ -25,6 +25,7 @@ + @@ -82,7 +83,7 @@

Contents: