Skip to content

Replace quad_bilinear_interp with inverse distance weighting in quad_utils. #887

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

Open
hkershaw-brown wants to merge 12 commits into
base: main
Choose a base branch
from
+94 −329
Open

Replace quad_bilinear_interp with inverse distance weighting in quad_utils. #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d9d08c
fix: replace bilinear interpolation with inverse distance weighting i…
hkershaw-brown Jun 3, 2025
d5e4b34
compile quad_utils_mod only model with threed_sphere
hkershaw-brown Jun 3, 2025
3c309e8
compile observation convters with quad_utils only for threed_sphere
hkershaw-brown Jun 3, 2025
e480051
Merge branch 'main' into fix-quad-utils-interp
hkershaw-brown Jul 15, 2025
ea04f78
Merge branch 'main' into fix-quad-utils-interp
hkershaw-brown Jul 16, 2025
bf2eea8
Merge branch 'main' into fix-quad-utils-interp
hkershaw-brown Sep 3, 2025
6e2685a
If all four point values are identical in interpolate, just return
jlaucar Sep 22, 2025
987f35e
Merge branch 'main' into fix-quad-utils-interp
hkershaw-brown Oct 31, 2025
01769c6
Replace exact equality fp check with tolerance-based comparison in qu…
hkershaw-brown Oct 31, 2025
5621a65
remove svn relics
hkershaw-brown Oct 31, 2025
21189e7
fix: round off message on all tasks, since it may occur on tasks othe…
hkershaw-brown Oct 31, 2025
fb98e2b
comment: remove bilinear interp comments, now idw
hkershaw-brown Oct 31, 2025
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
9 changes: 7 additions & 2 deletions build_templates/buildconvfunctions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ local modelsrc="$DART/models/template/model_mod.f90"
local loc="$DART/assimilation_code/location/$LOCATION \
$DART/assimilation_code/location/utilities/ \
$DART/models/model_mod_tools/test_interpolate_$LOCATION.f90"
local misc="$DART/models/utilities/ \
local misc="$DART/models/utilities/default_model_mod.f90 \
$DART/models/model_mod_tools/model_check_utilities_mod.f90 \
$DART/observations/forward_operators/obs_def_mod.f90 \
$DART//observations/forward_operators/obs_def_utilities_mod.f90 \
Expand Down Expand Up @@ -139,7 +139,12 @@ else #nompi
core=${core//$winf08/}
fi

convsrc="${core} ${conv} ${obserrsrc} ${modelsrc} ${misc} ${loc}"
quad=""
if [ "$LOCATION" == "threed_sphere" ]; then
quad="$DART/models/utilities/quad_utils_mod.f90"
fi

convsrc="${core} ${conv} ${obserrsrc} ${modelsrc} ${misc} ${loc} ${quad}"

# remove nuisance files
nuisance=(\
Expand Down
9 changes: 7 additions & 2 deletions build_templates/buildfunctions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ local loc="$DART/assimilation_code/location/$LOCATION \
$DART/assimilation_code/location/utilities/ \
$DART/models/model_mod_tools/test_interpolate_$LOCATION.f90"
local modelsrc=$(find $DART/models/$MODEL -type d -name $EXCLUDE -prune -o -type f -name "*.f90" -print)
local misc="$DART/models/utilities/ \
local misc="$DART/models/utilities/default_model_mod.f90 \
$DART/models/model_mod_tools/model_check_utilities_mod.f90 \
$DART/observations/forward_operators/obs_def_mod.f90 \
$DART//observations/forward_operators/obs_def_utilities_mod.f90 \
Expand Down Expand Up @@ -189,7 +189,12 @@ else #nompi
core=${core//$winf08/}
fi

dartsrc="${core} ${modelsrc} ${loc} ${misc}"
quad=""
if [ "$LOCATION" == "threed_sphere" ]; then
quad="$DART/models/utilities/quad_utils_mod.f90"
fi

dartsrc="${core} ${modelsrc} ${loc} ${misc} ${quad}"

# remove model specific programs from source list
all_modprogs=("${model_programs[@]}" "${model_serial_programs[@]}")
Expand Down
Loading