Skip to content

Radaer seg #191

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

Radaer seg #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9f2238f
41 : Fix addressing bug in radaer aerosol AOD
alanjhewitt Dec 16, 2025
e8c8f31
41 : Add AOD to rose-stem diagnostics
alanjhewitt Dec 16, 2025
8f8d3c8
Merge branch 'MetOffice:main' into AOD_bug
alanjhewitt Jan 7, 2026
1793ba1
Add my name to contributors list
alanjhewitt Jan 7, 2026
853e075
Merge branch 'main' into AOD_bug
cameronbateman-mo Jan 27, 2026
bba324f
Merge branch 'main' into AOD_bug
cameronbateman-mo Jan 28, 2026
7d9b4a3
Pull request 94 - Added space character
alanjhewitt Jan 28, 2026
601853c
pull request 94 - lets see if i have a verifed commit
alanjhewitt Jan 28, 2026
eb14c56
Pull request 94 - now with a signing key
alanjhewitt Jan 28, 2026
6bc9b7f
Issue 67 - merge in changes from fcm ticket 1037 lfric_apps side
alanjhewitt Jan 28, 2026
3127f8a
Issue 189 - I think this adds the bug fix from pull request 94
alanjhewitt Jan 28, 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
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 @@ -16,3 +16,4 @@
| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 |
| jasonjunweilyu | Junwei (Jason) Lyu | Bureau of Meteorology, Australia | 2025-12-17 |
| EdHone | Ed Hone | Met Office | 2026-01-26 |
| alanjhewitt | Alan J Hewitt | Met Office | 2026-01-28 |
1 change: 1 addition & 0 deletions build/extract/extract.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ ukca:
- src/science/radaer/spcrg3a_mod.F90
- src/science/radaer/ukca_radaer_band_average.F90
- src/science/radaer/ukca_radaer_compute_aod.F90
- src/science/radaer/ukca_radaer_lfric_mod.F90
- src/science/radaer/ukca_radaer_lut_mod.F90
- src/science/radaer/ukca_radaer_populate_lut_mod.F90
- src/science/radaer/ukca_radaer_precalc_mod.F90
Expand Down
2 changes: 2 additions & 0 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ socrates-spectral:
ukca:
source: git@github.com:MetOffice/ukca.git
ref: 2025.12.1

#gotta point at ukca branch
110 changes: 64 additions & 46 deletions interfaces/physics_schemes_interface/source/algorithm/radaer_alg_mod.x90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ module radaer_alg_mod
! Derived Types
use field_mod, only: field_type
use integer_field_mod, only: integer_field_type
use field_collection_mod, &
use field_collection_mod, &
only: field_collection_type
use function_space_mod, only: function_space_type
use function_space_collection_mod, &
use function_space_collection_mod, &
only: function_space_collection
use socrates_init_mod, only: n_sw_band, n_lw_band
use io_config_mod, only: use_xios_io, &
use io_config_mod, only: use_xios_io, &
write_diag
use timing_mod, only: start_timing, stop_timing, tik, LPROF
use constants_mod, only: i_def, l_def
use radiation_config_mod, &
use radiation_config_mod, &
only: n_radstep
use aerosol_config_mod, only: n_radaer_step
use mesh_mod, only: mesh_type
use multires_coupling_config_mod, &
only: lowest_order_aero_flag, &
use multires_coupling_config_mod, &
only: lowest_order_aero_flag, &
coarse_rad_aerosol
use multidata_field_dimensions_mod, &
use multidata_field_dimensions_mod, &
only: get_ndata_val => get_multidata_field_dimension
use fs_continuity_mod, only: Wtheta, W3
use intermesh_mappings_alg_mod, &
only: map_scalar_intermesh, &
use intermesh_mappings_alg_mod, &
only: map_scalar_intermesh, &
map_mr_intermesh

use radaer_main_diags_mod, only: initialise_main_diags_for_radaer, &
Expand Down Expand Up @@ -75,6 +75,7 @@ contains
timestep )

use radaer_kernel_mod, only: radaer_kernel_type
use um_sizes_init_mod, only: um_sizes_init

implicit none

