223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

prevent import errors (e.g. when using Abaqus, having it's own python without scipy)

This commit is contained in:
Martin Diehl 2016-02-02 23:24:44 +01:00
parent 23f1344031
commit 2a3e42a906
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/damask/util.py
View File

@ -180,7 +180,6 @@ other codes refers to the source code of minpack.py:
''' '''
from numpy import (array, arcsin, asarray, cos, dot, eye, empty_like, from numpy import (array, arcsin, asarray, cos, dot, eye, empty_like,
isscalar,finfo, take, triu, transpose, sqrt, sin) isscalar,finfo, take, triu, transpose, sqrt, sin)
from scipy.optimize import _minpack
def _check_func(checker, argname, thefunc, x0, args, numinputs, def _check_func(checker, argname, thefunc, x0, args, numinputs,
output_shape=None): output_shape=None):
@ -279,6 +278,7 @@ def _ext2intLocal(bound):
def leastsqBound(func, x0, args=(), bounds=None, Dfun=None, full_output=0, def leastsqBound(func, x0, args=(), bounds=None, Dfun=None, full_output=0,
col_deriv=0, ftol=1.49012e-8, xtol=1.49012e-8, col_deriv=0, ftol=1.49012e-8, xtol=1.49012e-8,
gtol=0.0, maxfev=0, epsfcn=None, factor=100, diag=None): gtol=0.0, maxfev=0, epsfcn=None, factor=100, diag=None):
from scipy.optimize import _minpack
''' '''
An internal parameter list is used to enforce contraints on the fitting An internal parameter list is used to enforce contraints on the fitting
parameters. The transfomation is based on that of MINUIT package. parameters. The transfomation is based on that of MINUIT package.