Skip to content

Higher-order Orography #180

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

Draft
tommbendall wants to merge 43 commits into
base: main
Choose a base branch
from
Draft

Higher-order Orography #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c7f4f88
implement changes to output heights at W2H and W0
tommbendall Jan 20, 2026
03640d9
implement ability to write out initial height fields
tommbendall Jan 20, 2026
2088318
pick up changes from heights_more branch
tommbendall Jan 20, 2026
078ccec
Fix fringe cases, and use a loop to simplify code
tommbendall Jan 20, 2026
8b4facd
Implement change to calculation of required stencil depth
tommbendall Jan 22, 2026
c02b717
hopefully fix issues and copy over KGOs
tommbendall Jan 22, 2026
7746a86
hopefully final fixes
tommbendall Jan 22, 2026
a398b2b
update all nml files and unit-tests
tommbendall Jan 22, 2026
69c5df4
deploy upgrade macro
tommbendall Jan 22, 2026
487faa6
keep Wchi for bubble tests
tommbendall Jan 22, 2026
f1d1cc5
these weren't picked up by upgrade macro
tommbendall Jan 22, 2026
3241a6b
fixes to solver and scintelapi
tommbendall Jan 23, 2026
bccbce2
remove workaround for vertical slice tests
tommbendall Jan 23, 2026
56ab18d
another contributor signing
tommbendall Jan 23, 2026
e860c12
copy over files from FCM
tommbendall Jan 23, 2026
25904f0
set other apps to use Wtheta, and fix remaining failures
tommbendall Jan 25, 2026
f8abde9
change coordinate settings for planar tests with issues
tommbendall Jan 26, 2026
d922052
Merge in dev branch
tommbendall Jan 26, 2026
3c9048d
update KGOs
tommbendall Jan 26, 2026
cfc3f16
increase TLM tolerance
tommbendall Jan 26, 2026
5114771
Merge branch 'TBendall/CoordSpace' into TBendall/TestCoordSpace
tommbendall Jan 26, 2026
4a8d200
increase tolerance again
tommbendall Jan 26, 2026
90331fa
Merge branch 'TBendall/CoordSpace' into TBendall/TestCoordSpace
tommbendall Jan 26, 2026
1496a19
Merge branch 'TBendall/StencilDepths' into TBendall/OrogPkg
tommbendall Jan 26, 2026
21a3733
Merge branch 'TBendall/TestCoordSpace' of github.com:tommbendall/lfri…
tommbendall Jan 26, 2026
cb0159e
Merge branch 'TBendall/TestCoordSpace' into TBendall/OrogPkg
tommbendall Jan 26, 2026
0015b23
replace Wchi in kernels
tommbendall Jan 26, 2026
5cb2966
Merge branch 'TBendall/CoordSpace' into TBendall/TestCoordSpace
tommbendall Jan 26, 2026
adb8c4f
Merge branch 'TBendall/TestCoordSpace' into TBendall/OrogPkg
tommbendall Jan 26, 2026
9509020
Merge branch 'TBendall/OrogPkg' into TBendall/HighOrderOrog
tommbendall Jan 26, 2026
2b1b95a
implement upgrade macro, and revert changes to surface_altitude_alg
tommbendall Jan 26, 2026
9f92412
roll out namelist changes to example nml files
tommbendall Jan 26, 2026
27e9ce8
alignment
tommbendall Jan 26, 2026
7ade22a
test tweak
tommbendall Jan 27, 2026
af5911d
Merge branch 'TBendall/CoordSpace' into TBendall/TestCoordSpace
tommbendall Jan 27, 2026
2188ef7
Merge branch 'TBendall/TestCoordSpace' into TBendall/OrogPkg
tommbendall Jan 27, 2026
9d770bf
fix change to argument list
tommbendall Jan 27, 2026
e9c11a9
copy over KGOs
tommbendall Jan 27, 2026
40cc87b
Merge branch 'TBendall/HeightsMore' into TBendall/OrogPkg
tommbendall Jan 27, 2026
7a93e2b
Merge branch 'TBendall/TestCoordSpace' into TBendall/OrogPkg
tommbendall Jan 27, 2026
590fe14
Merge branch 'TBendall/StencilDepths' into TBendall/OrogPkg
tommbendall Jan 27, 2026
bde49d0
Merge branch 'TBendall/OrogPkg' into TBendall/HighOrderOrog
tommbendall Jan 27, 2026
d111a2c
extended mesh can't use quadratic coords
tommbendall Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
| james-bruten-mo | James Bruten | Met Office | 2025-12-09 |
| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 |
| mo-marqh | mark Hedley | Met Office | 2025-12-11 |
| tommbendall | Thomas Bendall | Met Office | 2025-01-20 |
9 changes: 6 additions & 3 deletions applications/adjoint_tests/example/configuration.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ start_dump_filename='',
/
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order=2,
coord_order_multigrid=1,
coord_space='Wchi',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down Expand Up @@ -120,9 +122,7 @@ init_option='analytic',
lbc_option='none',
ls_option='analytic',
model_eos_height=100,
n_orog_smooth=0,
read_w2h_wind=.false.,
w0_orography_mapping=.false.,
zero_w2v_wind=.false.,
/
&initial_density
Expand Down Expand Up @@ -212,6 +212,9 @@ l_esm_couple_test=.false.,
/
&orography
orog_init_option='ancil',
orography_order=2,
n_orog_smooth=0,
w0_multigrid_mapping=.true.
/
&partitioning
panel_decomposition='auto',
Expand Down
23 changes: 23 additions & 0 deletions applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,26 @@ def upgrade(self, config, meta_config=None):
# Add settings
return config, self.reports
"""


class vn30_t238(MacroUpgrade):
"""Upgrade macro for ticket #238 by Thomas Bendall."""

