gimu 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

gimu/gmf/boundary_conditions.py

@@ -0,0 +1,64 @@
+""" handle GMF's boundary condition
+
+
+
+"""
+
+def cell2block(geo, cell):
+    """ returns mulgrid block name (str) of a cell id (int) """
+    return geo.block_name_list[geo.num_atmosphere_blocks:][cell]
+
+def update_waiwera_model_heat_bc(geo, wjson, bcjson):
+    """ bcjson is loaded from the GMF modifier _boundary_conditions.json
+    """
+    # heat component
+    if wjson['eos']['name'] == 'wae':
+        heat_components = [3, 'energy']
+    else:
+        raise NotImplementedError(f"(gimu)    EOS {wjson['eos']['name']} not implemented")
+
+
+    if 'Heat' not in bcjson:
+        return
+    heat_bc = bcjson['Heat']
+    default_flux = float(heat_bc['Default']['Heat_Flux'])
+    count = 0
+    for src in wjson['source']:
+        if 'component' in src:
+            if src['component'] in heat_components:
+                block_name = cell2block(geo, src['cell'])
+                column_name = geo.column_name(block_name)
+                area = geo.column[column_name].area
+                flux = default_flux
+                for zone_name, zone in heat_bc.get('Zones', {}).items():
+                    if column_name in zone['Columns']:
+                        flux = float(zone['Heat_Flux'])
+                        break
+                src['rate'] = area * flux
+                count += 1
+                # print(f"Updated {src['name']} heatflow")
+    print(f"(gimu)    Updated heatflow in {count} sources")
+
+
+def update_aut2_model_heat_bc(geo, dat, bcjson):
+    if 'Heat' not in bcjson:
+        return
+    heat_bc = bcjson['Heat']
+    default_flux = float(heat_bc['Default']['Heat_Flux'])
+    count = 0
+    for gen in dat.generatorlist:
+        if gen.type == 'HEAT':
+            block_name = gen.block
+            column_name = geo.column_name(block_name)
+            area = geo.column[column_name].area
+            flux = default_flux
+            for zone_name, zone in heat_bc.get('Zones', {}).items():
+                if column_name in zone['Columns']:
+                    flux = float(zone['Heat_Flux'])
+                    break
+            gen.gx = area * flux
+            count += 1
+            # print(f"Updated {gen.name} heatflow")
+    print(f"(gimu)    Updated heatflow in {count} generators")
+
+

gimu/gmf/modifier.py

@@ -85,17 +85,28 @@ 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"(gimu)    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:
-                    print("Warning: " + msg)
+                    print("(gimu)    Warning: " + msg)
                     rt['error'] = msg
 
 
@@ -105,13 +116,16 @@ def update_waiwera_model_rocktypes(wjson, rtjson, skip_missing=True):
     for rt in wjson['rock']['types']:
         if rt['name'] not in rtjson:
             if skip_missing:
-                print(f"Rocktype {rt['name']} not found in _rocktypes.json... skipped")
+                print(f"(gimu)    Rocktype {rt['name']} not found in _rocktypes.json... skipped")
                 continue
             else:
-                raise Exception(f"Rocktype {rt['name']} not found in _rocktypes.json")
+                raise Exception(f"(gimu)    Rocktype {rt['name']} not found in _rocktypes.json")
         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
@@ -119,11 +133,13 @@ def update_aut2_model_rocktypes(dat, rtjson, skip_missing=True):
     for rt in dat.grid.rocktypelist:
         if rt.name not in rtjson:
             if skip_missing:
-                print(f"Rocktype {rt.name} not found in _rocktypes.json... skipped")
+                print(f"(gimu)    Rocktype {rt.name} not found in _rocktypes.json... skipped")
                 continue
             else:
-                raise Exception(f"Rocktype {rt.name} not found in _rocktypes.json")
+                raise Exception(f"(gimu)    Rocktype {rt.name} not found in _rocktypes.json")
         modifier = rtjson[rt.name]
         rt.permeability = modifier['permeability']
         rt.porosity = modifier['porosity'][0]
+        if 'conductivity' in modifier:
+            rt.conductivity = modifier['conductivity'][0]
 

{gimu-0.4.0.dist-info → gimu-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gimu
-Version: 0.4.0
+Version: 0.6.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.dist-info → gimu-0.6.0.dist-info}/RECORD

@@ -8,10 +8,11 @@ gimu/t2listingh5.py,sha256=sepCah3lV6etWr-aJ_Tc9d3Rubio7DitEn0SQP2oJ2E,16628
 gimu/waiwera_copy.py,sha256=G84UQWbVq--cfkETCs_jpcquTL-x5SftAFNNNs3GfJs,1286
 gimu/waiwera_listing.py,sha256=c7moQY8DQEH_MqLUuhrinnkEHnDMKWx4srChffXoK6I,27787
 gimu/gmf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gimu/gmf/boundary_conditions.py,sha256=lknJrVwOuT_fl5nhD9hVQeNzWj6tkQcVp9gkDVFLLKU,2205
 gimu/gmf/data.py,sha256=KoPfSMVzon17ZFZRIUOOQwluv7FMzDQTYzq46xoJGpI,3583
-gimu/gmf/modifier.py,sha256=WkZ0Bu36jGUglnCKNPsGwsZBBsadOpibH4NWsyAlmTQ,4766
-gimu-0.4.0.dist-info/METADATA,sha256=ilC3EsUPzHnf_7l-dYSGBJeicLAXh4-46HV8QRZcQm0,2320
-gimu-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-gimu-0.4.0.dist-info/entry_points.txt,sha256=FbtLXv_XXn6Wh2DXRsqJpTp85lxEvJiE36TTUTa0e1o,129
-gimu-0.4.0.dist-info/licenses/LICENSE.txt,sha256=E2nlaUhQtke9PAEhVEbZfNCPa-qJYGSeuR6Q3f6XgOM,1121
-gimu-0.4.0.dist-info/RECORD,,
+gimu/gmf/modifier.py,sha256=6RZe-kN4vz8gBYXzeDQQOreesb9NRt87N6Roi71jUXY,5758
+gimu-0.6.0.dist-info/METADATA,sha256=o_GrlBFVZsMcygu3rkVRC_UqoDDW0_g9WzC90ml8Wkk,2320
+gimu-0.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+gimu-0.6.0.dist-info/entry_points.txt,sha256=FbtLXv_XXn6Wh2DXRsqJpTp85lxEvJiE36TTUTa0e1o,129
+gimu-0.6.0.dist-info/licenses/LICENSE.txt,sha256=E2nlaUhQtke9PAEhVEbZfNCPa-qJYGSeuR6Q3f6XgOM,1121
+gimu-0.6.0.dist-info/RECORD,,