Added a calc_gmfs consistent with the engine and refactoring of risk input