Fix conflict issue of shared data set in memory
Revising code logic and log
Add weahter/soil only mode
Merge pull request #22 from MengZhang/develop

Develop pull request from meng