Skip to content

Commit

Permalink
Optimize time handling and other IMASdd interactions
Browse files Browse the repository at this point in the history
Co-authored-by: Orso Meneghini <orso82@gmail.com>
  • Loading branch information
eldond and orso82 committed Aug 9, 2024
1 parent a7f87d9 commit 5bf2192
Showing 1 changed file with 3 additions and 18 deletions.
21 changes: 3 additions & 18 deletions src/io.jl
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,7 @@ function geqdsk2imas!(
end
geqdsk2imas!(
g, dd.equilibrium;
wall=dd.wall, geqdsk_cocos=geqdsk_cocos, dd_cocos=dd_cocos, cocos_clockwise_phi=cocos_clockwise_phi,
add_derived=add_derived,
dd.wall, geqdsk_cocos, dd_cocos, cocos_clockwise_phi, add_derived,
)
end

Expand Down Expand Up @@ -421,22 +420,14 @@ function geqdsk2imas!(
end
tc = CoordinateConventions.transform_cocos(geqdsk_cocos, dd_cocos)

if length(eq.time_slice) == 0
resize!(eq.time_slice, 1)
eq.time_slice[1].time = g.time
end
if ismissing(eq, :time)
eq.time = [g.time]
end

dd = IMASdd.top_dd(eq)
original_global_time = dd.global_time
try
dd.global_time = g.time
resize!(eq.time_slice)
geqdsk2imas!(
g, eq.time_slice[];
wall=wall, geqdsk_cocos=geqdsk_cocos, dd_cocos=dd_cocos, cocos_clockwise_phi=cocos_clockwise_phi,
add_derived=add_derived,
wall, geqdsk_cocos, dd_cocos, cocos_clockwise_phi, add_derived,
)
finally
dd.global_time = original_global_time
Expand Down Expand Up @@ -482,16 +473,10 @@ function geqdsk2imas!(
end
tc = CoordinateConventions.transform_cocos(geqdsk_cocos, dd_cocos)

if ismissing(eqt, :time)
eqt.time = g.time
end
dd = IMASdd.top_dd(eqt)
original_global_time = dd.global_time
try
dd.global_time = g.time
if ismissing(dd.equilibrium.vacuum_toroidal_field, :b0)
dd.equilibrium.vacuum_toroidal_field.b0 = zeros(length(dd.equilibrium.time))
end
IMASdd.@ddtime(dd.equilibrium.vacuum_toroidal_field.b0 = g.bcentr .* tc["B"])
dd.equilibrium.vacuum_toroidal_field.r0 = g.rcentr
finally
Expand Down

0 comments on commit 5bf2192

Please sign in to comment.