Skip to content

Commit

Permalink
Merge branch 'adm/variational' of https://github.com/PTsolvers/JustRe…
Browse files Browse the repository at this point in the history
…lax.jl into adm/variational
  • Loading branch information
albert-de-montserrat committed Dec 16, 2024
2 parents f09df92 + c30ab31 commit d6d64c2
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using GeoParams, CairoMakie, CellArrays
using GeoParams, GLMakie, CellArrays
using JustRelax, JustRelax.JustRelax2D
using ParallelStencil
@init_parallel_stencil(Threads, Float64, 2)
Expand Down Expand Up @@ -81,7 +81,7 @@ function main(igg; nx=64, ny=64, figdir="model_figs")
),
# High density phase
SetMaterialParams(;
Phase = 2,
Phase = 1,
Density = ConstantDensity(; ρ = 0.0),
Gravity = ConstantGravity(; g = 0.0),
# CompositeRheology = CompositeRheology((visc, el_inc, )),
Expand All @@ -97,7 +97,7 @@ function main(igg; nx=64, ny=64, figdir="model_figs")
radius = 0.1
phase_ratios = PhaseRatios(backend_JP, length(rheology), ni)
init_phases!(phase_ratios, xci, xvi, radius)
air_phase = 2
air_phase = 0
ϕ = RockRatio(backend, ni)
update_rock_ratio!(ϕ, phase_ratios, air_phase)
# STOKES ---------------------------------------------
Expand Down

0 comments on commit d6d64c2

Please sign in to comment.