add python pip setuptools & update TELEMAC-MASCARET

README.md

@@ -860,6 +860,8 @@
 	- [upgrade python](src/Python/upgrade.md) CentOS 6 升级Python 2.6到3.6
 	- [Anaconda之conda的使用](src/Python/Anaconda.md)
 	- [Python ABC（抽象基类）](src/Python/ABC.md)
+	- [pip pip3 替换国内镜像源](src/Python/pip.md)
+	- [打包分发工具setuptools](src/Python/setuptools.md)
 	- [github.com/vinta/awesome-python](https://github.com/vinta/awesome-python) A curated list of awesome Python frameworks, libraries, software and resources
 	- [github.com/walter201230/Python](https://github.com/walter201230/Python) 最良心的 Python 教程
 	- [codon](src/Python/codon.md) A high-performance, zero-overhead, extensible Python compiler using LLVM

src/Python/README.md

@@ -14,6 +14,8 @@
 - [upgrade python](upgrade.md) CentOS 6 升级Python 2.6到3.6
 - [Anaconda之conda的使用](Anaconda.md)
 - [Python ABC（抽象基类）](ABC.md)
+- [pip pip3 替换国内镜像源](pip.md)
+- [打包分发工具setuptools](setuptools.md)
 - [github.com/vinta/awesome-python](https://github.com/vinta/awesome-python) A curated list of awesome Python frameworks, libraries, software and resources
 - [github.com/walter201230/Python](https://github.com/walter201230/Python) 最良心的 Python 教程
 - [codon](codon.md) A high-performance, zero-overhead, extensible Python compiler using LLVM.

src/Python/pip.md

@@ -0,0 +1,19 @@
+## pip pip3 替换国内镜像源
+- 在采用默认 pip3 安装第三方库的时候，经常会出现超时的情况。
+
+		pip._vendor.urllib3.exceptions.ReadTimeoutError: HTTPSConnectionPool(host='files.pythonhosted.org', port=443): Read timed out.
+	这时候就需要替换镜像源为国内的镜像源了。
+- 国内的pip源
+	- 阿里云：https://mirrors.aliyun.com/pypi/simple/ 
+	- 清华：https://pypi.tuna.tsinghua.edu.cn/simple 
+	- 中国科技大学 https://pypi.mirrors.ustc.edu.cn/simple/ 
+	- 华中理工大学：http://pypi.hustunique.com/ 
+	- 山东理工大学：http://pypi.sdutlinux.org/ 
+	- 豆瓣：http://pypi.douban.com/simple/ 
+- 临时更换镜像源
+
+		pip3 install 库名 -i 镜像地址
+- 解决报错：error: metadata-generation-failed
+
+
+		pip install kiwisolver==1.2.0 --use-deprecated=legacy-resolver

src/Python/setuptools.md

@@ -0,0 +1,2 @@
+## 打包分发工具setuptools
+- setuptools是python标准的打包分发工具，它可以将我们编写的python项目打包安装，这样其他同事就可以像调用标准库或python第三方库那样直接使用；也可以将项目上传到Pypi供更多人的下载安装使用。

src/water/TELEMAC-MASCARET.md

@@ -3,6 +3,7 @@
 - TELEMAC-MASCARET is an integrated suite of solvers for use in the field of free-surface flow. Having been used in the context of many studies throughout the world, it has become one of the major standards in its field.
 - The TELEMAC-MASCARET system is written in Fortran (standard Fortran 2003). The mathematics, the physics, the advanced parallelisation are all in Fortran. Therefore, if you wish to recompile the system from its source code to tune the compiler optimisation to your processor or if you need to input your own Fortran code to model the specifics of your application (boundary, initial conditions, special output variable, etc.) a Fortran compiler is required (compatible with standard Fortran 2003).
 - In addition, surrounding the scientific code are a series of scripts to compile, prepare the input and output files, run the modules of the TELEMAC-MASCARET system and do some post-processing. Those scripts are based on the Python language.
+- To conclude, we would like to emphasise at this stage that the Python scripts can be used as stand-alone software and will always be. However, the intention of the TELEMAC Consortium is to make sure they are integrated as plug-ins within other open source platforms such as QGIS, and directly callable from these. Eventually, some users might never have to look at a Python script to use the TELEMAC system.
 - 源代码地址：https://gitlab.pam-retd.fr/otm/telemac-mascaret
 - TELEMAC-MASCARET由英国、法国、德国的七个权威科研机构共同开发和维护，已被全世界许多研究所采用，成为该领域的主要标准之一。
 - TELEMAC-MASCARET适用于进行1D/2D/3D水动力学、深海及近海区域波浪传播、波浪震动特性、泥沙迁移及海床形态变化、水质污染等多种环境流体现象的仿真模拟和耦合计算，同时拥有万核级别的大规模并行计算能力。