Update CMakeLists to include new FC, generalize the member names of FC_Phi to apply to data rather than specific compartments