jinyuntang

Results 2 issues of jinyuntang

This update synchronizes the data structure change between sbetr and elm. It fixed with failure of tests SMS_D.f19_g16.I1850ELM. [BFB]. Fixes #5832

Land
bug fix PR

Two compsets I1850GSWCNPPHSWFMCROP and I1850WCCNPPHSWFMCROP are added. [BFB]

Land
BGC
ELM