Skip to content

Commit

Permalink
Merge pull request #266 from ToFuProject/devel
Browse files Browse the repository at this point in the history
Preparing 1.4.2
  • Loading branch information
Didou09 authored Nov 20, 2019
2 parents df2841d + 314b7bc commit 92523ae
Show file tree
Hide file tree
Showing 283 changed files with 19,068 additions and 40,663 deletions.
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

0 comments on commit 92523ae

Please sign in to comment.