Merge pull request #7 from GNS-Science/feature/serialise_model_1.0.4

Add enriched json for the new NSHM_1.0.4 version

nzshm_model/__init__.py

@@ -1,5 +1,4 @@
-from . import nshm_1_0_0
-from . import nshm_1_0_4
+from . import nshm_1_0_0, nshm_1_0_4
 
 # Python package version is different than the NSHM MODEL version !!
 __version__ = '0.1.1'
@@ -9,7 +8,7 @@
 versions = {
     "NSHM_1.0.0": nshm_1_0_0,
     "NSHM_1.0.4": nshm_1_0_4,
-    }
+}
 
 
 def get_model_version(version_id):

nzshm_model/nshm_1_0_4.py

@@ -1,19 +1,18 @@
-#! v1_0_0.py
+#! nshm_v1_0_4.py
 
-import itertools
 import json
 from pathlib import Path
 
 import dacite  # for dataclass reconstitution
 
-import nzshm_model.source_logic_tree.SLT_v8_gmm_v2_final as slt_config  # NOQA F401
-from nzshm_model.source_logic_tree.slt_config import from_config
+import nzshm_model.source_logic_tree.SLT_v9p0p0 as slt_config  # NOQA F401
+from nzshm_model.source_logic_tree.logic_tree import SourceLogicTree
 
 version = 'NSHM_1.0.4'
 title = "NSHM version 1.0.4, corrected fault geometry"
 
-py_slt = Path(__file__).parent / "source_logic_tree" / "SLT_v9p0p0.py"
+json_slt = Path(__file__).parent / "source_logic_tree" / "SLT_v9p0p0.json"
 
 
 def source_logic_tree():
-    return from_config(py_slt, version, title)
+    return dacite.from_dict(data_class=SourceLogicTree, data=json.load(open(json_slt)))

nzshm_model/source_logic_tree/SLT_v8.json

@@ -1,5 +1,5 @@
 {
-    "version": "SLT_v8",
+    "version": "NSHM_1.0.0",
     "title": "",
     "fault_system_lts": [
         {