Skip to content

Commit 41b38a2

Browse files
committed
param1 was missing from model.py
1 parent 481e269 commit 41b38a2

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

pide/model.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,24 @@ def run_model(index_list, material, pide_object, t_array, p_array, melt_array, t
6767
perov = material.composition['perov'],
6868
other = material.composition['other'])
6969

70+
pide_object.set_param1_mineral(ol = material.param1['ol'],
71+
opx = material.param1['opx'],
72+
cpx = material.param1['cpx'],
73+
garnet = material.param1['garnet'],
74+
mica = material.param1['mica'],
75+
amp = material.param1['amp'],
76+
quartz = material.param1['quartz'],
77+
plag = material.param1['plag'],
78+
kfelds = material.param1['kfelds'],
79+
sulphide = material.param1['sulphide'],
80+
graphite = material.param1['graphite'],
81+
mixture = material.param1['mixture'],
82+
sp = material.param1['sp'],
83+
wds = material.param1['wds'],
84+
rwd = material.param1['rwd'],
85+
perov = material.param1['perov'],
86+
other = material.param1['other'])
87+
7088
if material.solid_phase_mixing_idx == 0:
7189

7290
pide_object.set_phase_interconnectivities(ol = material.interconnectivities['ol'],
@@ -150,6 +168,16 @@ def run_model(index_list, material, pide_object, t_array, p_array, melt_array, t
150168
gabbro = material.composition['gabbro'],
151169
other_rock = material.composition['other_rock'])
152170

171+
pide_object.set_param1_rock(granite = material.param1['granite'],
172+
granulite = material.param1['granulite'],
173+
sandstone = material.param1['sandstone'],
174+
gneiss = material.param1['gneiss'],
175+
amphibolite = material.param1['amphibolite'],
176+
basalt = material.param1['basalt'],
177+
mud = material.param1['mud'],
178+
gabbro = material.param1['gabbro'],
179+
other_rock = material.param1['other_rock'])
180+
153181
if material.solid_phase_mixing_idx == 0:
154182

155183
pide_object.set_phase_interconnectivities(granite = material.interconnectivities['granite'],

0 commit comments

Comments
 (0)