When the author’s affiliation field is recorded with “s.af,” should the country and city fields be filled in?

No, if the affiliation field contains the expression “s.af,” then the country and city fields should not be filled in.