Merge pull request #6 from HaibingShao/TH2C

Th2 c
ss
Merge branch 'TH2C' of https://github.com/Yonghui56/ogs_prototype into TH2C
reorganize some functions for calculating the Secondary variables
Merge pull request #76 from Yonghui56/TH2C

Th2 c