From fbc57654776c92d03f25d9dedd80129dd1984622 Mon Sep 17 00:00:00 2001
From: Gordian Edenhofer <gordian.edenhofer@gmail.com>
Date: Tue, 30 Jun 2020 22:00:54 +0200
Subject: [PATCH] correlated_fields*.py: Increase readability
`foo` and `bar` are completely meaningless variables names. Let's rather
use names that will subsequently change type but at least make the
intention clear.
---
src/library/correlated_fields.py | 29 ++++++++++++-------------
src/library/correlated_fields_simple.py | 2 +-
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/library/correlated_fields.py b/src/library/correlated_fields.py
index c64846cf5..e314df01f 100644
--- a/src/library/correlated_fields.py
+++ b/src/library/correlated_fields.py
@@ -240,31 +240,30 @@ class _Amplitude(Operator):
ps_expander = ContractionOperator(twolog.target, spaces=space).adjoint
# Prepare constant fields
- foo = np.zeros(shp)
- foo[0] = foo[1] = np.sqrt(_log_vol(target[space]))
- vflex = DiagonalOperator(makeField(dom[space], foo), dom, space)
+ vflex = np.zeros(shp)
+ vflex[0] = vflex[1] = np.sqrt(_log_vol(target[space]))
+ vflex = DiagonalOperator(makeField(dom[space], vflex), dom, space)
- foo = np.zeros(shp, dtype=np.float64)
- foo[0] += 1
- vasp = DiagonalOperator(makeField(dom[space], foo), dom, space)
+ vasp = np.zeros(shp, dtype=np.float64)
+ vasp[0] += 1
+ vasp = DiagonalOperator(makeField(dom[space], vasp), dom, space)
- foo = np.ones(shp)
- foo[0] = _log_vol(target[space])**2/12.
- shift = DiagonalOperator(makeField(dom[space], foo), dom, space)
+ shift = np.ones(shp)
+ shift[0] = _log_vol(target[space])**2 / 12.
+ shift = DiagonalOperator(makeField(dom[space], shift), dom, space)
+ shift = shift(full(shift.domain, 1))
vslope = DiagonalOperator(
makeField(target[space], _relative_log_k_lengths(target[space])),
target, space)
- foo, bar = [np.zeros(target[space].shape) for _ in range(2)]
- bar[1:] = foo[0] = totvol
+ vol0, vol1 = [np.zeros(target[space].shape) for _ in range(2)]
+ vol1[1:] = vol0[0] = totvol
vol0, vol1 = [
DiagonalOperator(makeField(target[space], aa), target, space)
- for aa in (foo, bar)
+ for aa in (vol0, vol1)
]
-
- # Prepare fields for Adder
- shift, vol0 = [op(full(op.domain, 1)) for op in (shift, vol0)]
+ vol0 = vol0(full(vol0.domain, 1))
# End prepare constant fields
slope = vslope @ ps_expander @ loglogavgslope
diff --git a/src/library/correlated_fields_simple.py b/src/library/correlated_fields_simple.py
index 3209b8c8e..6b96d2259 100644
--- a/src/library/correlated_fields_simple.py
+++ b/src/library/correlated_fields_simple.py
@@ -78,7 +78,7 @@ class SimpleCorrelatedField(Operator):
xi = ducktape(dom, None, prefix + 'spectrum')
shift = np.ones(dom.shape)
- shift[0] = _log_vol(pspace)**2/12.
+ shift[0] = _log_vol(pspace)**2 / 12.
shift = makeField(dom, shift)
if asperity is None:
asp = makeOp(shift.ptw("sqrt")) @ (xi*sig_flex)
--
GitLab