From 9fc683f0070379e9319b0f8782c29290f83e9e27 Mon Sep 17 00:00:00 2001 From: Orso Meneghini Date: Sun, 6 Oct 2024 12:41:17 -0700 Subject: [PATCH] fix arbitrary Z offset --- src/actors/build/cx_actor.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/actors/build/cx_actor.jl b/src/actors/build/cx_actor.jl index 10691773..a70ffab9 100644 --- a/src/actors/build/cx_actor.jl +++ b/src/actors/build/cx_actor.jl @@ -262,7 +262,7 @@ function wall_from_eq!( # remove private flux region from wall (necessary because of Z expansion) pr1m = [pr1; pr1[1]; pr1[end]] - pz1m = [pz1; sign(pz1[1]) * 100; sign(pz1[end]) * 100] + pz1m = [pz1; pz1 .+ sign(pz1[1] - ZA) * 100; pz1 .+ sign(pz1[end] - ZA) * 100] pm_poly = xy_polygon(convex_hull(pr1m, pz1m; closed_polygon=true)) wall_poly = LibGEOS.difference(wall_poly, pm_poly) @@ -424,7 +424,7 @@ function divertor_regions!( α = 5.0 domain_r = vcat(xx, reverse(xx), xx[1]) - domain_z = vcat(yy, [Zx * α, Zx * α], yy[1]) + domain_z = vcat(yy, [(Zx - ZA) * α + ZA, (Zx - ZA) * α + ZA], yy[1]) domain_poly = xy_polygon(domain_r, domain_z) backwall_domain_poly = try LibGEOS.intersection(backwall_poly, domain_poly) @@ -699,7 +699,7 @@ function build_cx!(bd::IMAS.build, eqt::IMAS.equilibrium__time_slice, wall::IMAS layer = bd.layer[plasma_to_tf[kk]] layer_shape = IMAS.BuildLayerShape(mod(mod(layer.shape, 1000), 100)) verbose && @show "B", layer.name, layer_shape - layer.shape, layer.shape_parameters = FUSE.optimize_layer_outline( + layer.shape, layer.shape_parameters = optimize_layer_outline( bd, plasma_to_tf[kk+1], plasma_to_tf[kk],