Skip to content

Fix profile extraction: stop merging volume data, initialise all ProfileData fields #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

Fix profile extraction: stop merging volume data, initialise all ProfileData fields #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15fdaf0
Initial plan
Copilot Oct 2, 2026
54102f0
Profile processing: avoid merging volume data, pass topo/screenshot d…
Copilot Oct 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/ProfileProcessing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ mutable struct ProfileData
ScreenshotData::Union{Nothing, NamedTuple}

function ProfileData(; kwargs...) # this constructor allows to define only certain fields and leave the others blank
K = new(true, nothing, nothing, nothing, nothing, nothing, nothing)
K = new(true, nothing, nothing, nothing, nothing, nothing, nothing, nothing, nothing)
for (key, value) in kwargs
# make sure that start and end point are given as tuples of Float64
if key == Symbol("start_lonlat")
Expand Down Expand Up @@ -617,14 +617,12 @@ function extract_ProfileData(ProfileCoordFile::String, ProfileNumber::Int64, Dat
# load all Data
VolData, SurfData, PointData, ScreenshotData, TopoData = load_GMG(Datasets_all)

# merge VolData:
VolData_combined = combine_vol_data(VolData)

# project data onto profile:
# project data onto profile (volume datasets are processed individually, without merging them first):
extract_ProfileData!(
profile, VolData_combined, SurfData, PointData;
profile, VolData, SurfData, PointData;
DimsVolCross = DimsVolCross, DimsSurfCross = DimsSurfCross,
Depth_extent = DepthVol, section_width = WidthPointProfile
Depth_extent = DepthVol, section_width = WidthPointProfile,
ScreenshotData = ScreenshotData, TopoData = TopoData
)

return profile
Expand Down
3 changes: 3 additions & 0 deletions test/test_ProfileProcessing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ VolData_combined2 = combine_vol_data(Data.Volume, dims = (50, 51, 52))
VolData_combined3 = combine_vol_data(Data.Volume, lon = (1, 22), lat = (40, 52), dims = (50, 51, 52))
@test isnan(VolData_combined3.fields.Hua2017_Vp[1000])

# ProfileData has a TopoData field, which is empty by default
@test isnothing(ProfileData(depth = -10).TopoData)

# Define horizontal & vertical profiles
prof1 = ProfileData(start_lonlat = (5, 45), end_lonlat = (15, 49))
prof2 = ProfileData(depth = -100)
Expand Down