Changed flux2.f to handle fwaves and deleted flux2fw.f
Fixed flux2.f to handle use_fwaves==True