Skip to content

Commit 115a1cc

Browse files
committed
some of albert's suggestions broke the tests
1 parent 3050774 commit 115a1cc

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/Setup_geometry.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,13 @@ function add_box!(Phase, Temp, Grid::AbstractGeneralGrid; # required input
253253
# Compute thermal structure accordingly. See routines below for different options
254254
if T != nothing
255255
if isa(T,LithosphericTemp)
256-
@views Phase[ind_flat] .= compute_phase(Phase[ind_flat], Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], phase)
256+
Phase[ind_flat] = compute_phase(Phase[ind_flat], Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], phase)
257257
end
258-
@views Temp[ind_flat] .= compute_thermal_structure(Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], Phase[ind_flat], T)
258+
Temp[ind_flat] = compute_thermal_structure(Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], Phase[ind_flat], T)
259259
end
260260

261261
# Set the phase. Different routines are available for that - see below.
262-
@views Phase[ind_flat] .= compute_phase(Phase[ind_flat], Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], phase)
262+
Phase[ind_flat] = compute_phase(Phase[ind_flat], Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], phase)
263263

264264
return nothing
265265
end
@@ -355,11 +355,11 @@ function add_layer!(Phase, Temp, Grid::AbstractGeneralGrid; # required input
355355

356356
# Compute thermal structure accordingly. See routines below for different options
357357
if !isnothing(T)
358-
@views Temp[ind_flat] .= compute_thermal_structure(Temp[ind_flat], X[ind], Y[ind], Z[ind], Phase[ind_flat], T)
358+
Temp[ind_flat] = compute_thermal_structure(Temp[ind_flat], X[ind], Y[ind], Z[ind], Phase[ind_flat], T)
359359
end
360360

361361
# Set the phase. Different routines are available for that - see below.
362-
@views Phase[ind_flat] .= compute_phase(Phase[ind_flat], Temp[ind_flat], X[ind], Y[ind], Z[ind], phase)
362+
Phase[ind_flat] = compute_phase(Phase[ind_flat], Temp[ind_flat], X[ind], Y[ind], Z[ind], phase)
363363

364364
return nothing
365365
end
@@ -426,11 +426,11 @@ function add_sphere!(Phase, Temp, Grid::AbstractGeneralGrid; # required input
426426

427427
# Compute thermal structure accordingly. See routines below for different options
428428
if T != nothing
429-
@views Temp[ind_flat] .= compute_thermal_structure(Temp[ind_flat], X[ind], Y[ind], Z[ind], Phase[ind_flat], T)
429+
Temp[ind_flat] = compute_thermal_structure(Temp[ind_flat], X[ind], Y[ind], Z[ind], Phase[ind_flat], T)
430430
end
431431

432432
# Set the phase. Different routines are available for that - see below.
433-
@views Phase[ind_flat] .= compute_phase(Phase[ind_flat], Temp[ind_flat], X[ind], Y[ind], Z[ind], phase)
433+
Phase[ind_flat] = compute_phase(Phase[ind_flat], Temp[ind_flat], X[ind], Y[ind], Z[ind], phase)
434434

435435
return nothing
436436
end
@@ -512,11 +512,11 @@ function add_ellipsoid!(Phase, Temp, Grid::AbstractGeneralGrid; # required i
512512

513513
# Compute thermal structure accordingly. See routines below for different options
514514
if T != nothing
515-
@views Temp[ind_flat] .= compute_thermal_structure(Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], Phase[ind_flat], T)
515+
Temp[ind_flat] = compute_thermal_structure(Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], Phase[ind_flat], T)
516516
end
517517

518518
# Set the phase. Different routines are available for that - see below.
519-
@views Phase[ind_flat] .= compute_phase(Phase[ind_flat], Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], phase)
519+
Phase[ind_flat] = compute_phase(Phase[ind_flat], Temp[ind_flat], Xrot[ind], Yrot[ind], Zrot[ind], phase)
520520

521521
return nothing
522522
end
@@ -597,11 +597,11 @@ function add_cylinder!(Phase, Temp, Grid::AbstractGeneralGrid; # required input
597597

598598
# Compute thermal structure accordingly. See routines below for different options
599599
if !isnothing(T)
600-
@views Temp[ind_flat] .= compute_thermal_structure(Temp[ind_flat], X[ind], Y[ind], Z[ind], Phase[ind_flat], T)
600+
Temp[ind_flat] = compute_thermal_structure(Temp[ind_flat], X[ind], Y[ind], Z[ind], Phase[ind_flat], T)
601601
end
602602

603603
# Set the phase. Different routines are available for that - see below.
604-
@views Phase[ind_flat] .= compute_phase(Phase[ind_flat], Temp[ind_flat], X[ind], Y[ind], Z[ind], phase)
604+
Phase[ind_flat] = compute_phase(Phase[ind_flat], Temp[ind_flat], X[ind], Y[ind], Z[ind], phase)
605605

606606
return nothing
607607
end
@@ -795,7 +795,7 @@ function add_volcano!(
795795
ind_flat = flatten_index_dimensions(Temp, ind)
796796

797797
# @views Temp[ind .== false] .= 0.0
798-
@views Temp[ind_flat] .= compute_thermal_structure(Temp[ind_flat], Grid.x.val[ind], Grid.y.val[ind], depth[ind], Phases[ind_flat], T)
798+
Temp[ind_flat] = compute_thermal_structure(Temp[ind_flat], Grid.x.val[ind], Grid.y.val[ind], depth[ind], Phases[ind_flat], T)
799799

800800
return nothing
801801
end

0 commit comments

Comments
 (0)