Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
403 commits
Select commit Hold shift + click to select a range
df8cd98
[Issue211] Added calc_LOS_length_in_isoflux()
Oct 8, 2019
55184b4
[Issue211] Rename Rays.calc_lenght_in_isoflux() and created Rays.calc…
Oct 8, 2019
be0525a
[Issue211] Added Rays.calc_min_rho_from_Plasma2D()
Oct 8, 2019
e5ffef4
[Issue211] PEP8 compliance in tofu/geom/_core.py 1
Oct 8, 2019
13190fa
[Issue211] PEP8 compliance in tofu/geom/_core.py 2
Oct 8, 2019
93ae5c5
Merge pull request #212 from ToFuProject/Issue211_ToolsPtsCamLOS
Didou09 Oct 8, 2019
fe9a7bd
update example for nicer plots
flothesof Oct 9, 2019
ee04449
[Issue203] Advanced a bit herratically spectral fits...
Oct 15, 2019
c4146ac
[Issue203] Started latex / pdf notes on ellipse intersection with pla…
Oct 15, 2019
54d77e7
[Issue203] Moved notes to Notes_Upgrades/SpectroX2D
Oct 16, 2019
a6825f5
[Issue203] Ellipses coordinates transform ok until direct problem (No…
Oct 16, 2019
7177f0c
[Issue202] Advanced CrystalBragg class up to public class methods, in…
Oct 16, 2019
59bec07
[Issue202] Tested, about to merge with Issue203
Oct 16, 2019
27e5416
[Issue202] Advanced reverse coordinates transform in Notes
Oct 16, 2019
78e1ec3
[Issue202] Completed Notes on SpectroX2D up to reverse coordinates tr…
Oct 17, 2019
65155bb
[Issue202] First version of CrystalBragg.get_braggangle_from_xixj() =…
Oct 17, 2019
6c3b689
[Issue202] CrystalBragg now performing coordinates tranforms in both …
Oct 17, 2019
6dedc3a
[Issue202] Renamed tofu/geom/_core_Optics.py to tofu/geom/_core_optic…
Oct 18, 2019
d60d835
[Issue202] Added l = f(\beta) in Notes_Upgrades/SpectroX2D
Oct 18, 2019
38727e8
[Issue202] CrystalBragg now performs coordinates transforms in both d…
Oct 18, 2019
346b58a
[Issue202] Preparing CrystalBragg for tests with experimental data
Oct 18, 2019
c4ff052
[Issue202] Creating tofu/geom/inputs/test_data/ for SpectroX2D (to be…
Oct 18, 2019
7396ca9
[Issue202] CrystalBragg has helper routine for simple 2d plot (to be …
Oct 18, 2019
4c9be5f
[Issue202] Advanced plot for fit and fitting 2d spectra function, to …
Oct 21, 2019
7030392
[bf] return type of emissivity should always be 2D
lasofivec Oct 22, 2019
ce4650d
[Issue202] plot of coords tranform and 2d spectral fit almost operati…
Oct 22, 2019
5942ef3
[Issue202] Save crystal for further testing
Oct 22, 2019
1db9b01
[Issue202] CyrstalBragg instanciation ok up to dgeom and dmat, ArXVII…
Oct 23, 2019
c758bad
[Issue202] Advanced plotting
Oct 24, 2019
88dc5e9
[Issue202] Advanced CrystalBragg.plot(), to be checked
Oct 25, 2019
023da7a
[Issue202] Advanced CrystalBragg.plot() => decision to replace nIn by…
Oct 28, 2019
e5a217b
[Issue202] Started sketch for Notes_Upgrades with generalized coordin…
Oct 28, 2019
4c84494
[doc] adding contributing guidelines
lasofivec Oct 28, 2019
688423c
Setup.py should not cythonize extensions except when building. #221
Louwrensth Oct 29, 2019
5d5955e
[bug] fixed conad packaging fail for py2 + blacked
lasofivec Oct 29, 2019
b2cc83e
Update setup.py
lasofivec Oct 29, 2019
6dc452a
Merge pull request #222 from Louwrensth/Issue221_pypi_tarball_not_clean
lasofivec Oct 29, 2019
ef894b8
[Issue202] Advanced Notes on generalization with sketch, to be finished
Oct 29, 2019
00f980f
[Issue202] get_summary() operational for CrystalBragg
Oct 29, 2019
8acadd8
[travis] wait 30 mins
lasofivec Oct 29, 2019
ebe6a06
[travis] renaming loc variable, bugfix?
lasofivec Oct 29, 2019
9f9832c
[bf-travis] trying: commented benchmark script
lasofivec Oct 29, 2019
d53f27f
[bf-travis] trying: import future prin
lasofivec Oct 29, 2019
453d6a3
[Issue202] CrystalBragg.plot() operational for proj='all', starting g…
Oct 29, 2019
5190caf
[bf-travis] took out all prints replaced by write (py2 comp)
lasofivec Oct 29, 2019
69392e5
[doc] uupdate
lasofivec Oct 29, 2019
69747c3
[Issue202] get_CamLOS1D_from_Crystal() almost operational, to be fini…
Oct 29, 2019
1e7f60f
added new ITER Ves & PFC setting to _dconfig
munechika-koyo Oct 30, 2019
5df2514
added ITER polygon text files to inputs directory
munechika-koyo Oct 30, 2019
138ae40
[Issue202] CrystalBragg.plot(), move() and get_Rays_from_summit() ope…
Oct 30, 2019
393b7dd
[Issue202] CrystalBragg.get_Rays_envelopp() ok, but understand sagita…
Oct 30, 2019
ae60651
Merge pull request #206 from flothesof/doc_install_to_rst
lasofivec Oct 30, 2019
171220a
[merge] merged with devel
lasofivec Oct 30, 2019
47b563c
[doc] update in installation and contributing sections
lasofivec Oct 30, 2019
d927dbc
[bugfix] pyplot was not being detected
lasofivec Oct 30, 2019
8a68aaf
get rid of the bags in the setup file
Oct 30, 2019
a355580
change input file name due to the incompatibility
Oct 30, 2019
9070c71
[drop-py2] updated readme so that python 2 is no longer mentioned
lasofivec Oct 31, 2019
1c03496
Merge branch 'devel' into Issue224_setup
lasofivec Oct 31, 2019
a5febcb
[Issue202] Rewritten calc / plot metjods of CrystalBragg with more ge…
Oct 31, 2019
35d75cb
[Issue202] Moved _spectralfit2d to tofu.geom temporarilly for conveni…
Oct 31, 2019
236d735
[Issue202] Advance on spectralfitting => write toolbox in _spectralfi…
Oct 31, 2019
008d320
-Add 10 magnetic lines traced around torus, input and dR_sep input po…
JorgeAMorales Oct 30, 2019
bc05e04
-Add test script for doctest
JorgeAMorales Oct 8, 2019
eaeb4f0
-Remove blank spaces
JorgeAMorales Oct 30, 2019
68bc5cb
-Modifications of tofuplot for magfieldlines
JorgeAMorales Oct 30, 2019
3c1a662
-Add init variable as input, initial point for manual magnetic field …
JorgeAMorales Oct 31, 2019
22a6365
[drop-py2] updated setup file and took out funcsigs dependency
lasofivec Nov 1, 2019
8ec3f21
[pyconfr] update slides
lasofivec Nov 1, 2019
e35ef75
[dropping-py2] update setup file and took out gg02/gg03
lasofivec Nov 1, 2019
19df0e0
[dropping-py2] update travis recipe
lasofivec Nov 1, 2019
7e321f6
[dropping-py2] taking out fi statement
lasofivec Nov 1, 2019
296b9b4
[pyconfr] some changes
lasofivec Nov 2, 2019
9723d3a
[pyconfr] last changes: more pythonic ?
lasofivec Nov 3, 2019
f7c9123
add fixed input file
Nov 4, 2019
8836990
modified based on pep8speaks issue
Nov 4, 2019
f9a4b88
[Issue228] Almost done, one bug remaining
Nov 4, 2019
73c1915
[Issue228] Fixed
Nov 4, 2019
22576b2
[Issue228] PEP8 compliance 1
Nov 4, 2019
a72b7f6
[Issue228] PEP8 compliance 2
Nov 4, 2019
2211e30
[Issue228] PEP8 compliance 3
Nov 4, 2019
9f15f9c
[Issue228] PEP8 compliance 4
Nov 4, 2019
75da71c
Merge pull request #229 from ToFuProject/Issue228_DefaultSeparatorToDict
Didou09 Nov 4, 2019
7f46027
[pyconfr] added koyo's new iter geom
lasofivec Nov 4, 2019
fdc722e
Merge pull request #234 from ToFuProject/dropping-py2
Didou09 Nov 4, 2019
7f1e51d
Specified minimal version of python in README
lasofivec Nov 4, 2019
cb647e7
Merge pull request #233 from ToFuProject/pyconfr
Didou09 Nov 4, 2019
a171380
merged with devel
lasofivec Nov 4, 2019
2fe8f2d
pep8 speaks changes
lasofivec Nov 4, 2019
453d165
[merge] merge with devel (lost py2.7 support)
lasofivec Nov 4, 2019
7eacddb
Merge remote-tracking branch 'origin/devel' into br/add_more_field_lines
lasofivec Nov 4, 2019
0795ede
[merge] merge with devel (lost py2.7 support)
lasofivec Nov 4, 2019
f2012ae
Merge remote-tracking branch 'origin/devel' into Issue224_setup
lasofivec Nov 4, 2019
0962fa2
Merge remote-tracking branch 'origin/devel' into bf-py2-conda-build
lasofivec Nov 4, 2019
51c5ef4
took out print from future since py3
lasofivec Nov 4, 2019
4148da0
[merge] merge with devel (lost py2.7 support)
lasofivec Nov 4, 2019
70c59fd
removed useless files introduced in PR #210
lasofivec Nov 4, 2019
895b88f
Merge pull request #240 from ToFuProject/rm-png-files-pr#210
lasofivec Nov 4, 2019
3d12021
[Issue30] PEP8 Compliance (replaced CoilPF.I by CoilPF.current)
Nov 5, 2019
d5effcb
[Issue30] PEP8 Compliance again
Nov 5, 2019
5b98902
[Issue190] Cleaned variable-related issues
Nov 5, 2019
b5f4541
[Issue190] PEP8 Compliance
Nov 5, 2019
044d87f
Merge pull request #236 from ToFuProject/Issue30_pep8
Didou09 Nov 5, 2019
5ca9e73
[Issue241] Not a bug: the los were not available in ids. But __repr__…
Nov 5, 2019
d25622d
[Issue241] PEP8 Compliance
Nov 5, 2019
eb7855a
[Issue241] PEP8 Compliance 2
Nov 5, 2019
fabc36a
Merge pull request #242 from ToFuProject/Issue241_BuginRaysCompletedX12
lasofivec Nov 5, 2019
20ba3e4
changed the way to get the file path
Nov 5, 2019
32ed94b
Merge remote-tracking branch 'origin/devel' into Issue202_SpectroX2DC…
Nov 5, 2019
9b9218b
[Issue202] Added sep=None keyword arg to CrystalBragg.__init__() for …
Nov 5, 2019
48059f4
pep8 changes to geom/utils.py
lasofivec Nov 5, 2019
2fd8dda
[cherrypick-revert] took out changes of the new geometry
lasofivec Nov 5, 2019
045ab5e
[revert] took out one file extra
lasofivec Nov 5, 2019
b8655b1
Merge pull request #225 from ToFuProject/Issue224_setup
lasofivec Nov 5, 2019
488b9f3
Merge pull request #245 from ToFuProject/Issue220_NewITERConfig
lasofivec Nov 5, 2019
94d3be9
[Issue202] Moving back _spectralfit2d.py to tofu/data and starting pa…
Nov 5, 2019
51842f2
Merge branch 'Issue202_SpectroX2DCrystal' of https://github.com/ToFuP…
Nov 5, 2019
9351c27
Merge remote-tracking branch 'origin/devel' into Issue202_SpectroX2DC…
Nov 5, 2019
d8984c1
[Issue202] Advanced spectrum fit 1d
Nov 5, 2019
deb868c
Merge remote-tracking branch 'origin/devel' into bf-py2-conda-build
lasofivec Nov 5, 2019
11fa035
[pep8]
lasofivec Nov 5, 2019
7adbef9
[pep8]
lasofivec Nov 5, 2019
1808985
[pep8] final
lasofivec Nov 5, 2019
b4fd4fb
[pep8] final2
lasofivec Nov 5, 2019
3d0fb11
[br/add_more_field_lines] Introduced xaxis reversal on field line tra…
Nov 6, 2019
de5dc6b
[Issue235] Reversed xaxis operational: solves the perpection issue bu…
Nov 6, 2019
7409274
Merge remote-tracking branch 'origin/devel' into example_signal_with_…
Nov 6, 2019
9e61eb9
[Issue217] Corrected small bug in tofu/data/_plot.py
Nov 6, 2019
d1c9e63
-Correction of hard coded correction for C3b campaign not valid in C4…
JorgeAMorales Nov 6, 2019
1c655fd
Merge branch 'devel' into br/add_more_field_lines
lasofivec Nov 6, 2019
8074dbc
[Issue217] plot with t=None now operational, was due to np.squeeze on…
Nov 6, 2019
754c8bb
[Issue217] Bug found in _GG.LOS_calc_signal: examples/tutorials/plot_…
Nov 6, 2019
bb8a2dc
-Avoid to change the sys path if test files are loaded from python co…
JorgeAMorales Nov 6, 2019
694f462
[Issue217] Trying nexcalc=True/False
Nov 6, 2019
8a9544f
-Add separatrix plot and make other magnetic lines transparent when p…
JorgeAMorales Nov 6, 2019
a191896
-Respect of pep8
JorgeAMorales Nov 6, 2019
2192577
-Respect of pep8 2
JorgeAMorales Nov 6, 2019
2ab46fa
-Respect of pep8 3
JorgeAMorales Nov 6, 2019
94ac9a1
-Respect of pep8 4
JorgeAMorales Nov 6, 2019
bffe1ae
[Issue202] Advancing on spectralfit2d
Nov 6, 2019
08661c4
-Add strike points plot
JorgeAMorales Nov 7, 2019
611dd14
[Issue202] Advanced 2d fitting => use curve_fit with Bsplines and pro…
Nov 7, 2019
6429203
-Changes on help of tofuplot.py
JorgeAMorales Nov 7, 2019
a52bb12
[Issue202] CrystalBragg.plot_datavs_fit2d() operational using scipy.l…
Nov 8, 2019
107f827
-Add Poincare plot and option to make the field line tracing without …
JorgeAMorales Nov 8, 2019
6b30f99
-Increased field line length
JorgeAMorales Nov 8, 2019
2b30cff
[Issue202] Debugging Convergence of algo using figures on fraction of…
Nov 8, 2019
96f47b6
[Issue202] 2d fit operational but still slow and lacks accuracy => si…
Nov 12, 2019
9813371
[debugging] added prints for Issue247
lasofivec Nov 13, 2019
fea848c
[Issue202] Advanced new fitting routines for spectral 1d and 2d, base…
Nov 13, 2019
28c5c1f
[debugging] k coeffs from get sample ok, not pts reconstruction
lasofivec Nov 13, 2019
8fcd989
[debugging] found bug in los get_sample
lasofivec Nov 13, 2019
d290787
[debugging] found bug in los integration
lasofivec Nov 13, 2019
4654415
[debugging] cleaning code
lasofivec Nov 13, 2019
9b7c9ef
[debugging] took out c code for maintainability
lasofivec Nov 13, 2019
fcb5b33
[Issue247] cleaning, reverting some changes
lasofivec Nov 13, 2019
185b7c4
[Issue202] Saving before switching to Jack Hare's issue #248
Nov 14, 2019
c29d486
[Issue202] Advanced get_x0_bounds() from dlines in tf.data._spectralf…
Nov 14, 2019
0f27f15
[Issue247] found bug in hybird and memory minimization methods
lasofivec Nov 14, 2019
cdfb00a
Merge pull request #207 from flothesof/example_signal_with_emissivity
lasofivec Nov 14, 2019
dfd4825
Merge pull request #246 from ToFuProject/bf-benchmark-w-py3
Didou09 Nov 15, 2019
03b8cfb
[Issue247] Added np.allclose() test in tests01_geom.tests03_core.Test…
Nov 15, 2019
102f401
[merge] merged with devel
lasofivec Nov 15, 2019
ad54bba
[merge] added new example: custom emissivity
lasofivec Nov 15, 2019
ca242e4
[Issue #250] added requirements.txt
lasofivec Nov 15, 2019
83bb165
[Issue247] Removed CamLOS2D and 'rel' cases from tests01_geom.tests03…
Nov 15, 2019
8a0924e
[Issue247] Added tests09_tutorials for running tutorials
Nov 15, 2019
7cd3e3c
[Issue247] PEP8 compliance 1
Nov 15, 2019
57e9d6a
[Issue247] PEP8 compliance 2
Nov 15, 2019
56df4eb
[Issue247] PEP8 compliance 3
Nov 15, 2019
23539c9
[Issue247] PEP8 compliance 4
Nov 15, 2019
9dd33b2
[quick-bf] I variable name was left un-refactored
lasofivec Nov 15, 2019
93f57bd
[Issue #252] added functions to check if user given is rightly defined
lasofivec Nov 15, 2019
27cea6d
[Issue #252] added call to check function got rid of old param
lasofivec Nov 15, 2019
ae69153
[Issue #252] bf: let a semicolon by mistake
lasofivec Nov 15, 2019
565d736
[Issue #252] trying something
lasofivec Nov 15, 2019
f855d29
[Issue247] Fixed tests, but test files generated not yet deleted
Nov 17, 2019
48cd492
[Issue247] Fixed unit tests and removed saved files automatically
Nov 17, 2019
fdc6fa0
[Issue247] Trting to remove Config print in unit tests tests01_geom/t…
Nov 17, 2019
bb8ce2d
[Issue247] Renamed tutorials and copied in tests folder to easily run…
Nov 17, 2019
2254e7f
[Issue247] Fixed tests again
Nov 17, 2019
4760fd3
[Issue247] One last print of Config left in unit tests, can't find it
Nov 17, 2019
ed51236
[Issue247] PEP8 compliance
Nov 17, 2019
e67549f
Merge pull request #249 from ToFuProject/Issue247-bisect
Didou09 Nov 17, 2019
190338e
Merge pull request #253 from ToFuProject/bf-current
Didou09 Nov 17, 2019
136c54c
[Issue252] PEP8 Compliance
Nov 18, 2019
d272f2f
[Issue252] All assert if check_ff() replaced by if / raise statements
Nov 18, 2019
7a480fa
Merge branch 'devel' into feature-#252
lasofivec Nov 18, 2019
fb4b530
[Issue252] Unique full error msg in check_ff(), complemented by error…
Nov 18, 2019
a19ccfe
Merge branch 'feature-#252' of https://github.com/ToFuProject/tofu in…
Nov 18, 2019
1f49781
[Issue252] PEP8 Compliance and more robust check on ani in check_ff()
Nov 18, 2019
3cf115d
[#252] right definition of wrapped function
lasofivec Nov 18, 2019
c6d5e32
[merge] merged with devel
lasofivec Nov 18, 2019
cf892fe
[Issue252] Solved remaining issue with Rays.calc_signal(plot=True): s…
Nov 18, 2019
7403d10
[merge] merged with devel
lasofivec Nov 18, 2019
389ed21
[merge] merged with feature 252
lasofivec Nov 18, 2019
677d649
[bisect 252] undid changes in tuto
lasofivec Nov 18, 2019
67fdeee
[feature] cleaner way of defining 2nd dim
lasofivec Nov 18, 2019
11ab20c
[bug fix #255] found bug
lasofivec Nov 18, 2019
a667bec
[bf #255] added doc for ani/vect definition
lasofivec Nov 19, 2019
fcc95f0
[pep8] changes for flake
lasofivec Nov 19, 2019
820e73f
[doc] typo corrections
lasofivec Nov 19, 2019
c0ea77c
[doc] update how to get sphinx gallery
lasofivec Nov 19, 2019
6b2afd4
[bf #255] ani=None by default
lasofivec Nov 19, 2019
66ba47b
[py3] took out all tests of python version
lasofivec Nov 19, 2019
273cc32
[doc] updated API doc
lasofivec Nov 19, 2019
653ac26
[doc] fixed link
lasofivec Nov 19, 2019
440bb17
[py3] reversed back version in tofu init
lasofivec Nov 19, 2019
32e13e1
[pep8] complianes
lasofivec Nov 19, 2019
8ab1c43
[bf-#255] Fixed unit tests for tutorials
Nov 19, 2019
8b88511
Merge pull request #257 from ToFuProject/bf-#255
Didou09 Nov 19, 2019
20e66de
Merge pull request #256 from ToFuProject/feature-#252-bisect
Didou09 Nov 19, 2019
78c221f
Merge pull request #254 from ToFuProject/feature-#252
Didou09 Nov 19, 2019
a3c99d2
Merge pull request #251 from ToFuProject/bf-issue-#250
Didou09 Nov 19, 2019
86e41d9
Merge branch 'devel' into br/add_more_field_lines
Nov 19, 2019
a7c7ef7
[br/add_more_field_lines] PEP8 Compliance
Nov 20, 2019
f837259
[br/add_more_field_lines] PEP8 Compliance 2
Nov 20, 2019
d739927
[br/add_more_field_lines] pop temporary path from sys.path in test_ma…
Nov 20, 2019
17dbcb3
[py3] restored import to insp
lasofivec Nov 20, 2019
cb9992f
Merge pull request #226 from ToFuProject/br/add_more_field_lines
Didou09 Nov 20, 2019
2cc236b
Merge pull request #258 from ToFuProject/dropping-py2
Didou09 Nov 20, 2019
4f6cec4
[doc] fixed links
lasofivec Nov 20, 2019
93eea7e
[doc] took out links to imas2tofu and mag since no doc exists
lasofivec Nov 20, 2019
b4debaf
[doc] updated README linls
lasofivec Nov 20, 2019
56c4ef3
[merge] merged with devel
lasofivec Nov 20, 2019
f9f5338
[merge] restored version of benchmark as in devel
lasofivec Nov 20, 2019
ee98807
[pep8]
lasofivec Nov 20, 2019
cab156c
[Issue264] Introduced unique configs and a correspondence table for s…
Nov 20, 2019
e9dc53d
[Issue264] Made sure default config is used when no argument is passed
Nov 20, 2019
9ec46c0
[doc] changed aspect and thumbnail of custom emissivity tuto
lasofivec Nov 20, 2019
c5065a7
[Issue264] PEP8 Compliance
Nov 20, 2019
277a135
[Issue264] PEP8 Compliance 2
Nov 20, 2019
561d6ef
Merge pull request #265 from ToFuProject/Issue264_ConfigNames
lasofivec Nov 20, 2019
c430b67
Merge pull request #261 from ToFuProject/new-doc
Didou09 Nov 20, 2019
f30384d
[Preparing release 1.4.2] PEP8 compliance for release notes
Nov 20, 2019
9d8e582
Merge branch 'devel' into Issue202_SpectroX2DCrystal
Nov 20, 2019
806dbc9
[Issue202] Just making sure tofu is stable to merge this non-finalize…
Nov 20, 2019
4c17ca3
[release] update contributors
lasofivec Nov 20, 2019
3c70bc3
[doc] added warning for mac and gcc compiler
lasofivec Nov 20, 2019
0dd876b
[Issue202] PEP8 Compliance 1
Nov 20, 2019
62ea2c9
[release] added info from almost all issues
lasofivec Nov 20, 2019
36acddd
[Release Notes 1.4.2] Updated release notes with SpectroX2D and issue…
Nov 20, 2019
8b588ed
[release] added info from all PR
lasofivec Nov 20, 2019
43c9b29
Merge branch 'devel' into Issue202_SpectroX2DCrystal
Didou09 Nov 20, 2019
a146ee8
[release] merged with didier's changes
lasofivec Nov 20, 2019
fb342b7
[Release notes 1.4.2] Emphasizing 2d Xray Crystal Spectrometer in new…
Nov 20, 2019
526535c
Merge pull request #268 from ToFuProject/new-doc
Didou09 Nov 20, 2019
8ad363d
Merge branch 'devel' into Issue202_SpectroX2DCrystal
Didou09 Nov 20, 2019
4c43aed
Merge pull request #267 from ToFuProject/Issue202_SpectroX2DCrystal
Didou09 Nov 20, 2019
314b7bc
Update release_notes_142.rst
lasofivec Nov 20, 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
29 changes: 20 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
*.c
*.cpp
*.nfs*

# annotated files
tofu/geom/*.html

# No images
Expand Down Expand Up @@ -38,24 +40,33 @@ dist/
tofu.egg-info/
build/

#Notes_Upgrades/

# Tex files
*.aux
*.log

# .gitignore
1
Introduction
computing
Details
# coverage output
.coverage

# Include travis
!.travis.yml

# no precommit configurations
.pre-commit-config.yaml

# installation dir
usr/

# tests of LOS on west and ITER
tofu/tests/tests01_geom/laura_tmp/
# no PyCharm config files
.idea/

# do not commit sphinx built files
doc/build/html/

# do not commit built compiled files on windows
*.pyd

# do not commit sphinx-gallery files
doc/source/auto_examples/

# do not commit nose tests files
*.noseids
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: python
python:
- '2.7'
- '3.6'
#- '3.7-dev'
- '3.7-dev'

git:
depth: 200
Expand All @@ -14,9 +13,9 @@ before_install:
- gcc --version
- export START=$(pwd)
install:
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
-O miniconda.sh; export VADD="py27"; else wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-O miniconda.sh; export VADD="py36"; fi
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.7-dev" ]]; then export VADD="py37"; else export VADD="py36"; fi
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
Expand Down
File renamed without changes.
21 changes: 21 additions & 0 deletions Debug_JINTRACMesh.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions Notes_Upgrades/Communications/Euroscipy2019/2019_LM_Euroscipy.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@article{didier2016,
title={Non-monotonic growth rates of sawtooth precursors evidenced with a new method on ASDEX Upgrade},
author={Vezinet, D and Igochine, V and Weiland, M and Yu, Q and Gude, A and Meshcheriakov, D and Sertoli, M and EUROfusion MST1 Team and others},
journal={Nuclear Fusion},
volume={56},
number={8},
pages={086001},
year={2016},
publisher={IOP Publishing}
}
Binary file not shown.
Loading