Merge branch 'master' of ssh://c4science.ch/source/HeLaZ

README.md

@@ -13,62 +13,66 @@ How to run it
 
 # Changelog
 
-2. MPI parallel version
+	-2. MPI parallel version
 
+<<<<<<< HEAD
 	2.5 //GK COSOlver collision operator//
+=======
+	-2.5 //GK COSOlver collision operator//
+>>>>>>> d7a9164c3bd1d7ae12dd9d8ae5e13c3317b93d0c
 
-	2.4 2D cartesian parallel (along p and kr)
+	-2.4 2D cartesian parallel (along p and kr)
 
-	2.3 GK Dougherty operator
+	-2.3 GK Dougherty operator
 
-	2.2 Allow restart with different P,J values (results are not concluents)
+	-2.2 Allow restart with different P,J values (results are not concluents)
 
-	2.1 First compilable parallel version (1D parallel along kr)
+	-2.1 First compilable parallel version (1D parallel along kr)
 
-1. Implementation of the non linear Poisson brackets term
+	-1. Implementation of the non linear Poisson brackets term
 
-	1.4 Quantitative study with stationary average particle flux \Gamma_\infty
+	-1.4 Quantitative study with stationary average particle flux \Gamma_\infty
 
-	1.3 Linear analysis showed that a certain amount of PJ are recquired to trigger mode
+	-1.3 Linear analysis showed that a certain amount of PJ are recquired to trigger mode
 
-	1.2 Zonal flows are observed in a similar way to Ricci Rogers 2006 with GS2
+	-1.2 Zonal flows are observed in a similar way to Ricci Rogers 2006 with GS2
 
-	1.1 Qualitative test : find similar turbulences as Hasegawa Wakatani system with few moments
+	-1.1 Qualitative test : find similar turbulences as Hasegawa Wakatani system with few moments
 
-	1.1 Methods in fourier_mod.f90 have been validated by tests on Hasegawa Wakatani system
+	-1.1 Methods in fourier_mod.f90 have been validated by tests on Hasegawa Wakatani system
 
-	1.1 Methods in fourier_mod.f90 have been validated by tests on Hasegawa Wakatani system
+	-1.1 Methods in fourier_mod.f90 have been validated by tests on Hasegawa Wakatani system
 
-	1.0 FFTW3 has been used to treat the convolution as a product and discrete fourier transform
+	-1.0 FFTW3 has been used to treat the convolution as a product and discrete fourier transform
 
-0. Write MOLI matlab solver in Fortran using Monli1D as starting point
+	-0. Write MOLI matlab solver in Fortran using Monli1D as starting point
 
-	0.6 Benchmarks now include Dougherty, Lenard-Bernstein and Full Coulomb collision operators
+	-0.6 Benchmarks now include Dougherty, Lenard-Bernstein and Full Coulomb collision operators
 
-	0.5 Load COSOlver matrices
+	-0.5 Load COSOlver matrices
 
-	0.4 Benchmark with MOLI matlab results for Z-pinch (cf. kz_linear script)
+	-0.4 Benchmark with MOLI matlab results for Z-pinch (cf. kz_linear script)
 
-	0.3 RK4 time solver
+	-0.3 RK4 time solver
 
-	0.2 implement moment hierarchy linear terms
+	-0.2 implement moment hierarchy linear terms
 
-	0.1 implement linear Poisson equation in fourier space
+	-0.1 implement linear Poisson equation in fourier space
 
-	0.0 go from 1D space to 2D fourier and from Hermite basis to Hermite-Laguerre basis
+	-0.0 go from 1D space to 2D fourier and from Hermite basis to Hermite-Laguerre basis
 
 # Roadmap
 
-2. MPI parallel version
+	-2. MPI parallel version
 
-	2.6 GPU accelerated version
+	-2.6 GPU accelerated version
 
-	2.7 GK Full Coulomb collision operator
+	-2.7 GK Full Coulomb collision operator
 
-3. GK 3D version, kr,kz,kpar for linear device
+	-3. GK 3D version, kr,kz,kpar for linear device
 
-4. DK 3D version, kr,kz,kpar for linear device
+	-4. DK 3D version, kr,kz,kpar for linear device
 
-5. DK+GK 3D version, kr,kz,kpar for linear device
+	-5. DK+GK 3D version, kr,kz,kpar for linear device
 
-6. 3D version with curvature
+	-6. 3D version with curvature