BEFORE_TAG = "vn3.0"
AFTER_TAG = "vn3.0_t238"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-driver
self.add_setting(
config, ["namelist:finite_element", "coord_space"], "'Wchi'"
)
coord_order = self.get_setting_value(
config, ["namelist:finite_element", "coord_order"]
)
self.add_setting(
config,
["namelist:finite_element", "coord_order_multigrid"],
coord_order,
)

return config, self.reports
1 change: 0 additions & 1 deletion ...ations/adjoint_tests/source/algorithm/transport/mol/adjt_reconstruct_w3_field_alg_mod.x90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ module adjt_reconstruct_w3_field_alg_mod
use function_space_collection_mod, only : function_space_collection
use transport_metadata_collection_mod, only : transport_metadata_collection
use transport_metadata_mod, only : transport_metadata_type
use check_configuration_mod, only : get_required_stencil_depth

implicit none

Expand Down
2 changes: 2 additions & 0 deletions applications/gravity_wave/example/configuration.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ start_dump_filename = ''
&finite_element
cellshape = 'quadrilateral'
coord_order = 1
coord_order_multigrid = 1,
coord_space = 'Wchi',
coord_system = 'native'
element_order_h = 0
element_order_v = 0
Expand Down
23 changes: 23 additions & 0 deletions applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,26 @@ def upgrade(self, config, meta_config=None):
# Add settings
return config, self.reports
"""


class vn30_t238(MacroUpgrade):
"""Upgrade macro for ticket #238 by Thomas Bendall."""

BEFORE_TAG = "vn3.0"
AFTER_TAG = "vn3.0_t238"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-driver
self.add_setting(
config, ["namelist:finite_element", "coord_space"], "'Wchi'"
)
coord_order = self.get_setting_value(
config, ["namelist:finite_element", "coord_order"]
)
self.add_setting(
config,
["namelist:finite_element", "coord_order_multigrid"],
coord_order,
)

return config, self.reports
9 changes: 6 additions & 3 deletions applications/gravity_wave/source/driver/gravity_wave_infrastructure_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module gravity_wave_infrastructure_mod

