[develop]

- v1.0
[develop]

- v1.1
	modified:   FluidCasting/FluidCasting.v11.suo
	modified:   FluidCasting/FluidCasting/Simulation.cpp
	modified:   FluidCasting/FluidCasting/Simulation.h
	modified:   FluidCasting/FluidCasting/Thread.cpp
[develop]

- v1.2
	modified:   FluidCasting/FluidCasting.v11.suo
	modified:   FluidCasting/FluidCasting/Simulation.cpp
	modified:   FluidCasting/FluidCasting/Simulation.h
	modified:   FluidCasting/FluidCasting/Thread.cpp
	modified:   FluidCasting/FluidCasting/Utils.cpp
	modified:   FluidCasting/FluidCasting/Utils.h
	new file:   FluidCasting/results/July20.jpg
[master]

- Merge branch 'develop'
- Finished a basic framework
[master]

- Modification 0.1
	deleted:    F90/Diagnose.f90
	deleted:    F90/Main.f90
	deleted:    F90/Makefile
	deleted:    F90/MathsFunctions.f90
	deleted:    F90/UpdateFields.f90
	deleted:    F90/UpdateParticles.f90
	deleted:    F90/calcomp.c
	deleted:    F90/input
	deleted:    F90/inputs/input1
	deleted:    F90/inputs/input2
	deleted:    F90/inputs/input3
	deleted:    F90/output/bhist.jpg
	deleted:    F90/output/by_wpiwci.jpg
	deleted:    F90/output/bys.txt
	deleted:    F90/output/bz_wpiwci.jpg
	deleted:    F90/output/bzs.txt
	deleted:    F90/output/data.txt
	deleted:    F90/output/output.txt
	deleted:    F90/p4.c
	deleted:    F90/p5.f90
	deleted:    F90/references/lplot.f90
	modified:   FluidCasting/FluidCasting.v11.suo
	modified:   FluidCasting/FluidCasting/Thread.cpp
	renamed:    FluidCasting/results/July20.jpg -> Image/July200112.jpg
	new file:   Image/July201136.jpg
	deleted:    PlasmaSimulation/HybridSimulation/.gitignore
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation.v11.suo
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/.gitignore
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/HybridSimulation.vcxproj
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/HybridSimulation.vcxproj.filters
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/HybridSimulation.vcxproj.user
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Main.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Plasma.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/calcomp.c
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/input.h
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/output.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/parameters.h
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/plotfile.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Makefile
	deleted:    PlasmaSimulation/HybridSimulation/Original/.gitignore
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/.gitignore
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Arguments.h
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Debug.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Diagnostic.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Functions.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Grid.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Grid.h
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/HybridSimulation.vcxproj
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/HybridSimulation.vcxproj.filters
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/HybridSimulation.vcxproj.user
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Initialize.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/LIB.h
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Main.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/MoveSpecies.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/Plasma.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/HybridSimulation/UpdateEBField.cpp
	deleted:    PlasmaSimulation/HybridSimulation/Original/Makefile
	deleted:    PlasmaSimulation/HybridSimulation/Original/include/Eigen
	deleted:    PlasmaSimulation/HybridSimulation/Original/include/GL/freeglut.h
	deleted:    PlasmaSimulation/HybridSimulation/Original/include/GL/freeglut_ext.h
	deleted:    PlasmaSimulation/HybridSimulation/Original/include/GL/freeglut_std.h
	deleted:    PlasmaSimulation/HybridSimulation/Original/include/GL/glut.h
	deleted:    PlasmaSimulation/HybridSimulation/Original/lib/freeglut.lib
	deleted:    PlasmaSimulation/HybridSimulation/Original/lib/x64/freeglut.lib
	deleted:    PlasmaSimulation/HybridSimulation/Original/moe.jpg
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/bin/freeglut.dll
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/bin/x64/freeglut.dll
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/clean.bat
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/cleaner.py
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/makefile.py
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/makelink.py
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/module.py
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/module.pyc
	deleted:    PlasmaSimulation/HybridSimulation/Original/tools/prework.bat
	deleted:    PlasmaSimulation/HybridSimulation/include/Eigen
	deleted:    PlasmaSimulation/HybridSimulation/include/GL/freeglut.h
	deleted:    PlasmaSimulation/HybridSimulation/include/GL/freeglut_ext.h
	deleted:    PlasmaSimulation/HybridSimulation/include/GL/freeglut_std.h
	deleted:    PlasmaSimulation/HybridSimulation/include/GL/glut.h
	deleted:    PlasmaSimulation/HybridSimulation/lib/freeglut.lib
	deleted:    PlasmaSimulation/HybridSimulation/lib/x64/freeglut.lib
	deleted:    PlasmaSimulation/HybridSimulation/moe.jpg
	deleted:    PlasmaSimulation/HybridSimulation/tools/bin/freeglut.dll
	deleted:    PlasmaSimulation/HybridSimulation/tools/bin/x64/freeglut.dll
	deleted:    PlasmaSimulation/HybridSimulation/tools/clean.bat
	deleted:    PlasmaSimulation/HybridSimulation/tools/cleaner.py
	deleted:    PlasmaSimulation/HybridSimulation/tools/makefile.py
	deleted:    PlasmaSimulation/HybridSimulation/tools/makelink.py
	deleted:    PlasmaSimulation/HybridSimulation/tools/module.py
	deleted:    PlasmaSimulation/HybridSimulation/tools/module.pyc
	deleted:    PlasmaSimulation/HybridSimulation/tools/prework.bat
[master]

- Fixed some bugs
	modified:   FluidCasting/FluidCasting.v11.suo
	modified:   FluidCasting/FluidCasting/Simulation.cpp
	modified:   FluidCasting/FluidCasting/Thread.cpp
	modified:   FluidCasting/FluidCasting/Utils.cpp
	modified:   FluidCasting/FluidCasting/Utils.h
	modified:   FluidCasting/utils/cleaner.bat
[master]

- Fixed some bugs
	new file:   DevelopLog.md
	modified:   FluidCasting/FluidCasting.v11.suo
	modified:   FluidCasting/FluidCasting/Simulation.cpp
	modified:   FluidCasting/FluidCasting/Thread.cpp
	modified:   FluidCasting/utils/cleaner.bat
Merge branch 'master' into develop
[develop]

- t1.0
	modified:   FluidCasting/FluidCasting.v11.suo
	modified:   FluidCasting/FluidCasting/FluidCasting.vcxproj
	modified:   FluidCasting/FluidCasting/FluidCasting.vcxproj.filters
	modified:   FluidCasting/FluidCasting/Simulation.cpp
	modified:   FluidCasting/FluidCasting/Simulation.h
	deleted:    Image/July200112.jpg
	deleted:    Image/July201136.jpg
[develop]

- Modified and optimized some code
	modified:   FluidCasting/FluidCasting.v11.suo
	modified:   FluidCasting/FluidCasting/.gitignore
	modified:   FluidCasting/FluidCasting/Simulation.cpp
	modified:   FluidCasting/FluidCasting/Simulation.h
	modified:   FluidCasting/FluidCasting/Utils.cpp
	modified:   FluidCasting/FluidCasting/Utils.h
Merge branch 'develop'