Merge pull request #558 from bobmyhill/prod

np.product->np.prod

burnman/optimize/eos_fitting.py

@@ -187,7 +187,7 @@ def fit_PTp_data(
  )
 
  # Apply mle tolerances if they dont exist
- if mle_tolerances == []:
+ if len(mle_tolerances) == 0:
  mineral.set_state(1.0e5, 300.0)
  mle_tolerance_factor = 1.0e-5
  mle_tolerances = np.empty(len(flags))
@@ -200,7 +200,7 @@ def fit_PTp_data(
  # If covariance matrix is not given, apply unit weighting to all pressures
  # (with zero errors on T and p)
  covariances_defined = True
- if data_covariances == []:
+ if len(data_covariances) == 0:
  covariances_defined = False
  data_covariances = np.zeros((len(data[:, 0]), len(data[0]), len(data[0])))
  for i in range(len(data_covariances)):
@@ -535,7 +535,7 @@ def fit_XPTp_data(
  )
 
  # Apply mle tolerances if they dont exist
- if mle_tolerances == []:
+ if len(mle_tolerances) == 0:
  solution.set_state(1.0e5, 300.0)
  mle_tolerance_factor = 1.0e-5
  mle_tolerances = np.empty(len(flags))
@@ -548,7 +548,7 @@ def fit_XPTp_data(
  # If covariance matrix is not given, apply unit weighting to all pressures
  # (with zero errors on T and property)
  covariances_defined = True
- if data_covariances == []:
+ if len(data_covariances) == 0:
  covariances_defined = False
  nX = solution.n_endmembers
  data_covariances = np.zeros((len(data[:, 0]), len(data[0]), len(data[0])))

burnman/tools/equilibration.py

@@ -1071,7 +1071,7 @@ def equilibrate(
  updated_params = True
 
  # Finally, make dimensions of sol_array equal the input dimensions
- if np.product(sol_array.shape) > 1:
+ if np.prod(sol_array.shape) > 1:
  sol_array = np.squeeze(sol_array)
  else:
  sol_array = sol_array.flatten()[0]

burnman/utils/geotherm.py

@@ -127,7 +127,7 @@ def adiabatic(pressures, T0, rock):
  rock.set_state(pressures[0], T0)
  S0 = rock.S
 
- delta_S = lambda T, P, rock, S0: S0 - rock.evaluate(["S"], [P], [T])[0]
+ delta_S = lambda T, P, rock, S0: S0 - rock.evaluate(["S"], [P], [T])[0][0]
 
  temperatures = np.empty_like(pressures)
  temperatures[0] = T0

burnman/utils/misc.py

@@ -214,7 +214,7 @@ def attribute_function(m, attributes, powers=[]):
  """
  if type(attributes) is str:
  attributes = [attributes]
- if powers == []:
+ if len(powers) == 0:
  powers = [1.0 for a in attributes]
 
  def f(x):