Skip to content

Commit

Permalink
Fixed hardcoded dim indexing and numbering
Browse files Browse the repository at this point in the history
  • Loading branch information
anchal-physics committed Nov 3, 2023
1 parent 3f181c6 commit 84fb25f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/SOLPS2IMAS.jl
Original file line number Diff line number Diff line change
Expand Up @@ -840,16 +840,16 @@ function get_subset_boundary_inds(
subset::OMAS.edge_profiles__grid_ggd___grid_subset,
)
nD = subset.element[1].object[1].dimension
if nD > 0
nD_objects = space.objects_per_dimension[nD+1].object
if nD > 1 # Only 2D (edges) and 3D (cells) subsets have boundaries
nD_objects = space.objects_per_dimension[nD].object
elements = [nD_objects[ele.object[1].index] for ele subset.element]
boundary_inds = Int[]
for ele elements
symdiff!(boundary_inds, [bnd.index for bnd ele.boundary])
end
return boundary_inds
end
return []
return [] # 1D (nodes) subsets have no boundary
end

function get_subset_boundary(
Expand All @@ -867,7 +867,7 @@ end
function get_subset_space(space::OMAS.edge_profiles__grid_ggd___space,
elements::Vector{OMAS.edge_profiles__grid_ggd___grid_subset___element})
nD = elements[1].object[1].dimension
nD_objects = space.objects_per_dimension[nD+1].object
nD_objects = space.objects_per_dimension[nD].object
return [nD_objects[ele.object[1].index] for ele elements]
end

Expand Down Expand Up @@ -897,7 +897,7 @@ function subset_do(set_operator,
) for set_elements itrs
]...,
)
dim = 0
dim = 1
else
ele_inds = set_operator(
[[ele.object[1].index for ele set_elements] for set_elements itrs]...,
Expand Down Expand Up @@ -962,7 +962,7 @@ function solps2imas(b2gmtry, b2output, gsdesc, b2mn=nothing; load_bb=false)
space = grid_ggd.space[sn]
# Assuming following to be standard for now.
# We can add this info through YAML as well
resize!(space.objects_per_dimension, 4)
resize!(space.objects_per_dimension, 3)
o1 = space.objects_per_dimension[1] # 1D objects
o2 = space.objects_per_dimension[2] # 2D objects
o3 = space.objects_per_dimension[3] # 3D objects
Expand Down

0 comments on commit 84fb25f

Please sign in to comment.