Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NIFTy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ift
NIFTy
Commits
8d416d27
Commit
8d416d27
authored
5 years ago
by
Martin Reinecke
Browse files
Options
Downloads
Plain Diff
Merge branch 'cosmetics' into 'NIFTy_6'
cosmetics See merge request
!382
parents
4b8a2cd0
a97cfb15
No related branches found
No related tags found
1 merge request
!382
cosmetics
Pipeline
#64602
passed
5 years ago
Stage: build_docker
Stage: test
Stage: demo_runs
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
nifty6/library/correlated_fields.py
+53
-53
53 additions, 53 deletions
nifty6/library/correlated_fields.py
nifty6/plot.py
+1
-1
1 addition, 1 deletion
nifty6/plot.py
with
54 additions
and
54 deletions
nifty6/library/correlated_fields.py
+
53
−
53
View file @
8d416d27
...
...
@@ -281,7 +281,6 @@ class _Amplitude(Operator):
expander
=
ContractionOperator
(
dom
,
spaces
=
space
).
adjoint
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
]))
...
...
@@ -296,7 +295,8 @@ class _Amplitude(Operator):
shift
=
DiagonalOperator
(
from_global_data
(
dom
[
space
],
foo
),
dom
,
space
)
vslope
=
DiagonalOperator
(
from_global_data
(
target
[
space
],
_relative_log_k_lengths
(
target
[
space
])),
from_global_data
(
target
[
space
],
_relative_log_k_lengths
(
target
[
space
])),
target
,
space
)
foo
,
bar
=
[
np
.
zeros
(
target
[
space
].
shape
)
for
_
in
range
(
2
)]
...
...
@@ -431,7 +431,8 @@ class CorrelatedFieldMaker:
n_amplitudes
=
len
(
self
.
_a
)
if
self
.
_total_N
>
0
:
hspace
=
makeDomain
([
UnstructuredDomain
(
self
.
_total_N
)]
+
[
dd
.
target
[
-
1
].
harmonic_partner
for
dd
in
self
.
_a
])
[
dd
.
target
[
-
1
].
harmonic_partner
for
dd
in
self
.
_a
])
spaces
=
list
(
1
+
np
.
arange
(
n_amplitudes
))
else
:
hspace
=
makeDomain
(
...
...
@@ -486,7 +487,6 @@ class CorrelatedFieldMaker:
lst
=
[(
'
Offset amplitude
'
,
self
.
amplitude_total_offset
),
(
'
Total fluctuation amplitude
'
,
self
.
total_fluctuation
)]
namps
=
len
(
self
.
_a
)
if
namps
>
1
:
for
ii
in
range
(
namps
):
...
...
This diff is collapsed.
Click to expand it.
nifty6/plot.py
+
1
−
1
View file @
8d416d27
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment