A new form of Grad-Shafranov equation for a tokomak with an elongated cross section