partitioning struct added
cpp definitions generated correctly from pure model