A new formulation for coupled magma/mantle dynamics