Make Hazard & Risk calculation mode names consistent

[larsbutler]

Currently, our job configs specify the following strings for the different calculation modes:

Hazard

• Classical
• Event Based
• Deterministic

Risk

• Classical PSHA
• Probabilistic Event
• Deterministic

There should only be 3 different calculation categories for each of the Hazard & Risk disciplines: classical, event based, and deterministic.

Note: Classical and event based are both probabilistic methods.

Important

We'll also need to update the corresponding code, tests, and test data in https://github.com/gem/openquake-server.

[monellid]

Right. I would suggest:

• Classical
• Event Based
• Deterministic There should be actually only one key (common to both hazard and risk calculators). In other words it cannot be possible to have Classical on the hazard side and Probabilistic Event on the risk side.

[larsbutler]

Part of this issue has been resolved by the following patches:

• https://github.com/gem/openquake/pull/244
• https://github.com/gem/openquake-server/pull/49

[favalex]

The remaining part (unification of the key) has been resolved in https://github.com/gem/openquake/pull/262