cmflow 0.4.2__tar.gz → 0.4.3__tar.gz

{cmflow-0.4.2 → cmflow-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: cmflow
-Version: 0.4.2
+Version: 0.4.3
 Summary: Building TOUGH2/Waiwera models from layers of conceptual models
 Project-URL: Homepage, https://github.com/cyeh015/cmflow
 Project-URL: Source Code, https://github.com/cyeh015/cmflow
@@ -236,5 +236,8 @@ Publish to PyPI:
 
 ```console
 hatch build
-hatch publish dist/*
+hatch publish -u __token__ -a pypi-<token>
 ```
+
+`hatch publish` will prompt for user and password.  Use `__token__` as user, and then paste the whole token including the first part `pypi-` as password.  This will be cached by hatch automatically.
+

{cmflow-0.4.2 → cmflow-0.4.3}/README.md

@@ -213,5 +213,8 @@ Publish to PyPI:
 
 ```console
 hatch build
-hatch publish dist/*
+hatch publish -u __token__ -a pypi-<token>
 ```
+
+`hatch publish` will prompt for user and password.  Use `__token__` as user, and then paste the whole token including the first part `pypi-` as password.  This will be cached by hatch automatically.
+

{cmflow-0.4.2 → cmflow-0.4.3}/cmflow/conceptual_models.py

@@ -350,7 +350,7 @@ class FaultRocktypes:
             "faults": {
                 "rank": [1],
                 "legend": gmf1,
-                "direction": {f:None for f in gmf1.keys()},
+                "direction": {f:self.fault_dir[gmf1[f]] for f in gmf1.keys() if gmf1[f]},
                 "color": {rt[:1]: None for rt, fs in self.rocktype_faults.items() if len(fs)==1},
             },
             "intersections": {
@@ -360,6 +360,20 @@ class FaultRocktypes:
                     rt, warn=False) for rt in self.rocktype_faults.keys()},
             },
         }
+
+        # sometimes rank 1 name isn't a specific fault, combined with rank 2
+        # becomes combination of 3 or more faults
+        for rt in self.rocktype_faults:
+            if rt[0] not in gmf_fault['faults']['legend']:
+                gmf_fault['faults']['legend'][rt[0]] = 'Combo of 3+ faults'
+                gmf_fault['faults']['color'][rt[0]] = None
+                gmf_fault['faults']['direction'][rt[0]] = None
+
+        colors = default_discrete_colors(len(gmf_fault['faults']['color']))
+        for f, c in zip(gmf_fault['faults']['color'], colors):
+            gmf_fault['faults']['color'][f] = c
+
+
         return gmf_fault
 
     def export_gmf_convention(self, rank=[1, 2]):