Skip to content

Commit bb0feb0

Browse files
committed
Clean up perplextrace_query output, update tests for new sphene model
1 parent 9f1613b commit bb0feb0

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/resources/Perplex.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1871,6 +1871,7 @@ export perplex_query_system
18711871
push!(elements, e)
18721872
end
18731873
minerals = collect(setdiff(keys(modes), ("elements", "T(C)", "T(K)", "P(bar)", "all_melts", "all_fluids", "all_solids", melt_model)))
1874+
filter!(m->!contains(m, "dqf"), minerals) # Don't include dqf corrections as independent minerals
18741875
t = sortperm(lowercase.(minerals))
18751876
for e in minerals[t]
18761877
# Don't print empty columns
@@ -2396,7 +2397,7 @@ export perplex_query_system
23962397
function perplex_phase_is_solid(phase_name)
23972398
phase_name ("cAmph_I(DP)", "cAmph_I(G)", "Cpx_I(HGP)", "Sp_II(WPC)", "feldspar_B") || (
23982399
!perplex_phase_is_fluid(phase_name) && !perplex_phase_is_melt(phase_name) &&
2399-
!any(contains.(phase_name, ["_", "P(", "T(", "Pressure", "Temperature", "elements", "minerals", "system", "bulk",]))
2400+
!any(contains.(phase_name, ["_", "P(", "T(", "Pressure", "Temperature", "elements", "minerals", "system", "bulk", "dqf"]))
24002401
)
24012402
end
24022403
export perplex_phase_is_solid

0 commit comments

Comments
 (0)