Refactor to add fluid_sim struct