Expand All @@ -92,6 +93,7 @@ contains
type(mesh_type), intent( in ), pointer :: aerosol_mesh
type(mesh_type), intent( in ), pointer :: aerosol_twod_mesh
integer( kind=i_def ), intent( in ) :: timestep
integer( kind=i_def ) :: ncells

type(function_space_type), pointer :: w3_2d_aero => null()
type(function_space_type), pointer :: wth_aero => null()
Expand Down Expand Up @@ -179,17 +181,17 @@ contains
type( field_type ), pointer :: n_cor_ins_aero => null()
type( field_type ), pointer :: cor_ins_du_aero => null()

type( field_type ), target :: lit_fraction_rts_coarse, &
aer_mix_ratio_coarse, &
aer_sw_absorption_coarse, &
aer_sw_scattering_coarse, &
aer_sw_asymmetry_coarse, &
aer_lw_absorption_coarse, &
aer_lw_scattering_coarse, &
aer_lw_asymmetry_coarse, &
n_acc_ins_coarse, &
acc_ins_du_coarse, &
n_cor_ins_coarse, &
type( field_type ), target :: lit_fraction_rts_coarse, &
aer_mix_ratio_coarse, &
aer_sw_absorption_coarse, &
aer_sw_scattering_coarse, &
aer_sw_asymmetry_coarse, &
aer_lw_absorption_coarse, &
aer_lw_scattering_coarse, &
aer_lw_asymmetry_coarse, &
n_acc_ins_coarse, &
acc_ins_du_coarse, &
n_cor_ins_coarse, &
cor_ins_du_coarse