use add_mesh_map_mod, only : assign_mesh_maps
use driver_modeldb_mod, only : modeldb_type
use check_configuration_mod, only : get_required_stencil_depth
use constants_mod, only : i_def, &
PRECISION_REAL, &
r_def, r_second, &
Expand Down Expand Up @@ -81,7 +80,8 @@ subroutine initialise_infrastructure( program_name, &
logical(l_def) :: prepartitioned
logical :: apply_partition_check

integer(i_def) :: stencil_depth
integer(i_def) :: stencil_depth(1)

integer(i_def) :: geometry
integer(i_def) :: method
integer(i_def) :: number_of_layers
Expand Down Expand Up @@ -191,7 +191,7 @@ subroutine initialise_infrastructure( program_name, &
!=======================================================================
! 1.3 Initialise mesh objects and assign InterGrid maps
!=======================================================================
stencil_depth = get_required_stencil_depth()
stencil_depth = 2
apply_partition_check = .false.
if ( .not. prepartitioned .and. l_multigrid ) then
apply_partition_check = .true.
Expand Down Expand Up @@ -237,6 +237,9 @@ subroutine initialise_infrastructure( program_name, &

nullify(chi_inventory, panel_id_inventory)
deallocate(base_mesh_names)
deallocate(twod_names)
deallocate(extrusion)
deallocate(extrusion_2d)

end subroutine initialise_infrastructure

Expand Down
4 changes: 3 additions & 1 deletion applications/gravity_wave/unit-test/kernel/compute_q_operator_kernel_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ contains
subroutine setUp( this )

use finite_element_config_mod, only: cellshape_quadrilateral, &
coord_system_xyz
coord_system_xyz, coord_space_wchi
use feign_config_mod, only: feign_finite_element_config

implicit none
Expand All @@ -42,6 +42,8 @@ contains
cellshape=cellshape_quadrilateral, &
coord_order=0_i_def, &
coord_system=coord_system_xyz, &
coord_order_multigrid=1_i_def, &
coord_space=coord_space_wchi, &
element_order_h=1_i_def, &
element_order_v=1_i_def, &
rehabilitate=.true., &
Expand Down
4 changes: 3 additions & 1 deletion applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ contains
stretching_method_linear
use sci_chi_transform_mod, only : init_chi_transforms
use finite_element_config_mod, only : cellshape_quadrilateral, &
coord_system_xyz
coord_system_xyz, coord_space_wchi
use feign_config_mod, only : feign_base_mesh_config, &
feign_extrusion_config, &
feign_finite_element_config, &
Expand Down Expand Up @@ -60,6 +60,8 @@ contains
call feign_finite_element_config( &
cellshape=cellshape_quadrilateral, &
coord_order=0_i_def, &
coord_order_multigrid=1_i_def, &
coord_space=coord_space_wchi, &
coord_system=coord_system_xyz, &
element_order_h=0_i_def, &
element_order_v=0_i_def, &
Expand Down
9 changes: 6 additions & 3 deletions applications/gungho_model/example/configuration.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ start_dump_filename='',
/
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order=2,
coord_order_multigrid=1,
coord_space='Wtheta',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down Expand Up @@ -113,11 +115,9 @@ coarse_ozone_ancil=.false.,
init_option='analytic',
lbc_option='none',
ls_option='none',
n_orog_smooth=0,
read_w2h_wind=.false.,
sea_ice_source='ancillary',
snow_source='start_dump',
w0_orography_mapping=.false.,
zero_w2v_wind=.false.,
/
&initial_density
Expand Down Expand Up @@ -211,6 +211,9 @@ l_esm_couple_test=.false.,
/
&orography
orog_init_option='none',
orography_order=2,
n_orog_smooth=0,
w0_multigrid_mapping=.true.
/
&partitioning
panel_decomposition='auto',
Expand Down
2 changes: 2 additions & 0 deletions applications/gungho_model/example/file_def_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<field field_ref="init_exner"/>
<field field_ref="init_height_w3"/>
<field field_ref="init_height_wth"/>
<field field_ref="init_height_w2h"/>
<field field_ref="init_height_w0"/>
</field_group>
</file>

Expand Down
2 changes: 2 additions & 0 deletions applications/gungho_model/lam_example/baroclinic/config_driver.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ lbc_filename='',
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order_multigrid=1,
coord_space='Wtheta',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down
2 changes: 2 additions & 0 deletions applications/gungho_model/lam_example/baroclinic/config_lam.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ lbc_filename='lbc',
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order_multigrid=1,
coord_space='Wtheta',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down
2 changes: 2 additions & 0 deletions applications/gungho_model/lam_example/straka/config_driver.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ lbc_filename='',
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order_multigrid=1,
coord_space='Wtheta',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down
2 changes: 2 additions & 0 deletions applications/gungho_model/lam_example/straka/config_lam.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ lbc_filename='lbc',
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order_multigrid=1,
coord_space='Wtheta',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down
23 changes: 23 additions & 0 deletions applications/gungho_model/rose-meta/lfric-gungho_model/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,26 @@ def upgrade(self, config, meta_config=None):
# Add settings
return config, self.reports
"""


class vn30_t238(MacroUpgrade):
"""Upgrade macro for ticket #238 by Thomas Bendall."""

BEFORE_TAG = "vn3.0"
AFTER_TAG = "vn3.0_t238"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-driver
self.add_setting(
config, ["namelist:finite_element", "coord_space"], "'Wchi'"
)
coord_order = self.get_setting_value(
config, ["namelist:finite_element", "coord_order"]
)
self.add_setting(
config,
["namelist:finite_element", "coord_order_multigrid"],
coord_order,
)

return config, self.reports
9 changes: 6 additions & 3 deletions applications/jedi_lfric_tests/example/configuration.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ start_dump_filename='final_pert',
/
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order=2,
coord_system='native',
coord_order_multigrid=1,
coord_space='Wchi',
element_order_h=0,
element_order_v=0,
rehabilitate=.true.,
Expand Down Expand Up @@ -134,11 +136,9 @@ init_option='fd_start_dump',
lbc_option='none',
ls_option='file',
model_eos_height=100,
n_orog_smooth=0,
read_w2h_wind=.true.,
sea_ice_source='ancillary',
snow_source='start_dump',
w0_orography_mapping=.false.,
zero_w2v_wind=.false.,
/
&initial_density
Expand Down Expand Up @@ -229,6 +229,9 @@ l_esm_couple_test=.false.,
/
&orography
orog_init_option='ancil',
orography_order=2,
n_orog_smooth=0,
w0_multigrid_mapping=.true.
/
&partitioning
panel_decomposition='auto',
Expand Down
9 changes: 6 additions & 3 deletions applications/jedi_lfric_tests/example_forecast/configuration.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ start_dump_filename='',
/
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order=2,
coord_order_multigrid=1,
coord_space='Wchi',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down Expand Up @@ -144,11 +146,9 @@ coarse_ozone_ancil=.false.,
init_option='analytic',
lbc_option='none',
ls_option='none',
n_orog_smooth=0,
read_w2h_wind=.false.,
sea_ice_source='ancillary',
snow_source='start_dump',
w0_orography_mapping=.false.,
zero_w2v_wind=.false.,
/
&initial_density
Expand Down Expand Up @@ -232,6 +232,9 @@ l_esm_couple_test=.false.,
/
&orography
orog_init_option='none',
orography_order=2,
n_orog_smooth=0,
w0_multigrid_mapping=.true.
/
&partitioning
panel_decomposition='auto',
Expand Down
2 changes: 2 additions & 0 deletions applications/jedi_lfric_tests/example_forecast_pseudo/configuration.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ stretching_method='smooth',
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order_multigrid=1,
coord_space='Wchi',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down
2 changes: 2 additions & 0 deletions applications/jedi_lfric_tests/example_forecast_pseudo/configuration_op.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ stretching_method='smooth',
&finite_element
cellshape='quadrilateral',
coord_order=1,
coord_order_multigrid=1,
coord_space='Wchi',
coord_system='native',
element_order_h=0,
element_order_v=0,
Expand Down
Loading