Skip to content

Issue187 duplicate init for coils pf #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Didou09 merged 4 commits into from
Sep 13, 2019
Merged

Issue187 duplicate init for coils pf #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eddecd8
[Issue 187] Removed extra verbose __init__, added mobile=False in rem…
Sep 13, 2019
fac9b0d
[Issue 187] PEP8 compliance
Sep 13, 2019
c0c921b
Merge branch 'devel' into Issue187_DuplicateInitForCoilsPF
Didou09 Sep 13, 2019
06eabc5
Merge branch 'devel' into Issue187_DuplicateInitForCoilsPF
Didou09 Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions benchmarks/calc_signal_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
# Defining defaults
###################

_LRES = [-3,-3,0]
_LLOS = [5,5,0]
_LT = [3,3,0]
_LRES = [-3, -3, 0]
_LLOS = [5, 5, 0]
_LT = [3, 3, 0]
Copy link
Copy Markdown
Collaborator

@lasofivec lasofivec Sep 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Useless but ok

_NREP = 2

_DRES = abs(_LRES[1] - _LRES[0])
Expand Down
14 changes: 1 addition & 13 deletions tofu/geom/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,22 +1500,10 @@ class PFC(StructOut):
class CoilPF(StructOut):
_color = 'r'

def __init__(self, Poly=None, Type=None, Lim=None, pos=None, extent=None,
Id=None, Name=None, Exp=None, shot=None,
sino_RefPt=None, sino_nP=_def.TorNP,
Clock=False, arrayorder='C', fromdict=None,
nturns=None, superconducting=None, active=None,
SavePath=os.path.abspath('./'),
SavePath_Include=tfpf.defInclude, color=None):
kwdargs = locals()
del kwdargs['self'], kwdargs['__class__']
# super()
super(CoilPF,self).__init__(mobile=False, **kwdargs)

def __init__(self, nturns=None, superconducting=None, active=None,
**kwdargs):
# super()
super(CoilPF,self).__init__(**kwdargs)
super(CoilPF, self).__init__(mobile=False, **kwdargs)

def _reset(self):
# super()
Expand Down
2 changes: 1 addition & 1 deletion tofu/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Do not edit, pipeline versioning governed by git tags!
__version__ = '1.4.1-52-g6f060e3'
__version__ = '1.4.1-52-g6f060e3'