Fix a bug and some warning, and clean some code

[wenqing]

A potential memory leakage: if the solid heat capacity is used with a non-existed type, memory leakage will occur.

[norihiro-w]

looks good for me. please go merging if jenkins is green