Commit 12803f1c by Philipp Arras

### Simplify

parent edcfec7b
Pipeline #77555 passed with stages
in 13 minutes and 19 seconds
 ... @@ -81,16 +81,15 @@ class SimpleCorrelatedField(Operator): ... @@ -81,16 +81,15 @@ class SimpleCorrelatedField(Operator): shift[0] = _log_vol(pspace)**2/12. shift[0] = _log_vol(pspace)**2/12. shift = makeField(dom, shift) shift = makeField(dom, shift) if asperity is None: if asperity is None: asp = makeOp(shift.ptw("sqrt")) asp = makeOp(shift.ptw("sqrt")) @ (xi*sig_flex) a = a + _SlopeRemover(pspace, 0) @ twolog @ asp @ (xi*sig_flex) else: else: asp = LognormalTransform(*asperity, prefix + 'asperity', 0) asp = LognormalTransform(*asperity, prefix + 'asperity', 0) vasp = np.zeros(dom.shape) vasp = np.zeros(dom.shape) vasp[0] = 1 vasp[0] = 1 vasp = makeOp(makeField(dom, vasp)) vasp = makeOp(makeField(dom, vasp)) sig_asp = vasp @ expander @ asp sig_asp = vasp @ expander @ asp asp = (Adder(shift) @ sig_asp).ptw("sqrt") asp = xi*sig_flex*(Adder(shift) @ sig_asp).ptw("sqrt") a = a + _SlopeRemover(pspace, 0) @ twolog @ (xi*sig_flex*asp) a = a + _SlopeRemover(pspace, 0) @ twolog @ asp a = _Normalization(pspace, 0) @ a a = _Normalization(pspace, 0) @ a maskzm = np.ones(pspace.shape) maskzm = np.ones(pspace.shape) maskzm[0] = 0 maskzm[0] = 0 ... ...
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!