Skip to content

Commit 56f7d5c

Browse files
committed
missing parameters in material and model
1 parent 41b38a2 commit 56f7d5c

File tree

3 files changed

+39
-21
lines changed

3 files changed

+39
-21
lines changed

examples/notebooks/4_Material.ipynb

Lines changed: 36 additions & 19 deletions
Large diffs are not rendered by default.

pide/material.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ def __init__(self, name = "Unnamed", material_index = None, calculation_type = '
132132
self.linked_material_index = kwargs.pop('linked_material_index', None)
133133

134134
self.fluid_salinity = kwargs.pop('fluid_salinity', 0.0)
135-
135+
136+
self.al_opx = kwargs.pop('al_opx', 0.0)
136137

137138
if (self.calculation_type == 'value') and (self.resistivity_medium == None):
138139

pide/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ def run_model(index_list, material, pide_object, t_array, p_array, melt_array, t
4444
pide_object.set_watercalib(ol = material.water_calib['ol'], px_gt = material.water_calib['px_gt'], feldspar = material.water_calib['feldspar'])
4545
pide_object.set_o2_buffer(o2_buffer = material.o2_buffer)
4646
pide_object.set_solid_phase_method(material.calculation_type)
47+
pide_object.set_alopx(material.al_opx)
4748

4849
#adjusting material parameters for the pide_object
4950
if material.calculation_type == 'mineral':
5051

51-
5252
pide_object.set_composition_solid_mineral(ol = material.composition['ol'],
5353
opx = material.composition['opx'],
5454
cpx = material.composition['cpx'],

0 commit comments

Comments
 (0)