Skip to content

Commit

Permalink
Merge branch 'main' into pa-KraflaSill
Browse files Browse the repository at this point in the history
  • Loading branch information
aelligp committed Mar 25, 2024
2 parents 012e5f0 + 71cac4f commit bafbf4b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/Dependency.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Check Dependencies

on: [push, pull_request]

jobs:
check_dependencies:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Check for GLMakie and JustPIC dependencies
run: |
if grep -q "GLMakie" ./Project.toml; then
echo "GLMakie dependency found, failing the test."
exit 1
fi
if grep -q "JustPIC" ./Project.toml; then
echo "JustPIC dependency found, failing the test."
exit 1
fi
echo "Neither GLMakie nor JustPIC dependencies found."
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
AMDGPU = "0.6, 0.7, 0.8"
Adapt = "3.7.2"
CUDA = "4.4.1, 5"
CellArrays = "0.1 "
CellArrays = "0.1, 0.2"
GeoParams = "0.5"
HDF5 = "0.17.1"
ImplicitGlobalGrid = "0.14.0, 0.15.0"
Expand Down
7 changes: 4 additions & 3 deletions src/stokes/Stokes2D.jl
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,8 @@ function JustRelax.solve!(
viscosity_cutoff=(1e16, 1e24),
iterMax=50e3,
iterMin=1e2,
viscosity_relaxation=1e-3,
viscosity_relaxation=1e-2,
free_surface=false,
nout=500,
b_width=(4, 4, 0),
verbose=true,
Expand Down Expand Up @@ -622,7 +623,7 @@ function JustRelax.solve!(
ρg...,
ητ,
_di...,
dt,
dt * free_surface,
)
# apply boundary conditions
flow_bcs!(stokes, flow_bcs)
Expand All @@ -644,7 +645,7 @@ function JustRelax.solve!(
@stress(stokes)...,
ρg...,
_di...,
dt,
dt * free_surface,
)
# errs = maximum_mpi.((abs.(stokes.R.Rx), abs.(stokes.R.Ry), abs.(stokes.R.RP)))
errs = (
Expand Down

0 comments on commit bafbf4b

Please sign in to comment.