Skip to content

Refactor fast physics #368

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
iboutle wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Refactor fast physics #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1119668
first go at du_conv
iboutle Feb 6, 2026
df48745
copy changes to vn3 branch
james-bruten-mo Feb 6, 2026
1d2ae90
fix for runs without convection
iboutle Feb 6, 2026
8c65135
remove makefile additions
james-bruten-mo Feb 6, 2026
4b6de2a
move w3 wind predictors into conv
iboutle Feb 6, 2026
0ee0add
add 2nd call to bl_imp
iboutle Feb 9, 2026
f5200be
moving increments out of BL with KGO update
iboutle Feb 23, 2026
80db974
tidy up code, no kgo change
iboutle Feb 25, 2026
3586ade
missed diag file
iboutle Feb 25, 2026
a621e1a
with updating variables, all working
iboutle Mar 2, 2026
061e66a
add slow physics, still working
iboutle Mar 3, 2026
f3bccdb
add option for llcs first outer
iboutle Mar 3, 2026
ba6278e
change how increments are calculated in fast physics - kgo changing
iboutle Mar 3, 2026
e4e063a
kgo update
iboutle Mar 3, 2026
435acdb
fix to evap_condense
iboutle Mar 13, 2026
f5b30ab
move diagnostics
iboutle Mar 13, 2026
5d7f331
test suite update
iboutle Mar 13, 2026
d8af7e2
Merge branch 'stable' into fast_refactor
iboutle Mar 13, 2026
804d43f
update contributors file
iboutle Mar 13, 2026
2bada71
update kgos and fix ngarch app
iboutle Mar 17, 2026
1a710c6
add upgrade macro
iboutle Mar 17, 2026
8bd8a23
science reveiew comments
iboutle Mar 30, 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
3 changes: 2 additions & 1 deletion CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@
| thomasmelvin | Thomas Melvin | Met Office | 2026-01-15 |
| tinyendian | Wolfgang Hayek | Earth Sciences New Zealand | 2026-02-02 |
| DanStoneMO | Daniel Stone | Met Office | 2026-02-26 |
| ericaneininger | Erica Neininger | Met Office | 2026-03-02 |
| ericaneininger | Erica Neininger | Met Office | 2026-03-02 |
| iboutle | Ian Boutle | Met Office | 2026-03-13 |
2 changes: 1 addition & 1 deletion applications/lfric_atm/metadata/field_def_diags.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@
<field id="soil__soil_moist_crit" name="soil_moist_crit" long_name="soil_moisture_at_critical_point" unit="m3 m-3" domain_ref="face" />
<field id="soil__soil_moist_sat" name="soil_moist_sat" long_name="soil_moisture_at_saturation" unit="m3 m-3" domain_ref="face" />
<!-- Boundary layer turbulence diagnostics -->
<field id="turbulence__dtheta_blcnv" name="dtheta_blcnv" long_name="potential_temperature_increment_from_bl_and_convection_schemes" unit="K" grid_ref="full_level_face_grid" />
<field id="turbulence__dtheta_bl" name="dtheta_bl" long_name="potential_temperature_increment_from_bl_scheme" unit="K" grid_ref="full_level_face_grid" />
<field id="turbulence__dt_bl" name="dt_bl" long_name="temperature_increment_from_bl_scheme" unit="K" grid_ref="full_level_face_grid" />
<field id="turbulence__dmv_bl" name="dmv_bl" long_name="vapour_increment_from_bl_scheme" unit="kg kg-1" grid_ref="full_level_face_grid" />
<field id="turbulence__dmcl_bl" name="dmcl_bl" long_name="liquid_water_increment_from_bl_scheme" unit="kg kg-1" grid_ref="full_level_face_grid" />
Expand Down
28 changes: 17 additions & 11 deletions applications/ngarch/source/algorithm/boundary_layer_timestep_mod.x90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,18 @@ contains
class( boundary_layer_timestep_type ), intent(inout) :: self
type( modeldb_type ), intent(in), target :: modeldb

