Commit 261eb62c authored by Julia Stadler's avatar Julia Stadler
Browse files

choose mutifield key as argument and removed exp from the definition of MfCorrelatedField

parent 36c7db94
...@@ -47,7 +47,7 @@ def CorrelatedField(s_space, amplitude_model): ...@@ -47,7 +47,7 @@ def CorrelatedField(s_space, amplitude_model):
def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial, def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial,
amplitude_model_energy): amplitude_model_energy, name=None):
''' '''
Method for construction of correlated multi-frequency fields Method for construction of correlated multi-frequency fields
''' '''
...@@ -58,6 +58,9 @@ def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial, ...@@ -58,6 +58,9 @@ def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial,
ht2 = HarmonicTransformOperator(ht1.target, space=1) ht2 = HarmonicTransformOperator(ht1.target, space=1)
ht = ht2(ht1) ht = ht2(ht1)
if name==None:
name="xi"
p_space_spatial = amplitude_model_spatial.target[0] p_space_spatial = amplitude_model_spatial.target[0]
p_space_energy = amplitude_model_energy.target[0] p_space_energy = amplitude_model_energy.target[0]
...@@ -72,4 +75,4 @@ def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial, ...@@ -72,4 +75,4 @@ def MfCorrelatedField(s_space_spatial, s_space_energy, amplitude_model_spatial,
a_energy = dom_distr_energy(amplitude_model_energy) a_energy = dom_distr_energy(amplitude_model_energy)
a = a_spatial*a_energy a = a_spatial*a_energy
A = pd(a) A = pd(a)
return exp(ht(A*FieldAdapter(MultiDomain.make({"xi": h_space}), "xi"))) return ht(A*FieldAdapter(MultiDomain.make({name: h_space}), name))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment