Fixe flux2.f to make use_fwaves==True work, and remove flux2fw.f