type( field_type ), pointer :: u, theta, rho, exner, u_physics, &
u_star, theta_star, u_physics_star
type( field_type ), pointer :: u, theta, rho, exner, u_physics
type( field_type ) :: mr_n(nummr), mr_after_slow(nummr), &
dmr_mphys(nummr), dtheta_bl, du_bl, &
theta_latest, u_latest, &
surf_heat_flux, canopy_evap, &
water_extraction, lake_evap, &
theta_star_surf, qv_star_surf, &
recip_l_mo_sea, rhostar, &
t1_sd_2d, q1_sd_2d
t1_sd_2d, q1_sd_2d, ustar_implicit, &
t1p5m, q1p5m, qcl1p5m, t1p5m_ssi, &
q1p5m_ssi, qcl1p5m_ssi, t1p5m_land, &
q1p5m_land, qcl1p5m_land
type( field_array_type ), pointer :: mr

type(field_collection_type), pointer :: prognostic_fields, &
Expand Down Expand Up @@ -106,13 +109,11 @@ contains
! Set up local fields
call u%copy_field_properties( du_bl )
call theta%copy_field_properties( dtheta_bl )
call u%copy_field_properties( u_latest )
call theta%copy_field_properties( theta_latest )

! Set star fields to their non star counterparts
call derived_fields%get_field( "u_star", u_star )
call derived_fields%get_field( "theta_star", theta_star )

call invoke( setval_X( u_star, u ), &
setval_X( theta_star, theta ))
call invoke( setval_X( u_latest, u ), &
setval_X( theta_latest, theta ))

! JULES needs to run for bl_exp
call jules_exp_alg( modeldb, theta, mr_n, &
Expand Down Expand Up @@ -140,12 +141,17 @@ contains
modeldb%clock )

call log_event( "Running BOUNDARY LAYER IMP", LOG_LEVEL_INFO )
call bl_imp_alg( dtheta_bl, du_bl, mr_after_slow, &
call bl_imp_alg( dtheta_bl, du_bl, theta_latest, &
u_latest, mr_after_slow, &
surf_heat_flux, canopy_evap, &
water_extraction, lake_evap, &
theta_star_surf, &
qv_star_surf, &
theta, exner, mr_n, rho, &
ustar_implicit, t1p5m, q1p5m, &
qcl1p5m, t1p5m_ssi, q1p5m_ssi, &
qcl1p5m_ssi, t1p5m_land, &
q1p5m_land, qcl1p5m_land, &
theta, exner, mr_n, &
derived_fields, &
radiation_fields, &
orography_fields, &
Expand Down
13 changes: 13 additions & 0 deletions interfaces/physics_schemes_interface/rose-meta/um-convection/HEAD/rose-meta.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,19 @@ help=In the convective diagnosis "cumulus test", use a revised
sort-key=Panel-01
type=logical

[namelist:convection=llcs_first_outer]
compulsory=true
description=Run LLCS scheme on first outer iteration
help=As the first outer iteration of the dynamics is only providing an
= approximate solution to the solver, we can speed the model up
= by running the (cheaper) Lambert-Lewis scheme on the first outer
= iteration, to give an approximate convection increment back to the
= dynamics. The full scheme is run on the final outer iteration to
= evolve the model state.
!kind=default
sort-key=Panel-01
type=logical

[namelist:convection=number_of_convection_substeps]
compulsory=true
description=Number of convection substeps per model time step
Expand Down
14 changes: 6 additions & 8 deletions interfaces/physics_schemes_interface/rose-meta/um-convection/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ def __repr__(self):
__str__ = __repr__


"""
Copy this template and complete to add your macro
class vn31_t368(MacroUpgrade):
# Upgrade macro for #368 by Ian Boutle

class vnXX_txxx(MacroUpgrade):
# Upgrade macro for <TICKET> by <Author>

BEFORE_TAG = "vnX.X"
AFTER_TAG = "vnX.X_txxx"
BEFORE_TAG = "vn3.1"
AFTER_TAG = "vn3.1_t368"

def upgrade(self, config, meta_config=None):
# Add settings
self.add_setting(config, ["namelist:convection","llcs_first_outer"],".false.")
return config, self.reports
"""

Loading
Loading