Numerical studies on non-linearity of added resistance and ship motions of KVLCC2 in short and long waves