Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
NIFTy
Commits
72ebeebb
Commit
72ebeebb
authored
Feb 13, 2018
by
Martin Reinecke
Browse files
Merge branch 'NIFTy_4' into nifty_doc_mr
parents
8b63f92c
62254320
Changes
20
Show whitespace changes
Inline
Side-by-side
nifty4/__init__.py
View file @
72ebeebb
...
...
@@ -2,7 +2,7 @@ from .version import __version__
from
.
import
dobj
from
.
space
s
import
*
from
.
domain
s
import
*
from
.domain_tuple
import
DomainTuple
...
...
@@ -19,5 +19,6 @@ from .plotting.plot import plot
from
.
import
library
from
.
import
extra
__all__
=
spaces
.
__all__
+
operators
.
__all__
+
minimization
.
__all__
+
\
__all__
=
[
"__version__"
,
"dobj"
,
"DomainTuple"
]
+
\
domains
.
__all__
+
operators
.
__all__
+
minimization
.
__all__
+
\
[
"DomainTuple"
,
"Field"
,
"sqrt"
,
"exp"
,
"log"
]
nifty4/domain_tuple.py
View file @
72ebeebb
...
...
@@ -17,7 +17,7 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
from
functools
import
reduce
from
.
space
s.domain
import
Domain
from
.
domain
s.domain
import
Domain
class
DomainTuple
(
object
):
...
...
nifty4/
space
s/__init__.py
→
nifty4/
domain
s/__init__.py
View file @
72ebeebb
File moved
nifty4/
space
s/dof_space.py
→
nifty4/
domain
s/dof_space.py
View file @
72ebeebb
File moved
nifty4/
space
s/domain.py
→
nifty4/
domain
s/domain.py
View file @
72ebeebb
File moved
nifty4/
space
s/gl_space.py
→
nifty4/
domain
s/gl_space.py
View file @
72ebeebb
File moved
nifty4/
space
s/hp_space.py
→
nifty4/
domain
s/hp_space.py
View file @
72ebeebb
File moved
nifty4/
space
s/lm_space.py
→
nifty4/
domain
s/lm_space.py
View file @
72ebeebb
File moved
nifty4/
space
s/power_space.py
→
nifty4/
domain
s/power_space.py
View file @
72ebeebb
File moved
nifty4/
space
s/rg_space.py
→
nifty4/
domain
s/rg_space.py
View file @
72ebeebb
File moved
nifty4/
space
s/structured_domain.py
→
nifty4/
domain
s/structured_domain.py
View file @
72ebeebb
File moved
nifty4/
space
s/unstructured_domain.py
→
nifty4/
domain
s/unstructured_domain.py
View file @
72ebeebb
File moved
nifty4/minimization/__init__.py
View file @
72ebeebb
...
...
@@ -14,7 +14,8 @@ from .energy import Energy
from
.quadratic_energy
import
QuadraticEnergy
from
.line_energy
import
LineEnergy
__all__
=
[
"LineSearch"
,
"IterationController"
,
"GradientNormController"
,
__all__
=
[
"LineSearch"
,
"LineSearchStrongWolfe"
,
"IterationController"
,
"GradientNormController"
,
"Minimizer"
,
"ConjugateGradient"
,
"NonlinearCG"
,
"DescentMinimizer"
,
"SteepestDescent"
,
"VL_BFGS"
,
"RelaxedNewton"
,
"NewtonCG"
,
"L_BFGS_B"
,
"Energy"
,
"QuadraticEnergy"
,
"LineEnergy"
]
nifty4/operators/dof_projection_operator.py
View file @
72ebeebb
...
...
@@ -22,7 +22,7 @@ from ..utilities import infer_space
from
..field
import
Field
from
..domain_tuple
import
DomainTuple
from
..
import
dobj
from
..
space
s.dof_space
import
DOFSpace
from
..
domain
s.dof_space
import
DOFSpace
class
DOFProjectionOperator
(
LinearOperator
):
...
...
nifty4/operators/fft_operator.py
View file @
72ebeebb
...
...
@@ -18,7 +18,7 @@
import
numpy
as
np
from
..domain_tuple
import
DomainTuple
from
..
space
s.rg_space
import
RGSpace
from
..
domain
s.rg_space
import
RGSpace
from
.linear_operator
import
LinearOperator
from
..
import
dobj
from
..
import
utilities
...
...
nifty4/operators/geometry_remover.py
View file @
72ebeebb
...
...
@@ -17,7 +17,7 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
from
..field
import
Field
from
..
space
s.unstructured_domain
import
UnstructuredDomain
from
..
domain
s.unstructured_domain
import
UnstructuredDomain
from
..domain_tuple
import
DomainTuple
from
.linear_operator
import
LinearOperator
...
...
nifty4/operators/harmonic_transform_operator.py
View file @
72ebeebb
...
...
@@ -18,12 +18,12 @@
import
numpy
as
np
from
..domain_tuple
import
DomainTuple
from
..
space
s.rg_space
import
RGSpace
from
..
domain
s.rg_space
import
RGSpace
from
.linear_operator
import
LinearOperator
from
..
import
dobj
from
..
import
utilities
from
..field
import
Field
from
..
space
s.gl_space
import
GLSpace
from
..
domain
s.gl_space
import
GLSpace
class
HarmonicTransformOperator
(
LinearOperator
):
...
...
nifty4/operators/laplace_operator.py
View file @
72ebeebb
...
...
@@ -18,7 +18,7 @@
import
numpy
as
np
from
..field
import
Field
from
..
space
s.power_space
import
PowerSpace
from
..
domain
s.power_space
import
PowerSpace
from
.endomorphic_operator
import
EndomorphicOperator
from
..utilities
import
infer_space
from
..domain_tuple
import
DomainTuple
...
...
nifty4/operators/power_projection_operator.py
View file @
72ebeebb
...
...
@@ -19,7 +19,7 @@
from
.dof_projection_operator
import
DOFProjectionOperator
from
..domain_tuple
import
DomainTuple
from
..utilities
import
infer_space
from
..
space
s.power_space
import
PowerSpace
from
..
domain
s.power_space
import
PowerSpace
class
PowerProjectionOperator
(
DOFProjectionOperator
):
...
...
nifty4/sugar.py
View file @
72ebeebb
...
...
@@ -17,8 +17,8 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
import
numpy
as
np
from
.
space
s.structured_domain
import
StructuredDomain
from
.
space
s.power_space
import
PowerSpace
from
.
domain
s.structured_domain
import
StructuredDomain
from
.
domain
s.power_space
import
PowerSpace
from
.field
import
Field
,
sqrt
from
.operators.diagonal_operator
import
DiagonalOperator
from
.operators.power_projection_operator
import
PowerProjectionOperator
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment