@@ -196,13 +196,13 @@ def check_fig_3_fcc_ferric_fper():
196196
197197 assemblage = Composite ([bcc , fcc ], [0.5 , 0.5 ])
198198 equality_constraints = [["P" , 1.0e5 ], ["phase_fraction" , (bcc , 0.0 )]]
199- sol = equilibrate (composition , assemblage , equality_constraints , tol = 1.0e-5 )
199+ sol = equilibrate (composition , assemblage , equality_constraints )
200200 T_a_g = sol [0 ].assemblage .temperature
201201
202202 assemblage = Composite ([bcc , fper ], [0.5 , 0.5 ])
203203 temperatures = np .linspace (T_a_wu_mag , T_a_g , 31 )
204204 equality_constraints = [["P" , 1.0e5 ], ["T" , temperatures ]]
205- sol = equilibrate (composition , assemblage , equality_constraints , tol = 1.0e-5 )
205+ sol = equilibrate (composition , assemblage , equality_constraints )
206206 xs = np .empty_like (temperatures )
207207 for i , s in enumerate (sol [0 ]):
208208 xs [i ] = - s .assemblage .phases [1 ].formula ["Fe" ] / 4.0
@@ -211,16 +211,17 @@ def check_fig_3_fcc_ferric_fper():
211211 assemblage = Composite ([fcc , fper ], [0.5 , 0.5 ])
212212 temperatures = np .linspace (T_a_g , 1800.0 , 31 )
213213 equality_constraints = [["P" , 1.0e5 ], ["T" , temperatures ]]
214- sol = equilibrate (composition , assemblage , equality_constraints , tol = 1.0e-5 )
214+ sol = equilibrate (composition , assemblage , equality_constraints )
215215 xs = np .empty_like (temperatures )
216216 for i , s in enumerate (sol [0 ]):
217217 xs [i ] = - s .assemblage .phases [1 ].formula ["Fe" ] / 4.0
218218 ax [0 ].plot (xs , temperatures , linestyle = ":" , linewidth = 3.0 )
219219
220+ composition = {"Fe" : 1.0 , "O" : 1.3 }
220221 assemblage = Composite ([mag , fper ], [0.5 , 0.5 ])
221222 temperatures = np .linspace (T_a_wu_mag , 1800.0 , 31 )
222223 equality_constraints = [["P" , 1.0e5 ], ["T" , temperatures ]]
223- sol = equilibrate (composition , assemblage , equality_constraints , tol = 1.0e-5 )
224+ sol = equilibrate (composition , assemblage , equality_constraints )
224225 xs = np .empty_like (temperatures )
225226 for i , s in enumerate (sol [0 ]):
226227 xs [i ] = - s .assemblage .phases [1 ].formula ["Fe" ] / 4.0
@@ -246,9 +247,7 @@ def check_fig_3_fcc_ferric_fper():
246247 for i , x_MgO in enumerate (x_MgOs ):
247248 composition = {"Mg" : x_MgO , "Fe" : 2.0 , "O" : 1.0 }
248249 try :
249- sol = equilibrate (
250- composition , assemblage , equality_constraints , tol = 1.0e-5
251- )
250+ sol = equilibrate (composition , assemblage , equality_constraints )
252251 if sol [0 ].success :
253252 f = assemblage .phases [0 ].formula
254253 x_Mgs [i ] = f ["Mg" ] / 4.0
@@ -408,7 +407,7 @@ def check_fig_7_fO2():
408407 ["phase_fraction" , [a .phases [0 ], 0.0 ]],
409408 ["T" , 1500.0 ],
410409 ]
411- equilibrate (a .phases [0 ].formula , a , equality_constraints , tol = 1.0e-5 )
410+ equilibrate (a .phases [0 ].formula , a , equality_constraints )
412411 P_bounds [i ][1 ] = a .pressure
413412 P_bounds [i + 1 ][0 ] = a .pressure
414413
@@ -437,9 +436,9 @@ def check_fig_7_fO2():
437436 for i , P in enumerate (pressures ):
438437 assemblage .set_state (P , T )
439438 try :
440- sol = equilibrate (
441- assemblage . formula , assemblage , [[ "P" , P ], [ "T" , T ]], tol = 1.0e-7
442- )[ 0 ]
439+ sol = equilibrate (assemblage . formula , assemblage , [[ "P" , P ], [ "T" , T ]])[
440+ 0
441+ ]
443442 if sol .success :
444443 mu_O2 = assemblage .chemical_potential ([{"O" : 2.0 }])[0 ]
445444 O2_gas .set_state (1.0e5 , T )
0 commit comments