gimu 0.4.0__tar.gz → 0.5.0__tar.gz

{gimu-0.4.0 → gimu-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gimu
-Version: 0.4.0
+Version: 0.5.0
 Summary: A toolkit and python library for modelling at Geothermal Institute, University of Auckland.
 Project-URL: Documentation, https://github.com/cyeh015/gimu/blob/main/README.md
 Project-URL: Issues, https://github.com/cyeh015/gimu/issues

{gimu-0.4.0 → gimu-0.5.0}/src/gimu/gmf/modifier.py

@@ -85,13 +85,24 @@ def compute_rocktypes(rocktype_json, warn=True):
                     float(rt['modifier']['k2'][0]),
                     float(rt['modifier']['k3'][0]),
                 ]
-            # update permeability in place
-            if rt['base'][0] in rocktype_json:
+            c_modifier = 1.0
+            if 'conductivity' in rt['modifier']:
+                c_modifier = float(rt['modifier']['conductivity'][0])
+            # update values in place
+            base_name = rt['base'][0]
+            if base_name in rocktype_json:
                 rt['permeability'] = [k * m for k, m in zip(
-                    rocktype_json[rt['base'][0]]['permeability'], k_modifier)]
-                rt['porosity'][0] = rocktype_json[rt['base'][0]]['porosity'][0] * rt['modifier']['porosity'][0]
+                    rocktype_json[base_name]['permeability'], k_modifier)]
+                rt['porosity'][0] = rocktype_json[base_name]['porosity'][0] * rt['modifier']['porosity'][0]
+                if 'conductivity' in rocktype_json[base_name]:
+                    # print(f"Rocktype {rt_name} use conductivity from base rocktype {base_name}")
+                    rt['conductivity'] = [rocktype_json[base_name]['conductivity'][0] * c_modifier]
+                else:
+                    if 'conductivity' in rt:
+                        print(f"Rocktype {rt_name} remove conductivity because no conductivity in base rocktype {base_name}")
+                        del rt['conductivity']
             else:
-                msg = f"Base rocktype {rt['base'][0]} not found for rocktype {rt_name}"
+                msg = f"Base rocktype {base_name} not found for rocktype {rt_name}"
                 if warn:
                     raise Exception(msg)
                 else:
@@ -112,6 +123,9 @@ def update_waiwera_model_rocktypes(wjson, rtjson, skip_missing=True):
         modifier = rtjson[rt['name']]
         rt['permeability'] = modifier['permeability']
         rt['porosity'] = modifier['porosity'][0]
+        if 'conductivity' in modifier:
+            rt['wet_conductivity'] = modifier['conductivity'][0]
+            rt['dry_conductivity'] = modifier['conductivity'][0]
 
 def update_aut2_model_rocktypes(dat, rtjson, skip_missing=True):
     """ rtjson is loaded from the GMF modifier _rocktypes.json
@@ -126,4 +140,6 @@ def update_aut2_model_rocktypes(dat, rtjson, skip_missing=True):
         modifier = rtjson[rt.name]
         rt.permeability = modifier['permeability']
         rt.porosity = modifier['porosity'][0]
+        if 'conductivity' in modifier:
+            rt.conductivity = modifier['conductivity'][0]