That's correct. You'll have the gas/liquid species in the fluid mixture and separately a particle mixture for whatever is in the bubble/droplet. The phase exchange is then from species(fluid) to species(particle). The formation enthalpy should take care of the energy released/absorbed during phase change.
You are navigating away from the AIS Discovery experience