Fixed more floating variables (U and YNO2)
Merge branch 'master' of github.com:jemofthewest/DOECPF
Fixed missing comma
Moved input and state parsing into cpfModel
MAJOR: Began dividing model into submodels