type( field_type ) :: aod_ukca_ait_sol
Expand Down Expand Up @@ -276,10 +278,11 @@ contains
call radiation_fields%get_field('aer_lw_absorption', aer_lw_absorption)
call radiation_fields%get_field('aer_lw_scattering', aer_lw_scattering)
call radiation_fields%get_field('aer_lw_asymmetry', aer_lw_asymmetry)
! If coarse RADAER, initialise new coarse fields, map data, and point to them
! If coarse RADAER, initialise new coarse fields, map data, and
! point to them
w3_2d_aero => function_space_collection%get_fs( aerosol_twod_mesh, &
0, 0, W3)
wth_aero => function_space_collection%get_fs( aerosol_mesh, &
wth_aero => function_space_collection%get_fs( aerosol_mesh, &
0, 0, WTHETA )
call cor_ins_du_coarse%initialise(vector_space = wth_aero)
call acc_ins_du_coarse%initialise(vector_space = wth_aero)
Expand All @@ -290,35 +293,38 @@ contains
call aerosol_fields%get_field('n_cor_ins', n_cor_ins)
call aerosol_fields%get_field('cor_ins_du', cor_ins_du)

wth_aero => function_space_collection%get_fs( aerosol_mesh, &
0, 0, WTHETA, &
get_ndata_val('aero_modes') )
wth_aero => function_space_collection%get_fs( &
aerosol_mesh, &
0, 0, WTHETA, &
get_ndata_val('aero_modes') )
call aer_mix_ratio_coarse%initialise(vector_space = wth_aero)

wth_aero => function_space_collection%get_fs( aerosol_mesh, &
0, 0, WTHETA, &
get_ndata_val('sw_bands_aero_modes') )
wth_aero => function_space_collection%get_fs( &
aerosol_mesh, &
0, 0, WTHETA, &
get_ndata_val('sw_bands_aero_modes') )
call aer_sw_absorption_coarse%initialise(vector_space = wth_aero)
call aer_sw_scattering_coarse%initialise(vector_space = wth_aero)
call aer_sw_asymmetry_coarse%initialise(vector_space = wth_aero)

wth_aero => function_space_collection%get_fs( aerosol_mesh, &
0, 0, WTHETA, &
get_ndata_val('lw_bands_aero_modes') )
wth_aero => function_space_collection%get_fs( &
aerosol_mesh, &
0, 0, WTHETA, &
get_ndata_val('lw_bands_aero_modes') )
call aer_lw_absorption_coarse%initialise(vector_space = wth_aero)
call aer_lw_scattering_coarse%initialise(vector_space = wth_aero)
call aer_lw_asymmetry_coarse%initialise(vector_space = wth_aero)

call lit_fraction_rts_coarse%initialise(vector_space = w3_2d_aero)

call invoke(setval_c(lit_fraction_rts_coarse, 1.0_r_def), &
setval_c(aer_mix_ratio_coarse, 0.0_r_def), &
setval_c(aer_sw_absorption_coarse, 0.0_r_def), &
setval_c(aer_sw_scattering_coarse, 0.0_r_def), &
setval_c(aer_sw_asymmetry_coarse, 0.0_r_def), &
setval_c(aer_lw_absorption_coarse, 0.0_r_def), &
setval_c( aer_lw_scattering_coarse, 0.0_r_def), &
setval_c( aer_lw_asymmetry_coarse, 0.0_r_def) )
call invoke(setval_c(lit_fraction_rts_coarse, 1.0_r_def), &
setval_c(aer_mix_ratio_coarse, 0.0_r_def), &
setval_c(aer_sw_absorption_coarse, 0.0_r_def), &
setval_c(aer_sw_scattering_coarse, 0.0_r_def), &
setval_c(aer_sw_asymmetry_coarse, 0.0_r_def), &
setval_c(aer_lw_absorption_coarse, 0.0_r_def), &
setval_c( aer_lw_scattering_coarse, 0.0_r_def), &
setval_c( aer_lw_asymmetry_coarse, 0.0_r_def) )

call map_scalar_intermesh(lit_fraction_rts_coarse, lit_fraction_rts)
call map_mr_intermesh(n_acc_ins_coarse, n_acc_ins, rho_aero, rho)
Expand All @@ -341,14 +347,21 @@ contains
cor_ins_du_aero => cor_ins_du_coarse
else
! Unpack RADAER fields for radiation
call radiation_fields%get_field('lit_fraction_rts', lit_fraction_rts_aero)
call radiation_fields%get_field('lit_fraction_rts', &
lit_fraction_rts_aero)
call radiation_fields%get_field('aer_mix_ratio', aer_mix_ratio_aero)
call radiation_fields%get_field('aer_sw_absorption', aer_sw_absorption_aero)
call radiation_fields%get_field('aer_sw_scattering', aer_sw_scattering_aero)
call radiation_fields%get_field('aer_sw_asymmetry', aer_sw_asymmetry_aero)
call radiation_fields%get_field('aer_lw_absorption', aer_lw_absorption_aero)
call radiation_fields%get_field('aer_lw_scattering', aer_lw_scattering_aero)
call radiation_fields%get_field('aer_lw_asymmetry', aer_lw_asymmetry_aero)
call radiation_fields%get_field('aer_sw_absorption', &
aer_sw_absorption_aero)
call radiation_fields%get_field('aer_sw_scattering', &
aer_sw_scattering_aero)
call radiation_fields%get_field('aer_sw_asymmetry', &
aer_sw_asymmetry_aero)
call radiation_fields%get_field('aer_lw_absorption', &
aer_lw_absorption_aero)
call radiation_fields%get_field('aer_lw_scattering', &
aer_lw_scattering_aero)
call radiation_fields%get_field('aer_lw_asymmetry', &
aer_lw_asymmetry_aero)

! Unpack RADAER fields for aerosol
call aerosol_fields%get_field('n_acc_ins', n_acc_ins_aero)
Expand All @@ -372,6 +385,9 @@ contains
aaod_ukca_cor_ins, &
trop_level )

ncells = mesh%get_last_edge_cell()
call um_sizes_init(ncells)

call invoke( radaer_kernel_type( theta_in_wth, &
exner_in_wth, &
exner_in_w3, &
Expand Down Expand Up @@ -453,6 +469,8 @@ contains
aod_ukca_cor_ins, &
aaod_ukca_cor_ins ) )

call um_sizes_init(1_i_def)

if ( coarse_rad_aerosol ) then
call map_scalar_intermesh( aer_mix_ratio, aer_mix_ratio_aero, &
source_mask=lit_fraction_rts_aero, &
Expand Down
Loading
Loading