From 792f999c222893eaff51d00aadee4558857ffe89 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Thu, 16 Jul 2026 14:25:42 +0100 Subject: [PATCH 01/14] now working on stable --- build/extract/extract.yaml | 1 + dependencies.yaml | 4 +- .../source/kernel/radaer_kernel_mod.F90 | 1871 +++++++++-------- 3 files changed, 1027 insertions(+), 849 deletions(-) diff --git a/build/extract/extract.yaml b/build/extract/extract.yaml index d5fdeebee7..f206bd3b88 100644 --- a/build/extract/extract.yaml +++ b/build/extract/extract.yaml @@ -113,6 +113,7 @@ ukca: - src/control/core/top_level/ukca_iniasad.F90 - src/control/core/top_level/ukca_init.F90 - src/control/core/top_level/ukca_main1-ukca_main1.F90 + - src/control/core/top_level/ukca_radaer_lfric_api_mod.F90 - src/control/core/top_level/ukca_setup_mod.F90 - src/control/core/top_level/ukca_solang.F90 - src/control/core/top_level/ukca_step_control_mod.F90 diff --git a/dependencies.yaml b/dependencies.yaml index c1313e4d75..fec9be9038 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -50,5 +50,5 @@ socrates-spectral: ref: 2026.07.1 ukca: - source: git@github.com:MetOffice/ukca.git - ref: 2026.07.1 + source: git@github.com:alanjhewitt/ukca.git + ref: radaer_api_ukca_side_2 diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index c562073878..66471bbe5d 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -24,8 +24,12 @@ module radaer_kernel_mod use kernel_mod, only: kernel_type +use log_mod, only: log_event, log_scratch_space, LOG_LEVEL_ERROR + implicit none +private + !------------------------------------------------------------------------------- ! Public types !------------------------------------------------------------------------------- @@ -140,7 +144,7 @@ module radaer_kernel_mod integer :: operates_on = CELL_COLUMN contains procedure, nopass :: radaer_code -end type +end type radaer_kernel_type public :: radaer_code @@ -365,14 +369,12 @@ subroutine radaer_code( nlayers, & use nlsizes_namelist_mod, only: row_length, rows use ukca_mode_setup, only: nmodes, ncp_max, & - mode_nuc_sol, & mode_ait_sol, mode_acc_sol, & mode_cor_sol, mode_ait_insol, & mode_acc_insol, mode_cor_insol, & cp_su, cp_bc, cp_oc, & cp_cl, cp_du, cp_so, & cp_no3, cp_nn, cp_nh4, & - i_ukca_bc_tuned, & ip_ukca_mode_aitken, & ip_ukca_mode_accum, & ip_ukca_mode_coarse @@ -389,6 +391,8 @@ subroutine radaer_code( nlayers, & use ukca_option_mod, only: do_not_prescribe + use ukca_radaer_lfric_api_mod, only: ukca_radaer_lfric_interface + implicit none ! Arguments @@ -520,10 +524,6 @@ subroutine radaer_code( nlayers, & integer(i_um) :: npd_exclude_sw logical, parameter :: l_exclude_sw = .true. logical, parameter :: l_exclude_lw = .true. - integer(i_um), parameter :: ip_solar = 1 - integer(i_um), parameter :: ip_infra_red = 2 - - integer(i_um) :: npd_profile ! Prescribed single-scattering albedo dummy variables ! Make these namelist options later @@ -536,78 +536,42 @@ subroutine radaer_code( nlayers, & ! Loop counters integer(i_um) :: k, i, i_band, i_mode, i_rmode + integer(i_um) :: mm, m, n_fields, nn_fields + + ! Need to pass through argument list + integer(i_um) :: ncp_max_x_nmodes ! pressure on theta levels - real(r_um),dimension( row_length, rows, nlayers ) :: p_theta_levels + real(r_um),dimension( row_length, rows, nlayers ) :: p_theta_levels_um ! temperature on theta levels - real(r_um),dimension( row_length, rows, nlayers ) :: t_theta_levels + real(r_um),dimension( row_length, rows, nlayers ) :: t_theta_levels_um ! d_mass on theta levels real(r_um),dimension( row_length, rows, nlayers ) :: d_mass_theta_levels_um - real(r_um),dimension( n_ukca_cpnt, row_length*rows, nlayers ) :: & - ukca_comp_vol_um - - real(r_um),dimension( n_ukca_cpnt, row_length*rows, nlayers ) :: & - ukca_mix_ratio_um - - real(r_um),dimension( row_length*rows, nlayers, n_ukca_mode ) :: & - ukca_dry_diam_um - - real(r_um),dimension( row_length*rows, nlayers, n_ukca_mode ) :: & - ukca_wet_diam_um - - real(r_um),dimension( row_length*rows, nlayers, n_ukca_mode ) :: & - ukca_modal_nbr_um - - real(r_um),dimension( row_length*rows, nlayers, n_ukca_mode ) :: & - ukca_modal_number_um - - real(r_um),dimension( row_length*rows, nlayers, n_ukca_mode ) :: & - ukca_modal_rho_um - - real(r_um),dimension( row_length*rows, nlayers, n_ukca_mode ) :: & - ukca_modal_vol_um - - real(r_um),dimension( row_length*rows, nlayers, n_ukca_mode ) :: & - ukca_modal_wtv_um - - real(r_um),dimension( row_length*rows, nlayers, n_radaer_mode) :: & - ukca_mode_mix_ratio_um - - real(r_um),dimension( row_length*rows, nlayers, n_radaer_mode, n_lw_band) :: & - aer_lw_absorption_um - - real(r_um),dimension( row_length*rows, nlayers, n_radaer_mode, n_lw_band) :: & - aer_lw_scattering_um - - real(r_um),dimension( row_length*rows, nlayers, n_radaer_mode, n_lw_band) :: & - aer_lw_asymmetry_um - - real(r_um),dimension( row_length*rows, nlayers, n_radaer_mode, n_sw_band) :: & - aer_sw_absorption_um - - real(r_um),dimension( row_length*rows, nlayers, n_radaer_mode, n_sw_band) :: & - aer_sw_scattering_um - - real(r_um),dimension( row_length*rows, nlayers, n_radaer_mode, n_sw_band) :: & - aer_sw_asymmetry_um - - integer, parameter :: i_ukca_tune_bc = i_ukca_bc_tuned - integer, parameter :: i_glomap_clim_tune_bc = i_ukca_bc_tuned - logical, parameter :: l_nitrate = .false. ! Make this a namelist option later - logical, parameter :: l_sustrat = .true. ! Make this a namelist option later - ! l_sustrat=.true. for ga9 - logical, parameter :: l_cornarrow_ins = .false. - ! Make this a namelist option later - - integer(i_um) :: ncp_max_x_nmodes - integer(i_um) :: i_cpnt_index( ncp_max, nmodes ) - integer(i_um) :: i_cpnt_type( ncp_max * nmodes ) - integer(i_um) :: i_mode_type( nmodes ) - integer(i_um) :: n_cpnt_in_mode( nmodes ) - logical :: l_soluble( nmodes ) + ! Allocation of arrays + + real(r_um), allocatable :: ukca_comp_vol_um(:,:,:) + real(r_um), allocatable :: ukca_mix_ratio_um(:,:,:) + real(r_um), allocatable :: ukca_dry_diam_um(:,:,:) + real(r_um), allocatable :: ukca_wet_diam_um(:,:,:) + real(r_um), allocatable :: ukca_modal_nbr_um(:,:,:) + real(r_um), allocatable :: ukca_modal_rho_um(:,:,:) + real(r_um), allocatable :: ukca_modal_vol_um(:,:,:) + real(r_um), allocatable :: ukca_modal_wtv_um(:,:,:) + + real(r_um), allocatable :: ukca_mode_mix_ratio_um(:,:,:) + + real(r_um), allocatable :: aer_lw_absorption_um(:,:,:,:) + real(r_um), allocatable :: aer_lw_scattering_um(:,:,:,:) + real(r_um), allocatable :: aer_lw_asymmetry_um(:,:,:,:) + real(r_um), allocatable :: aer_sw_absorption_um(:,:,:,:) + real(r_um), allocatable :: aer_sw_scattering_um(:,:,:,:) + real(r_um), allocatable :: aer_sw_asymmetry_um(:,:,:,:) + real(r_um), allocatable :: aod_ukca_all_modes_um(:,:,:) + real(r_um), allocatable :: sod_ukca_all_modes_um(:,:,:) + real(r_um), allocatable :: aaod_ukca_all_modes_um(:,:,:) ! By convention, arrays are inverted in UM radiation code ! Since we are calling from LFRic, arrays will not be inverted @@ -621,11 +585,6 @@ subroutine radaer_code( nlayers, & !----------------------------------------------------------------------- - logical, parameter :: soluble_wanted = .true. - logical, parameter :: soluble_unwanted = .false. - - !----------------------------------------------------------------------- - ! UKCA modal optical depth diagnostics: full column real(r_um) :: aod_ukca_this_mode_um( row_length*rows, npd_ukca_aod_wavel ) ! Not yet included as diagnostic @@ -636,9 +595,143 @@ subroutine radaer_code( nlayers, & !----------------------------------------------------------------------- - ncp_max_x_nmodes = ncp_max * nmodes + logical :: l_aod_ukca_ait_sol + logical :: l_aaod_ukca_ait_sol + logical :: l_aod_ukca_acc_sol + logical :: l_aaod_ukca_acc_sol + logical :: l_aod_ukca_cor_sol + logical :: l_aaod_ukca_cor_sol + logical :: l_aod_ukca_ait_ins + logical :: l_aaod_ukca_ait_ins + logical :: l_aod_ukca_acc_ins + logical :: l_aaod_ukca_acc_ins + logical :: l_aod_ukca_cor_ins + logical :: l_aaod_ukca_cor_ins + logical :: l_any_lit_points_um + + !----------------------------------------------------------------------- - npd_profile = row_length * rows + integer, parameter :: max_fldname_len = 40 + + character(len=max_fldname_len), parameter, dimension(17) :: & + pvol_comp_names = [ 'fldname_pvol_su_ait_sol' , & + 'fldname_pvol_bc_ait_sol' , & + 'fldname_pvol_om_ait_sol' , & + 'fldname_pvol_su_acc_sol' , & + 'fldname_pvol_bc_acc_sol' , & + 'fldname_pvol_om_acc_sol' , & + 'fldname_pvol_ss_acc_sol' , & + 'fldname_pvol_du_acc_sol' , & + 'fldname_pvol_su_cor_sol' , & + 'fldname_pvol_bc_cor_sol' , & + 'fldname_pvol_om_cor_sol' , & + 'fldname_pvol_ss_cor_sol' , & + 'fldname_pvol_du_cor_sol' , & + 'fldname_pvol_bc_ait_ins' , & + 'fldname_pvol_om_ait_ins' , & + 'fldname_pvol_du_acc_ins' , & + 'fldname_pvol_du_cor_ins' ] + + character(len=max_fldname_len), parameter, dimension(17) :: & + comp_names = [ 'fldname_ait_sol_su' , & + 'fldname_ait_sol_bc' , & + 'fldname_ait_sol_om' , & + 'fldname_acc_sol_su' , & + 'fldname_acc_sol_bc' , & + 'fldname_acc_sol_om' , & + 'fldname_acc_sol_ss' , & + 'fldname_acc_sol_du' , & + 'fldname_cor_sol_su' , & + 'fldname_cor_sol_bc' , & + 'fldname_cor_sol_om' , & + 'fldname_cor_sol_ss' , & + 'fldname_cor_sol_du' , & + 'fldname_ait_ins_bc' , & + 'fldname_ait_ins_om' , & + 'fldname_acc_ins_du' , & + 'fldname_cor_ins_du' ] + + character(len=max_fldname_len), parameter, dimension(6) :: & + mode_names = [ 'fldname_n_ait_sol' , & + 'fldname_n_acc_sol' , & + 'fldname_n_cor_sol' , & + 'fldname_n_ait_ins' , & + 'fldname_n_acc_ins' , & + 'fldname_n_cor_ins' ] + + character(len=max_fldname_len), parameter, dimension(6) :: & + rhopar_mode_names = [ 'fldname_rhopar_ait_sol' , & + 'fldname_rhopar_acc_sol' , & + 'fldname_rhopar_cor_sol' , & + 'fldname_rhopar_ait_ins' , & + 'fldname_rhopar_acc_ins' , & + 'fldname_rhopar_cor_ins' ] + + character(len=max_fldname_len), parameter, dimension(6) :: & + dry_diam_mode_names = [ 'fldname_drydp_ait_sol' , & + 'fldname_drydp_acc_sol' , & + 'fldname_drydp_cor_sol' , & + 'fldname_drydp_ait_ins' , & + 'fldname_drydp_acc_ins' , & + 'fldname_drydp_cor_ins' ] + + character(len=max_fldname_len), parameter, dimension(6) :: & + modal_volume_names = [ 'fldname_mod_vol_ait_sol' , & + 'fldname_mod_vol_acc_sol' , & + 'fldname_mod_vol_cor_sol' , & + 'fldname_mod_vol_ait_ins' , & + 'fldname_mod_vol_acc_ins' , & + 'fldname_mod_vol_cor_ins' ] + + character(len=max_fldname_len), parameter, dimension(4) :: & + ait_sol_volume_names = [ 'pvol_wat_ait_sol' , & + 'pvol_su_ait_sol ' , & + 'pvol_bc_ait_sol ' , & + 'pvol_om_ait_sol ' ] + + character(len=max_fldname_len), parameter,dimension(5) :: & + acc_sol_volume_names = [ 'pvol_wat_acc_sol' , & + 'pvol_su_acc_sol ' , & + 'pvol_bc_acc_sol ' , & + 'pvol_om_acc_sol ' , & + 'pvol_ss_acc_sol ' ] + + character(len=max_fldname_len), parameter,dimension(5) :: & + cor_sol_volume_names = [ 'pvol_wat_cor_sol' , & + 'pvol_su_cor_sol ' , & + 'pvol_bc_cor_sol ' , & + 'pvol_om_cor_sol ' , & + 'pvol_ss_cor_sol ' ] + + character(len=max_fldname_len), parameter,dimension(2) :: & + ait_ins_volume_names = [ 'pvol_bc_ait_ins' , & + 'pvol_om_ait_ins' ] + + character(len=max_fldname_len), parameter, dimension(1) :: & + acc_ins_volume_names = [ 'pvol_du_acc_ins' ] + + character(len=max_fldname_len), parameter, dimension(1) :: & + cor_ins_volume_names = [ 'pvol_du_cor_ins' ] + + character(len=max_fldname_len), parameter, dimension(6) :: & + modal_wtv_names = [ 'fldname_pvol_wat_ait_sol' , & + 'fldname_pvol_wat_acc_sol' , & + 'fldname_pvol_wat_cor_sol' , & + 'fldname_pvol_wat_ait_ins' , & + 'fldname_pvol_wat_acc_ins' , & + 'fldname_pvol_wat_cor_ins' ] + + character(len=max_fldname_len), parameter, dimension(6) :: & + wet_diam_mode_names = [ 'fldname_wetdp_ait_sol' , & + 'fldname_wetdp_acc_sol' , & + 'fldname_wetdp_cor_sol' , & + 'fldname_wetdp_ait_ins' , & + 'fldname_wetdp_acc_ins' , & + 'fldname_wetdp_cor_ins' ] + + !----------------------------------------------------------------------- + + ncp_max_x_nmodes = ncp_max * nmodes npd_exclude_lw = SIZE( lw_index_exclude, 1 ) npd_exclude_sw = SIZE( sw_index_exclude, 1 ) @@ -650,394 +743,681 @@ subroutine radaer_code( nlayers, & !----------------------------------------------------------------------- ! Populate ukca_radaer element arrays ! Note that nucleation mode gets ignored in some of these + + l_aod_ukca_ait_sol = ( .not. associated( aod_ukca_ait_sol, empty_real_data )) + l_aaod_ukca_ait_sol= ( .not. associated(aaod_ukca_ait_sol, empty_real_data )) + l_aod_ukca_acc_sol = ( .not. associated( aod_ukca_acc_sol, empty_real_data )) + l_aaod_ukca_acc_sol= ( .not. associated(aaod_ukca_acc_sol, empty_real_data )) + l_aod_ukca_cor_sol = ( .not. associated( aod_ukca_cor_sol, empty_real_data )) + l_aaod_ukca_cor_sol= ( .not. associated(aaod_ukca_cor_sol, empty_real_data )) + l_aod_ukca_ait_ins = ( .not. associated( aod_ukca_ait_ins, empty_real_data )) + l_aaod_ukca_ait_ins= ( .not. associated(aaod_ukca_ait_ins, empty_real_data )) + l_aod_ukca_acc_ins = ( .not. associated( aod_ukca_acc_ins, empty_real_data )) + l_aaod_ukca_acc_ins= ( .not. associated(aaod_ukca_acc_ins, empty_real_data )) + l_aod_ukca_cor_ins = ( .not. associated( aod_ukca_cor_ins, empty_real_data )) + l_aaod_ukca_cor_ins= ( .not. associated(aaod_ukca_cor_ins, empty_real_data )) + + !----------------------------------------------------------------------- + ! Allocation of arrays + + allocate( ukca_mode_mix_ratio_um( 1, nlayers, n_radaer_mode ) ) + allocate( aer_lw_absorption_um( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_lw_scattering_um( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_lw_asymmetry_um( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_sw_absorption_um( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aer_sw_scattering_um( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aer_sw_asymmetry_um( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aod_ukca_all_modes_um( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) + allocate( sod_ukca_all_modes_um( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) + allocate( aaod_ukca_all_modes_um( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) + + !----------------------------------------------------------------------- + ! Segmentation and openmp would start here !----------------------------------------------------------------------- - ! No nucleation mode - l_soluble(1:nmodes) = (/.true., .true., .true., .false., & - .false.,.false.,.false.,.false./) - - ! No nucleation mode - n_cpnt_in_mode(1:nmodes) = (/ 3, 5, 5, 2, 1, 1, -1, -1 /) - - ! No nucleation mode - i_mode_type(1:nmodes) = (/ 1, 2, 3, 1, 2, 3, -1, -1 /) - - ! No nucleation mode - i_cpnt_index(cp_su, 1:nmodes)=(/ 1, 4, 9, 14, 16, 17, -1, -1 /) - i_cpnt_index(cp_bc, 1:nmodes)=(/ 2, 5, 10, 15, -1, -1, -1, -1 /) - i_cpnt_index(cp_oc, 1:nmodes)=(/ 3, 6, 11, -1, -1, -1, -1, -1 /) - i_cpnt_index(cp_cl, 1:nmodes)=(/ -1, 7, 12, -1, -1, -1, -1, -1 /) - i_cpnt_index(cp_du, 1:nmodes)=(/ -1, 8, 13, -1, -1, -1, -1, -1 /) - i_cpnt_index(cp_so, 1:nmodes)=(/ -1, -1, -1, -1, -1, -1, -1, -1 /) - i_cpnt_index(cp_no3,1:nmodes)=(/ -1, -1, -1, -1, -1, -1, -1, -1 /) - i_cpnt_index(cp_nn, 1:nmodes)=(/ -1, -1, -1, -1, -1, -1, -1, -1 /) - i_cpnt_index(cp_nh4,1:nmodes)=(/ -1, -1, -1, -1, -1, -1, -1, -1 /) - - i_cpnt_type(1:ncp_max_x_nmodes) = (/ 1, 2, 3, 1, 2, 3, 4, 5, 1, & - 2, 3, 4, 5, 2, 3, 5, 5, -1, & - -1, -1, -1, -1, -1, -1, -1, -1, -1, & - -1, -1, -1, -1, -1, -1, -1, -1, -1, & - -1, -1, -1, -1, -1, -1, -1, -1, -1, & - -1, -1, -1, -1, -1, -1, -1, -1, -1, & - -1, -1, -1, -1, -1, -1, -1, -1, -1, & - -1, -1, -1, -1, -1, -1, -1, -1, -1 /) + ! Whether we need to run shortwave band_average because lit or not + l_any_lit_points_um = .false. + if ( n_radaer_step > 1 ) then + l_any_lit_points_um = .true. + else + if ( lit_fraction( map_2d(1) ) > 0.0_r_def ) then + l_any_lit_points_um = .true. + end if + end if + + ! Note that this is inverted compared to the UM + ! This will be dealt with in ukca_radaer_band_average + trindxrad_um(1) = trop_level( map_2d(1) ) !----------------------------------------------------------------------- ! Initialisation of prognostic variables and arrays !----------------------------------------------------------------------- do k = 1, nlayers - p_theta_levels(1,1,k) = p_zero * & - ( exner_in_wth(map_wth(1) + k) )**(1.0_r_um/kappa) + p_theta_levels_um(1,1,k) = p_zero * & + ( exner_in_wth(map_wth(1) + k) )**(1.0_r_um/kappa) end do do k = 1, nlayers - t_theta_levels(1,1,k) = exner_in_wth(map_wth(1) + k) * & - theta_in_wth(map_wth(1) + k) + t_theta_levels_um(1,1,k) = exner_in_wth(map_wth(1) + k) * & + theta_in_wth(map_wth(1) + k) end do - ! note - zeroth level is redundant for these fields in UM - do k = 1, nlayers - ukca_comp_vol_um(1, 1,k) = pvol_su_ait_sol(map_wth(1) + k) - ukca_comp_vol_um(2, 1,k) = pvol_bc_ait_sol(map_wth(1) + k) - ukca_comp_vol_um(3, 1,k) = pvol_om_ait_sol(map_wth(1) + k) - ukca_comp_vol_um(4, 1,k) = pvol_su_acc_sol(map_wth(1) + k) - ukca_comp_vol_um(5, 1,k) = pvol_bc_acc_sol(map_wth(1) + k) - ukca_comp_vol_um(6, 1,k) = pvol_om_acc_sol(map_wth(1) + k) - ukca_comp_vol_um(7, 1,k) = pvol_ss_acc_sol(map_wth(1) + k) - ukca_comp_vol_um(8, 1,k) = 0.0_r_um ! no pvol_du_acc_sol prognostic - ukca_comp_vol_um(9, 1,k) = pvol_su_cor_sol(map_wth(1) + k) - ukca_comp_vol_um(10,1,k) = pvol_bc_cor_sol(map_wth(1) + k) - ukca_comp_vol_um(11,1,k) = pvol_om_cor_sol(map_wth(1) + k) - ukca_comp_vol_um(12,1,k) = pvol_ss_cor_sol(map_wth(1) + k) - ukca_comp_vol_um(13,1,k) = 0.0_r_um ! no pvol_du_cor_sol prognostic - ukca_comp_vol_um(14,1,k) = pvol_bc_ait_ins(map_wth(1) + k) - ukca_comp_vol_um(15,1,k) = pvol_om_ait_ins(map_wth(1) + k) - ukca_comp_vol_um(16,1,k) = pvol_du_acc_ins(map_wth(1) + k) - ukca_comp_vol_um(17,1,k) = pvol_du_cor_ins(map_wth(1) + k) - - ukca_mix_ratio_um(1, 1,k) = ait_sol_su(map_wth(1) + k) - ukca_mix_ratio_um(2, 1,k) = ait_sol_bc(map_wth(1) + k) - ukca_mix_ratio_um(3, 1,k) = ait_sol_om(map_wth(1) + k) - ukca_mix_ratio_um(4, 1,k) = acc_sol_su(map_wth(1) + k) - ukca_mix_ratio_um(5, 1,k) = acc_sol_bc(map_wth(1) + k) - ukca_mix_ratio_um(6, 1,k) = acc_sol_om(map_wth(1) + k) - ukca_mix_ratio_um(7, 1,k) = acc_sol_ss(map_wth(1) + k) - ukca_mix_ratio_um(8, 1,k) = 0.0_r_um ! no acc_sol_du prognostic - ukca_mix_ratio_um(9, 1,k) = cor_sol_su(map_wth(1) + k) - ukca_mix_ratio_um(10,1,k) = cor_sol_bc(map_wth(1) + k) - ukca_mix_ratio_um(11,1,k) = cor_sol_om(map_wth(1) + k) - ukca_mix_ratio_um(12,1,k) = cor_sol_ss(map_wth(1) + k) - ukca_mix_ratio_um(13,1,k) = 0.0_r_um ! no cor_sol_du prognostic - ukca_mix_ratio_um(14,1,k) = ait_ins_bc(map_wth(1) + k) - ukca_mix_ratio_um(15,1,k) = ait_ins_om(map_wth(1) + k) - ukca_mix_ratio_um(16,1,k) = acc_ins_du(map_wth(1) + k) - ukca_mix_ratio_um(17,1,k) = cor_ins_du(map_wth(1) + k) - - ukca_dry_diam_um(1,k,(mode_ait_sol-1)) = drydp_ait_sol(map_wth(1) + k) - ukca_dry_diam_um(1,k,(mode_acc_sol-1)) = drydp_acc_sol(map_wth(1) + k) - ukca_dry_diam_um(1,k,(mode_cor_sol-1)) = drydp_cor_sol(map_wth(1) + k) - ukca_dry_diam_um(1,k,(mode_ait_insol-1)) = drydp_ait_ins(map_wth(1) + k) - ukca_dry_diam_um(1,k,(mode_acc_insol-1)) = drydp_acc_ins(map_wth(1) + k) - ukca_dry_diam_um(1,k,(mode_cor_insol-1)) = drydp_cor_ins(map_wth(1) + k) - - ukca_modal_nbr_um(1,k,(mode_ait_sol-1)) = n_ait_sol(map_wth(1) + k) - ukca_modal_nbr_um(1,k,(mode_acc_sol-1)) = n_acc_sol(map_wth(1) + k) - ukca_modal_nbr_um(1,k,(mode_cor_sol-1)) = n_cor_sol(map_wth(1) + k) - ukca_modal_nbr_um(1,k,(mode_ait_insol-1)) = n_ait_ins(map_wth(1) + k) - ukca_modal_nbr_um(1,k,(mode_acc_insol-1)) = n_acc_ins(map_wth(1) + k) - ukca_modal_nbr_um(1,k,(mode_cor_insol-1)) = n_cor_ins(map_wth(1) + k) - - ukca_modal_rho_um(1,k,(mode_ait_sol-1)) = rhopar_ait_sol(map_wth(1) + k) - ukca_modal_rho_um(1,k,(mode_acc_sol-1)) = rhopar_acc_sol(map_wth(1) + k) - ukca_modal_rho_um(1,k,(mode_cor_sol-1)) = rhopar_cor_sol(map_wth(1) + k) - ukca_modal_rho_um(1,k,(mode_ait_insol-1)) = rhopar_ait_ins(map_wth(1) + k) - ukca_modal_rho_um(1,k,(mode_acc_insol-1)) = rhopar_acc_ins(map_wth(1) + k) - ukca_modal_rho_um(1,k,(mode_cor_insol-1)) = rhopar_cor_ins(map_wth(1) + k) - - ukca_modal_vol_um(1,k,(mode_ait_sol-1)) = pvol_wat_ait_sol(map_wth(1) + k)+& - pvol_su_ait_sol( map_wth(1) + k)+& - pvol_bc_ait_sol( map_wth(1) + k)+& - pvol_om_ait_sol( map_wth(1) + k) - - ukca_modal_vol_um(1,k,(mode_acc_sol-1)) = pvol_wat_acc_sol(map_wth(1) + k)+& - pvol_su_acc_sol( map_wth(1) + k)+& - pvol_bc_acc_sol( map_wth(1) + k)+& - pvol_om_acc_sol( map_wth(1) + k)+& - pvol_ss_acc_sol( map_wth(1) + k) - ! add pvol_du_acc_sol if used - - ukca_modal_vol_um(1,k,(mode_cor_sol-1)) = pvol_wat_cor_sol(map_wth(1) + k)+& - pvol_su_cor_sol( map_wth(1) + k)+& - pvol_bc_cor_sol( map_wth(1) + k)+& - pvol_om_cor_sol( map_wth(1) + k)+& - pvol_ss_cor_sol( map_wth(1) + k) - ! add pvol_du_cor_sol if used - - ukca_modal_vol_um(1,k,(mode_ait_insol-1))=pvol_bc_ait_ins( map_wth(1) + k)+& - pvol_om_ait_ins( map_wth(1) + k) - - ukca_modal_vol_um(1,k,(mode_acc_insol-1))=pvol_du_acc_ins( map_wth(1) + k) - - ukca_modal_vol_um(1,k,(mode_cor_insol-1))=pvol_du_cor_ins( map_wth(1) + k) - - ukca_modal_wtv_um(1,k,(mode_ait_sol-1)) = pvol_wat_ait_sol(map_wth(1) + k) - ukca_modal_wtv_um(1,k,(mode_acc_sol-1)) = pvol_wat_acc_sol(map_wth(1) + k) - ukca_modal_wtv_um(1,k,(mode_cor_sol-1)) = pvol_wat_cor_sol(map_wth(1) + k) - ukca_modal_wtv_um(1,k,(mode_ait_insol-1)) = 0.0_r_um - ukca_modal_wtv_um(1,k,(mode_acc_insol-1)) = 0.0_r_um - ukca_modal_wtv_um(1,k,(mode_cor_insol-1)) = 0.0_r_um - - ukca_wet_diam_um(1,k,(mode_ait_sol-1)) = wetdp_ait_sol(map_wth(1) + k) - ukca_wet_diam_um(1,k,(mode_acc_sol-1)) = wetdp_acc_sol(map_wth(1) + k) - ukca_wet_diam_um(1,k,(mode_cor_sol-1)) = wetdp_cor_sol(map_wth(1) + k) - ukca_wet_diam_um(1,k,(mode_ait_insol-1)) = drydp_ait_ins(map_wth(1) + k) - ukca_wet_diam_um(1,k,(mode_acc_insol-1)) = drydp_acc_ins(map_wth(1) + k) - ukca_wet_diam_um(1,k,(mode_cor_insol-1)) = drydp_cor_ins(map_wth(1) + k) + !----------------------------------------------------------------------- + + ! -- ukca_comp_vol_um -- + n_fields = size(pvol_comp_names) + allocate(ukca_comp_vol_um(n_fields, 1, nlayers)) + ukca_comp_vol_um = 0.0_r_um + + do m = 1, n_fields + select case(trim(pvol_comp_names(m))) + case('fldname_pvol_su_ait_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_su_ait_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_bc_ait_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_bc_ait_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_om_ait_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_om_ait_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_su_acc_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_su_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_bc_acc_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_bc_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_om_acc_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_om_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_ss_acc_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_ss_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_du_acc_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= 0.0_r_um + end do + case('fldname_pvol_su_cor_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_su_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_bc_cor_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_bc_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_om_cor_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_om_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_ss_cor_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_ss_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_du_cor_sol') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= 0.0_r_um + end do + case('fldname_pvol_bc_ait_ins') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_bc_ait_ins(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_om_ait_ins') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_om_ait_ins(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_du_acc_ins') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_du_acc_ins(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_du_cor_ins') + do k = 1, nlayers + ukca_comp_vol_um(m, 1, k)= real( pvol_du_cor_ins(map_wth(1) + k), r_um ) + end do + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_comp_vol_um : ', pvol_comp_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select end do - call ukca_radaer_prepare( & - ! Input Actual array dimensions - npd_profile, nlayers, n_ukca_mode, n_ukca_cpnt, & - ! Input Fixed array dimensions - npd_profile, nlayers, n_radaer_mode, & - ! Input from the UKCA_RADAER structure - nmodes, ncp_max, i_cpnt_index, n_cpnt_in_mode, & - ! Input Component mass-mixing ratios - ukca_mix_ratio_um, & - ! Input modal number concentrations - ukca_modal_nbr_um, & - ! Input Pressure and temperature - p_theta_levels, t_theta_levels, & - ! Output Modal mass-mixing ratios - ukca_mode_mix_ratio_um, & - ! Output modal number concentrations - ukca_modal_number_um & - ) - - ! MODE aerosol mixing ratios - do i_mode = 1, n_radaer_mode - do k = 1, nlayers - aer_mix_ratio( map_mode(1) + ( (i_mode-1)*(nlayers+1) ) + k ) = & - ukca_mode_mix_ratio_um( 1, k, i_mode ) - end do + ! -- ukca_mix_ratio_um -- + n_fields = size(comp_names) + allocate(ukca_mix_ratio_um(n_fields, 1, nlayers)) + ukca_mix_ratio_um = 0.0_r_um + + do m = 1, n_fields + select case(trim(comp_names(m))) + case('fldname_ait_sol_su') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( ait_sol_su(map_wth(1) + k), r_um ) + end do + case('fldname_ait_sol_bc') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( ait_sol_bc(map_wth(1) + k), r_um ) + end do + case('fldname_ait_sol_om') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( ait_sol_om(map_wth(1) + k), r_um ) + end do + case('fldname_acc_sol_su') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( acc_sol_su(map_wth(1) + k), r_um ) + end do + case('fldname_acc_sol_bc') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( acc_sol_bc(map_wth(1) + k), r_um ) + end do + case('fldname_acc_sol_om') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( acc_sol_om(map_wth(1) + k), r_um ) + end do + case('fldname_acc_sol_ss') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( acc_sol_ss(map_wth(1) + k), r_um ) + end do + case('fldname_acc_sol_du') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = 0.0_r_um + end do + case('fldname_cor_sol_su') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( cor_sol_su(map_wth(1) + k), r_um ) + end do + case('fldname_cor_sol_bc') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( cor_sol_bc(map_wth(1) + k), r_um ) + end do + case('fldname_cor_sol_om') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( cor_sol_om(map_wth(1) + k), r_um ) + end do + case('fldname_cor_sol_ss') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( cor_sol_ss(map_wth(1) + k), r_um ) + end do + case('fldname_cor_sol_du') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = 0.0_r_um + end do + case('fldname_ait_ins_bc') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( ait_ins_bc(map_wth(1) + k), r_um ) + end do + case('fldname_ait_ins_om') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( ait_ins_om(map_wth(1) + k), r_um ) + end do + case('fldname_acc_ins_du') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( acc_ins_du(map_wth(1) + k), r_um ) + end do + case('fldname_cor_ins_du') + do k = 1, nlayers + ukca_mix_ratio_um(m, 1, k) = real( cor_ins_du(map_wth(1) + k), r_um ) + end do + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_mix_ratio_um : ', comp_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select end do - ! Long wave ( e.g. ip_infra_red ) - call ukca_radaer_band_average( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_radaer_mode, & - n_lw_band, & - npd_exclude_lw, & - ! Spectral information (input) - n_lw_band, & - ip_infra_red, & - l_exclude_lw, & - lw_n_band_exclude, & - lw_index_exclude, & - ! Actual array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - ! Prescribed SSA dimensions - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - i_mode_type, & - l_nitrate, & - l_soluble, & - l_sustrat, & - l_cornarrow_ins, & - n_cpnt_in_mode, & - ! Modal mass-mixing ratios (input) - ukca_mode_mix_ratio_um, & - ! Modal number concentrations (input) - ukca_modal_number_um, & - ! Modal diameters from UKCA module (input) - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Other inputs from UKCA module (input) - ukca_comp_vol_um, & - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Logical to describe orientation - l_inverted, & - ! Logical for prescribed single scattering albedo array - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause (input) - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Maxwell-Garnett mixing approach logical control switches - i_ukca_tune_bc, i_glomap_clim_tune_bc, & - ! Band-averaged optical properties (output) - aer_lw_absorption_um, & - aer_lw_scattering_um, & - aer_lw_asymmetry_um & - ) - - ! Socrates arrays filled with MODE aerosol optical properties in bands - i_rmode = 0 - do i_band = 1, n_lw_band - - ! Fill the radaer modes within this band - do i_mode = 1, n_radaer_mode - i_rmode = i_rmode + 1 + ! -- ukca_modal_nbr_um -- + n_fields = size(mode_names) + allocate(ukca_modal_nbr_um(1, nlayers, n_fields)) + ukca_modal_nbr_um = 0.0_r_um + + do m = 1, n_fields + select case(trim(mode_names(m))) + case('fldname_n_nuc_sol') + write( log_scratch_space, '(A,A)' ) & + 'Radaer should not request soluble nucleation mode: ', mode_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + case('fldname_n_ait_sol') do k = 1, nlayers - aer_lw_absorption(map_rmode_lw(1) + ((i_rmode-1)*(nlayers+1)) + k ) = & - aer_lw_absorption_um( 1, k, i_mode, i_band ) - aer_lw_scattering(map_rmode_lw(1) + ((i_rmode-1)*(nlayers+1)) + k ) = & - aer_lw_scattering_um( 1, k, i_mode, i_band ) - aer_lw_asymmetry( map_rmode_lw(1) + ((i_rmode-1)*(nlayers+1)) + k ) = & - max(minus1_plus_eps, min(one_minus_eps, & - aer_lw_asymmetry_um( 1, k, i_mode, i_band ))) + ukca_modal_nbr_um(1, k, m) = real( n_ait_sol(map_wth(1) + k), r_um ) end do - end do + case('fldname_n_acc_sol') + do k = 1, nlayers + ukca_modal_nbr_um(1, k, m) = real( n_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_n_cor_sol') + do k = 1, nlayers + ukca_modal_nbr_um(1, k, m) = real( n_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_n_ait_ins') + do k = 1, nlayers + ukca_modal_nbr_um(1, k, m) = real( n_ait_ins(map_wth(1) + k), r_um ) + end do + case('fldname_n_acc_ins') + do k = 1, nlayers + ukca_modal_nbr_um(1, k, m) = real( n_acc_ins(map_wth(1) + k), r_um ) + end do + case('fldname_n_cor_ins') + do k = 1, nlayers + ukca_modal_nbr_um(1, k, m) = real( n_cor_ins(map_wth(1) + k), r_um ) + end do + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_nbr_um : ', mode_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + end do - ! If there are additional aerosol modes not associated with radaer - ! (e.g. from easyaerosol) then i_rmode needs advancing past them - ! before starting on the next radiation band. - if (n_aer_mode_lw > n_radaer_mode) then - i_rmode = i_rmode + n_aer_mode_lw - n_radaer_mode - end if + ! -- ukca_modal_rho_um -- + n_fields = size(rhopar_mode_names) + allocate(ukca_modal_rho_um(1, nlayers, n_fields)) + ukca_modal_rho_um = 0.0_r_um - end do ! n_lw_bands - - ! Only calculate SW on lit points - ! If superstepping (n_radaer_step>1) then need to calculate on all points - ! for use when the sun moves later - if (lit_fraction(map_2d(1)) > 0.0_r_def .or. & - n_radaer_step > 1) then - - ! Short wave (e.g. ip_solar ) - call ukca_radaer_band_average( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_radaer_mode, & - n_sw_band, & - npd_exclude_sw, & - ! Spectral information (input) - n_sw_band, & - ip_solar, & - l_exclude_sw, & - sw_n_band_exclude, & - sw_index_exclude, & - ! Actual array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - ! Prescribed SSA dimensions - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - i_mode_type, & - l_nitrate, & - l_soluble, & - l_sustrat, & - l_cornarrow_ins, & - n_cpnt_in_mode, & - ! Modal mass-mixing ratios (input) - ukca_mode_mix_ratio_um, & - ! Modal number concentrations (input) - ukca_modal_number_um, & - ! Modal diameters from UKCA module (input) - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Other inputs from UKCA module (input) - ukca_comp_vol_um, & - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Logical to describe orientation - l_inverted, & - ! Logical for prescribed single scattering albedo array - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause (input) - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Maxwell-Garnett mixing approach logical control switches - i_ukca_tune_bc, i_glomap_clim_tune_bc, & - ! Band-averaged optical properties (output) - aer_sw_absorption_um, & - aer_sw_scattering_um, & - aer_sw_asymmetry_um & - ) - - ! Socrates arrays filled with MODE aerosol optical properties in bands - i_rmode = 0 - do i_band = 1, n_sw_band + do m = 1, n_fields + select case(trim(rhopar_mode_names(m))) + case('fldname_rhopar_ait_sol') + do k = 1, nlayers + ukca_modal_rho_um(1, k, m)= real( rhopar_ait_sol(map_wth(1) + k), r_um ) + end do + case('fldname_rhopar_acc_sol') + do k = 1, nlayers + ukca_modal_rho_um(1, k, m)= real( rhopar_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_rhopar_cor_sol') + do k = 1, nlayers + ukca_modal_rho_um(1, k, m)= real( rhopar_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_rhopar_ait_ins') + do k = 1, nlayers + ukca_modal_rho_um(1, k, m)= real( rhopar_ait_ins(map_wth(1) + k), r_um ) + end do + case('fldname_rhopar_acc_ins') + do k = 1, nlayers + ukca_modal_rho_um(1, k, m)= real( rhopar_acc_ins(map_wth(1) + k), r_um ) + end do + case('fldname_rhopar_cor_ins') + do k = 1, nlayers + ukca_modal_rho_um(1, k, m)= real( rhopar_cor_ins(map_wth(1) + k), r_um ) + end do + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_nbr_um : ', rhopar_mode_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + end do - ! Fill the radaer modes within this band - do i_mode = 1, n_radaer_mode - i_rmode = i_rmode + 1 - do k = 1, nlayers - aer_sw_absorption(map_rmode_sw(1) + ((i_rmode-1)*(nlayers+1)) + k ) & - = aer_sw_absorption_um( 1, k, i_mode, i_band ) - aer_sw_scattering(map_rmode_sw(1) + ((i_rmode-1)*(nlayers+1)) + k ) & - = aer_sw_scattering_um( 1, k, i_mode, i_band ) - aer_sw_asymmetry( map_rmode_sw(1) + ((i_rmode-1)*(nlayers+1)) + k ) & - = max(minus1_plus_eps, min(one_minus_eps, & - aer_sw_asymmetry_um( 1, k, i_mode, i_band ))) - end do + ! -- ukca_dry_diam_um -- + n_fields = size(dry_diam_mode_names) + allocate(ukca_dry_diam_um(1, nlayers, n_fields)) + ukca_dry_diam_um = 0.0_r_um + + do m = 1, n_fields + select case(trim(dry_diam_mode_names(m))) + case('fldname_drydp_ait_sol') + do k = 1, nlayers + ukca_dry_diam_um(1, k, m) = real( drydp_ait_sol(map_wth(1) + k), r_um ) end do + case('fldname_drydp_acc_sol') + do k = 1, nlayers + ukca_dry_diam_um(1, k, m) = real( drydp_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_drydp_cor_sol') + do k = 1, nlayers + ukca_dry_diam_um(1, k, m) = real( drydp_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_drydp_ait_ins') + do k = 1, nlayers + ukca_dry_diam_um(1, k, m) = real( drydp_ait_ins(map_wth(1) + k), r_um ) + end do + case('fldname_drydp_acc_ins') + do k = 1, nlayers + ukca_dry_diam_um(1, k, m) = real( drydp_acc_ins(map_wth(1) + k), r_um ) + end do + case('fldname_drydp_cor_ins') + do k = 1, nlayers + ukca_dry_diam_um(1, k, m) = real( drydp_cor_ins(map_wth(1) + k), r_um ) + end do + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_dry_diam_um : ', dry_diam_mode_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + end do - ! If there are additional aerosol modes not associated with radaer - ! (e.g. from easyaerosol) then i_rmode needs advancing past them - ! before starting on the next radiation band. - if (n_aer_mode_sw > n_radaer_mode) then - i_rmode = i_rmode + n_aer_mode_sw - n_radaer_mode - end if + ! -- ukca_modal_vol_um -- + n_fields = size(modal_volume_names) + allocate(ukca_modal_vol_um(1, nlayers, n_fields)) + ukca_modal_vol_um = 0.0_r_um - end do ! n_sw_bands + do m = 1, n_fields - else ! unlit points + select case( trim( modal_volume_names(m) ) ) - ! Dummy values to avoid problems in radiation code - i_rmode = 0 - do i_band = 1, n_sw_band + case('fldname_mod_vol_ait_sol') + + nn_fields = size(ait_sol_volume_names) + + do mm = 1, nn_fields + + select case( trim( ait_sol_volume_names(mm) ) ) + + case( 'pvol_wat_ait_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_wat_ait_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_su_ait_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_su_ait_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_bc_ait_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_bc_ait_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_om_ait_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_om_ait_sol( map_wth(1) + k ), r_um) + end do + + case( 'null' ) + write( log_scratch_space, '(A,A)' ) & + 'This mode should not require a contribution to pvol : ', & + modal_volume_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_vol_um : ', ait_sol_volume_names(mm) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select - ! Fill the radaer modes within this band - do i_mode = 1, n_radaer_mode - i_rmode = i_rmode + 1 - do k = 1, nlayers - aer_sw_absorption(map_rmode_sw(1) + ((i_rmode-1)*(nlayers+1)) + k ) & - = 1.0_r_def - aer_sw_scattering(map_rmode_sw(1) + ((i_rmode-1)*(nlayers+1)) + k ) & - = 1.0_r_def - aer_sw_asymmetry( map_rmode_sw(1) + ((i_rmode-1)*(nlayers+1)) + k ) & - = one_minus_eps - end do end do - ! If there are additional aerosol modes not associated with radaer - ! (e.g. from easyaerosol) then i_rmode needs advancing past them - ! before starting on the next radiation band. - if (n_aer_mode_sw > n_radaer_mode) then - i_rmode = i_rmode + n_aer_mode_sw - n_radaer_mode - end if + case('fldname_mod_vol_acc_sol') + + nn_fields = size(acc_sol_volume_names) + + do mm = 1, nn_fields + select case( trim( acc_sol_volume_names(mm) ) ) + case( 'pvol_wat_acc_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_wat_acc_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_su_acc_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_su_acc_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_bc_acc_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_bc_acc_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_om_acc_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_om_acc_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_ss_acc_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_ss_acc_sol( map_wth(1) + k ), r_um) + end do + + case( 'null' ) + write( log_scratch_space, '(A,A)' ) & + 'This mode should not require a contribution to pvol : ', & + modal_volume_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_vol_um : ', acc_sol_volume_names(mm) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select - end do ! n_sw_bands + end do + + case('fldname_mod_vol_cor_sol') + + nn_fields = size(cor_sol_volume_names) + + do mm = 1, nn_fields + select case( trim( cor_sol_volume_names(mm) ) ) + case( 'pvol_wat_cor_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_wat_cor_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_su_cor_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_su_cor_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_bc_cor_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_bc_cor_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_om_cor_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_om_cor_sol( map_wth(1) + k ), r_um) + end do + + case( 'pvol_ss_cor_sol' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_ss_cor_sol( map_wth(1) + k ), r_um) + end do + + case( 'null' ) + write( log_scratch_space, '(A,A)' ) & + 'This mode should not require a contribution to pvol : ', & + modal_volume_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_vol_um : ', cor_sol_volume_names(mm) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + + end do + + case('fldname_mod_vol_ait_ins') + + nn_fields = size(ait_ins_volume_names) + + do mm = 1, nn_fields + + select case( trim( ait_ins_volume_names(mm) ) ) + + case( 'pvol_bc_ait_ins' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_bc_ait_ins( map_wth(1) + k ), r_um) + end do + + case( 'pvol_om_ait_ins' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_om_ait_ins( map_wth(1) + k ), r_um) + end do + + case( 'null' ) + write( log_scratch_space, '(A,A)' ) & + 'This mode should not require a contribution to pvol : ', & + modal_volume_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_vol_um : ', ait_ins_volume_names(mm) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + + end do - end if ! lit points + case('fldname_mod_vol_acc_ins') + + nn_fields = size(acc_ins_volume_names) + + do mm = 1, nn_fields + + select case( trim( acc_ins_volume_names(mm) ) ) + + case( 'pvol_du_acc_ins' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_du_acc_ins( map_wth(1) + k ), r_um) + end do + + case( 'null' ) + write( log_scratch_space, '(A,A)' ) & + 'This mode should not require a contribution to pvol : ', & + modal_volume_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_vol_um : ', acc_ins_volume_names(mm) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + + end do + + case('fldname_mod_vol_cor_ins') + + nn_fields = size(cor_ins_volume_names) + + do mm = 1, nn_fields + + select case( trim( cor_ins_volume_names(mm) ) ) + + case( 'pvol_du_cor_ins' ) + do k = 1, nlayers + ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + real( pvol_du_cor_ins( map_wth(1) + k ), r_um) + end do + + case( 'null' ) + write( log_scratch_space, '(A,A)' ) & + 'This mode should not require a contribution to pvol : ', & + modal_volume_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_vol_um : ', cor_ins_volume_names(mm) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + + end do + + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_vol_um : ', modal_volume_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + + end do + + ! -- ukca_modal_wtv_um -- + n_fields = size(modal_wtv_names) + allocate(ukca_modal_wtv_um(1, nlayers, n_fields)) + ukca_modal_wtv_um = 0.0_r_um + + do m = 1, n_fields + select case(trim(modal_wtv_names(m))) + case('fldname_pvol_wat_ait_sol') + do k = 1, nlayers + ukca_modal_wtv_um(1,k,m) =real( pvol_wat_ait_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_wat_acc_sol') + do k = 1, nlayers + ukca_modal_wtv_um(1,k,m) =real( pvol_wat_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_wat_cor_sol') + do k = 1, nlayers + ukca_modal_wtv_um(1,k,m) =real( pvol_wat_cor_sol(map_wth(1) + k), r_um ) + end do + case('fldname_pvol_wat_ait_ins') + do k = 1, nlayers + ukca_modal_wtv_um(1,k,m) = 0.0_r_um + end do + case('fldname_pvol_wat_acc_ins') + do k = 1, nlayers + ukca_modal_wtv_um(1,k,m) = 0.0_r_um + end do + case('fldname_pvol_wat_cor_ins') + do k = 1, nlayers + ukca_modal_wtv_um(1,k,m) = 0.0_r_um + end do + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_modal_wtv_um : ', modal_wtv_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + end do + + ! -- ukca_wet_diam_um -- + n_fields = size(wet_diam_mode_names) + allocate(ukca_wet_diam_um(1, nlayers, n_fields)) + ukca_wet_diam_um = 0.0_r_um + + do m = 1, n_fields + select case(trim(wet_diam_mode_names(m))) + case('fldname_wetdp_ait_sol') + do k = 1, nlayers + ukca_wet_diam_um(1, k, m) = real( wetdp_ait_sol(map_wth(1) + k), r_um ) + end do + case('fldname_wetdp_acc_sol') + do k = 1, nlayers + ukca_wet_diam_um(1, k, m) = real( wetdp_acc_sol(map_wth(1) + k), r_um ) + end do + case('fldname_wetdp_cor_sol') + do k = 1, nlayers + ukca_wet_diam_um(1, k, m) = real( wetdp_cor_sol(map_wth(1) + k), r_um ) + end do + !!!!! Note that wet and dry diameter are the same for insoluble modes + case('fldname_wetdp_ait_ins') + do k = 1, nlayers + ukca_wet_diam_um(1, k, m) = real( drydp_ait_ins(map_wth(1) + k), r_um ) + end do + !!!!! Note that wet and dry diameter are the same for insoluble modes + case('fldname_wetdp_acc_ins') + do k = 1, nlayers + ukca_wet_diam_um(1, k, m) = real( drydp_acc_ins(map_wth(1) + k), r_um ) + end do + !!!!! Note that wet and dry diameter are the same for insoluble modes + case('fldname_wetdp_cor_ins') + do k = 1, nlayers + ukca_wet_diam_um(1, k, m) = real( drydp_cor_ins(map_wth(1) + k), r_um ) + end do + case default + write( log_scratch_space, '(A,A)' ) & + 'Missing required ukca_wet_diam_um : ', wet_diam_mode_names(m) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + end select + end do !------------------------------------------------ ! Calculate mass thickness of vertical levels @@ -1069,78 +1449,182 @@ subroutine radaer_code( nlayers, & ( 1.0_r_def / kappa ) / gravity end if - !------------------------------------------------ - ! Now calculate aod and aaod for Aitken Soluble mode - if ( ( .not. associated( aod_ukca_ait_sol, empty_real_data ) ) .or. & - ( .not. associated( aaod_ukca_ait_sol, empty_real_data ) ) ) then - - call ukca_radaer_compute_aod( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - npd_ukca_aod_wavel, & - ! Fixed array Prescribed ssa dimensions (input) - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - n_cpnt_in_mode, & - l_nitrate, & - l_soluble, & - l_sustrat, & - i_mode_type, & - l_cornarrow_ins, & - ! Modal diameters from UKCA module - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Mass thickness of layers - d_mass_theta_levels_um, & - ! Component volumes - ukca_comp_vol_um, & - ! Modal volumes, densities, and water content - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Modal mass-mixing ratios - ukca_mode_mix_ratio_um, & - ! Modal number concentrations - ukca_modal_number_um, & - ! Type selection - ip_ukca_mode_aitken, & - soluble_wanted, & - ! Switch for if prescribed SSA is on - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Modal extinction aerosol opt depth - column (output) - aod_ukca_this_mode_um, & - ! Modal extinction aerosol opt depth - stratosphere (output) - sod_ukca_this_mode_um, & - ! Modal absorption aerosol opt depth (output) - aaod_ukca_this_mode_um, & - ! Fixed array dimensions - npd_profile, & - nlayers, & - n_radaer_mode, & - npd_ukca_aod_wavel ) + !----------------------------------------------------------------------- + ! Call UKCA modules + !----------------------------------------------------------------------- + + CALL ukca_radaer_lfric_interface( & + ! Fixed array dimensions (input) + (row_length*rows), & + nlayers, & + npd_exclude_lw, & + npd_exclude_sw, & + npd_ukca_aod_wavel, & + ncp_max_x_nmodes, & + ! Actual array dimensions (input) + n_ukca_mode, & + n_ukca_cpnt, & + ! Prescribed SSA dimensions + nd_prof_ssa, & + nd_layr_ssa, & + nd_band_ssa, & + ! Variables related to waveband exclusion + l_exclude_lw, & + l_exclude_sw, & + ! Modal diameters from UKCA module (input) + ukca_dry_diam_um, & + ukca_wet_diam_um, & + ! Other inputs from UKCA module (input) + ukca_comp_vol_um, & + ukca_modal_vol_um, & + ukca_modal_rho_um, & + ukca_modal_wtv_um, & + ! Logical to describe orientation + l_inverted, & + ! Control option for prescribed single scattering albedo array + i_ukca_radaer_prescribe_ssa, & + ! Model level of the tropopause (input) + trindxrad_um, & + ! Whether we need to run shortwave band_average because lit or not + l_any_lit_points_um, & + ! Prescription of single-scattering albedo + ukca_radaer_presc_ssa, & + ! Input Component mass-mixing ratios + ukca_mix_ratio_um, & + ! Input modal number concentrations + ukca_modal_nbr_um, & + ! Input Pressure and temperature + p_theta_levels_um, t_theta_levels_um, & + ! Which aerosol optical depth diagnostics to calculate + l_aod_ukca_ait_sol, l_aaod_ukca_ait_sol, & + l_aod_ukca_acc_sol, l_aaod_ukca_acc_sol, & + l_aod_ukca_cor_sol, l_aaod_ukca_cor_sol, & + l_aod_ukca_ait_ins, l_aaod_ukca_ait_ins, & + l_aod_ukca_acc_ins, l_aaod_ukca_acc_ins, & + l_aod_ukca_cor_ins, l_aaod_ukca_cor_ins, & + ! Mass thickness of layers + d_mass_theta_levels_um, & + ! Modal mass-mixing ratios (input output) + ukca_mode_mix_ratio_um, & + ! Band-averaged optical properties (output) + aer_lw_absorption_um, & + aer_sw_absorption_um, & + aer_lw_scattering_um, & + aer_sw_scattering_um, & + aer_lw_asymmetry_um, & + aer_sw_asymmetry_um, & + aod_ukca_all_modes_um, & + aaod_ukca_all_modes_um ) + + !----------------------------------------------------------------------- + ! Convert back to LFRic arrays + !----------------------------------------------------------------------- + + ! MODE aerosol mixing ratios + do i_mode = 1, n_radaer_mode + do k = 1, nlayers + + aer_mix_ratio( map_mode(1) + ( (i_mode-1)*(nlayers+1) ) + k ) = & + ukca_mode_mix_ratio_um( 1, k, i_mode ) + end do + end do + + ! Socrates arrays filled with MODE aerosol optical properties in bands + i_rmode = 0 + do i_band = 1, n_lw_band + ! Fill the radaer modes within this band + do i_mode = 1, n_radaer_mode + i_rmode = i_rmode + 1 + do k = 1, nlayers + + aer_lw_absorption( map_rmode_lw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = & + aer_lw_absorption_um( 1, k, i_mode, i_band ) + + aer_lw_scattering( map_rmode_lw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = & + aer_lw_scattering_um( 1, k, i_mode, i_band ) + + aer_lw_asymmetry( map_rmode_lw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = & + max(minus1_plus_eps, min(one_minus_eps, & + aer_lw_asymmetry_um( 1, k, i_mode, i_band ) ) ) + + end do ! n_layers + end do ! n_radaer_mode + + ! If there are additional aerosol modes not associated with radaer + ! (e.g. from easyaerosol) then i_rmode needs advancing past them + ! before starting on the next radiation band. + if (n_aer_mode_lw > n_radaer_mode) then + i_rmode = i_rmode + n_aer_mode_lw - n_radaer_mode + end if + + end do ! n_lw_band + + ! Only calculate SW on lit points + ! If superstepping (n_radaer_step>1) then need to calculate on all points + ! for use when the sun moves later + + ! Socrates arrays filled with MODE aerosol optical properties in bands + i_rmode = 0 + do i_band = 1, n_sw_band + + ! Fill the radaer modes within this band + do i_mode = 1, n_radaer_mode + i_rmode = i_rmode + 1 + + do k = 1, nlayers + if ( ( lit_fraction(map_2d(1)) > 0.0_r_def ) .or. & + n_radaer_step > 1 ) then + + aer_sw_absorption( map_rmode_sw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = & + aer_sw_absorption_um( 1, k, i_mode, i_band ) + + aer_sw_scattering( map_rmode_sw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = & + aer_sw_scattering_um( 1, k, i_mode, i_band ) + + aer_sw_asymmetry( map_rmode_sw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = & + max(minus1_plus_eps, min(one_minus_eps, & + aer_sw_asymmetry_um( 1, k, i_mode, i_band ) ) ) + + ! unlit points + else + + aer_sw_absorption( map_rmode_sw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = 1.0_r_def + + aer_sw_scattering( map_rmode_sw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = 1.0_r_def + + aer_sw_asymmetry( map_rmode_sw(1) + & + ( (i_rmode-1)*(nlayers+1) ) + k ) = one_minus_eps + + end if + end do ! nlayers + end do ! n_radaer_mode + + ! If there are additional aerosol modes not associated with radaer + ! (e.g. from easyaerosol) then i_rmode needs advancing past them + ! before starting on the next radiation band. + if (n_aer_mode_sw > n_radaer_mode) then + i_rmode = i_rmode + n_aer_mode_sw - n_radaer_mode + end if + + end do ! n_sw_bands !------------------------------------------------ + ! Now calculate aod and aaod for Aitken Soluble mode if ( .not. associated( aod_ukca_ait_sol, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_ait_sol( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_this_mode_um(i,k) + aod_ukca_all_modes_um(i,k,mode_ait_sol-1) end do end do end if @@ -1149,85 +1633,19 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_ait_sol( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_this_mode_um(i,k) + aaod_ukca_all_modes_um(i,k,mode_ait_sol-1) end do end do end if - end if ! Calculate AOD Aitken Soluble mode - - !------------------------------------------------ - ! Now calculate aod and aaod for Accumulation Soluble mode - - if ( ( .not. associated( aod_ukca_acc_sol, empty_real_data ) ) .or. & - ( .not. associated( aaod_ukca_acc_sol, empty_real_data ) ) ) then - - call ukca_radaer_compute_aod( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - npd_ukca_aod_wavel, & - ! Fixed array Prescribed ssa dimensions (input) - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - n_cpnt_in_mode, & - l_nitrate, & - l_soluble, & - l_sustrat, & - i_mode_type, & - l_cornarrow_ins, & - ! Modal diameters from UKCA module - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Mass thickness of layers - d_mass_theta_levels_um, & - ! Component volumes - ukca_comp_vol_um, & - ! Modal volumes, densities, and water content - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Modal mass-mixing ratios - ukca_mode_mix_ratio_um, & - ! Modal number concentrations - ukca_modal_number_um, & - ! Type selection - ip_ukca_mode_accum, & - soluble_wanted, & - ! Switch for if prescribed SSA is on - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Modal extinction aerosol opt depth - column (output) - aod_ukca_this_mode_um, & - ! Modal extinction aerosol opt depth - stratosphere (output) - sod_ukca_this_mode_um, & - ! Modal absorption aerosol opt depth (output) - aaod_ukca_this_mode_um, & - ! Fixed array dimensions - npd_profile, & - nlayers, & - n_radaer_mode, & - npd_ukca_aod_wavel ) - !------------------------------------------------ + ! Now calculate aod and aaod for Accumulation Soluble mode if ( .not. associated( aod_ukca_acc_sol, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_acc_sol( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_this_mode_um(i,k) + aod_ukca_all_modes_um(i,k,mode_acc_sol-1) end do end do end if @@ -1236,85 +1654,19 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_acc_sol( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_this_mode_um(i,k) + aaod_ukca_all_modes_um(i,k,mode_acc_sol-1) end do end do end if - end if ! Calculate AOD Accumulation Soluble mode - - !------------------------------------------------ - ! Now calculate aod and aaod for Coarse Soluble mode - - if ( ( .not. associated( aod_ukca_cor_sol, empty_real_data ) ) .or. & - ( .not. associated( aaod_ukca_cor_sol, empty_real_data ) ) ) then - - call ukca_radaer_compute_aod( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - npd_ukca_aod_wavel, & - ! Fixed array Prescribed ssa dimensions (input) - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - n_cpnt_in_mode, & - l_nitrate, & - l_soluble, & - l_sustrat, & - i_mode_type, & - l_cornarrow_ins, & - ! Modal diameters from UKCA module - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Mass thickness of layers - d_mass_theta_levels_um, & - ! Component volumes - ukca_comp_vol_um, & - ! Modal volumes, densities, and water content - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Modal mass-mixing ratios - ukca_mode_mix_ratio_um, & - ! Modal number concentrations - ukca_modal_number_um, & - ! Type selection - ip_ukca_mode_coarse, & - soluble_wanted, & - ! Switch for if prescribed SSA is on - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Modal extinction aerosol opt depth - column (output) - aod_ukca_this_mode_um, & - ! Modal extinction aerosol opt depth - stratosphere (output) - sod_ukca_this_mode_um, & - ! Modal absorption aerosol opt depth (output) - aaod_ukca_this_mode_um, & - ! Fixed array dimensions - npd_profile, & - nlayers, & - n_radaer_mode, & - npd_ukca_aod_wavel ) - !------------------------------------------------ + ! Now calculate aod and aaod for Coarse Soluble mode if ( .not. associated( aod_ukca_cor_sol, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_cor_sol( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_this_mode_um(i,k) + aod_ukca_all_modes_um(i,k,mode_cor_sol-1) end do end do end if @@ -1323,85 +1675,19 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_cor_sol( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_this_mode_um(i,k) + aaod_ukca_all_modes_um(i,k,mode_cor_sol-1) end do end do end if - end if ! Calculate AOD Coarse Soluble mode - - !------------------------------------------------ - ! Now calculate aod and aaod for Aitken Insoluble mode - - if ( ( .not. associated( aod_ukca_ait_ins, empty_real_data ) ) .or. & - ( .not. associated( aaod_ukca_ait_ins, empty_real_data ) ) ) then - - call ukca_radaer_compute_aod( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - npd_ukca_aod_wavel, & - ! Fixed array Prescribed ssa dimensions (input) - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - n_cpnt_in_mode, & - l_nitrate, & - l_soluble, & - l_sustrat, & - i_mode_type, & - l_cornarrow_ins, & - ! Modal diameters from UKCA module - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Mass thickness of layers - d_mass_theta_levels_um, & - ! Component volumes - ukca_comp_vol_um, & - ! Modal volumes, densities, and water content - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Modal mass-mixing ratios - ukca_mode_mix_ratio_um, & - ! Modal number concentrations - ukca_modal_number_um, & - ! Type selection - ip_ukca_mode_aitken, & - soluble_unwanted, & - ! Switch for if prescribed SSA is on - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Modal extinction aerosol opt depth - column (output) - aod_ukca_this_mode_um, & - ! Modal extinction aerosol opt depth - stratosphere (output) - sod_ukca_this_mode_um, & - ! Modal absorption aerosol opt depth (output) - aaod_ukca_this_mode_um, & - ! Fixed array dimensions - npd_profile, & - nlayers, & - n_radaer_mode, & - npd_ukca_aod_wavel ) - !------------------------------------------------ + ! Now calculate aod and aaod for Aitken Insoluble mode if ( .not. associated( aod_ukca_ait_ins, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_ait_ins( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_this_mode_um(i,k) + aod_ukca_all_modes_um(i,k,mode_ait_insol-1) end do end do end if @@ -1410,85 +1696,19 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_ait_ins( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_this_mode_um(i,k) + aaod_ukca_all_modes_um(i,k,mode_ait_insol-1) end do end do end if - end if ! Calculate AOD Aitkin Insoluble mode - - !------------------------------------------------ - ! Now calculate aod and aaod for Accumulation Insoluble mode - - if ( ( .not. associated( aod_ukca_acc_ins, empty_real_data ) ) .or. & - ( .not. associated( aaod_ukca_acc_ins, empty_real_data ) ) ) then - - call ukca_radaer_compute_aod( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - npd_ukca_aod_wavel, & - ! Fixed array Prescribed ssa dimensions (input) - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - n_cpnt_in_mode, & - l_nitrate, & - l_soluble, & - l_sustrat, & - i_mode_type, & - l_cornarrow_ins, & - ! Modal diameters from UKCA module - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Mass thickness of layers - d_mass_theta_levels_um, & - ! Component volumes - ukca_comp_vol_um, & - ! Modal volumes, densities, and water content - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Modal mass-mixing ratios - ukca_mode_mix_ratio_um, & - ! Modal number concentrations - ukca_modal_number_um, & - ! Type selection - ip_ukca_mode_accum, & - soluble_unwanted, & - ! Switch for if prescribed SSA is on - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Modal extinction aerosol opt depth - column (output) - aod_ukca_this_mode_um, & - ! Modal extinction aerosol opt depth - stratosphere (output) - sod_ukca_this_mode_um, & - ! Modal absorption aerosol opt depth (output) - aaod_ukca_this_mode_um, & - ! Fixed array dimensions - npd_profile, & - nlayers, & - n_radaer_mode, & - npd_ukca_aod_wavel ) - !------------------------------------------------ + ! Now calculate aod and aaod for Accumulation Insoluble mode if ( .not. associated( aod_ukca_acc_ins, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_acc_ins( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_this_mode_um(i,k) + aod_ukca_all_modes_um(i,k,mode_acc_insol-1) end do end do end if @@ -1497,85 +1717,19 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_acc_ins( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_this_mode_um(i,k) + aaod_ukca_all_modes_um(i,k,mode_acc_insol-1) end do end do end if - end if ! Calculate AOD Accumulation Insoluble mode - - !------------------------------------------------ - ! Now calculate aod and aaod for Coarse Insoluble mode - - if ( ( .not. associated( aod_ukca_cor_ins, empty_real_data ) ) .or. & - ( .not. associated( aaod_ukca_cor_ins, empty_real_data ) ) ) then - - call ukca_radaer_compute_aod( & - ! Fixed array dimensions (input) - npd_profile, & - nlayers, & - n_ukca_mode, & - n_ukca_cpnt, & - npd_ukca_aod_wavel, & - ! Fixed array Prescribed ssa dimensions (input) - nd_prof_ssa, & - nd_layr_ssa, & - nd_band_ssa, & - ! UKCA_RADAER structure (input) - nmodes, & - ncp_max, & - ncp_max_x_nmodes, & - i_cpnt_index, & - i_cpnt_type, & - n_cpnt_in_mode, & - l_nitrate, & - l_soluble, & - l_sustrat, & - i_mode_type, & - l_cornarrow_ins, & - ! Modal diameters from UKCA module - ukca_dry_diam_um, & - ukca_wet_diam_um, & - ! Mass thickness of layers - d_mass_theta_levels_um, & - ! Component volumes - ukca_comp_vol_um, & - ! Modal volumes, densities, and water content - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & - ! Modal mass-mixing ratios - ukca_mode_mix_ratio_um, & - ! Modal number concentrations - ukca_modal_number_um, & - ! Type selection - ip_ukca_mode_coarse, & - soluble_unwanted, & - ! Switch for if prescribed SSA is on - i_ukca_radaer_prescribe_ssa, & - ! Model level of the tropopause - trindxrad_um, & - ! Prescription of single-scattering albedo - ukca_radaer_presc_ssa, & - ! Modal extinction aerosol opt depth - column (output) - aod_ukca_this_mode_um, & - ! Modal extinction aerosol opt depth - stratosphere (output) - sod_ukca_this_mode_um, & - ! Modal absorption aerosol opt depth (output) - aaod_ukca_this_mode_um, & - ! Fixed array dimensions - npd_profile, & - nlayers, & - n_radaer_mode, & - npd_ukca_aod_wavel ) - !------------------------------------------------ + ! Now calculate aod and aaod for Coarse Insoluble mode if ( .not. associated( aod_ukca_cor_ins, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_cor_ins( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_this_mode_um(i,k) + aod_ukca_all_modes_um(i,k,mode_cor_insol-1) end do end do end if @@ -1583,15 +1737,38 @@ subroutine radaer_code( nlayers, & if ( .not. associated( aaod_ukca_cor_ins, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel do i = 1, row_length - aaod_ukca_cor_ins( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_this_mode_um(i,k) + aaod_ukca_cor_ins( map_aod_wavel(i) + k - 1 ) = & + aaod_ukca_all_modes_um(i,k,mode_cor_insol-1) end do end do end if - end if ! Calculate AOD Coarse Insoluble mode - !------------------------------------------------ + ! This is where we would close segmentation and openmp + !------------------------------------------------ + + deallocate( ukca_modal_wtv_um ) + deallocate( ukca_modal_vol_um ) + deallocate( ukca_modal_rho_um ) + deallocate( ukca_modal_nbr_um ) + deallocate( ukca_wet_diam_um ) + deallocate( ukca_dry_diam_um ) + + deallocate( ukca_mix_ratio_um ) + deallocate( ukca_comp_vol_um ) + + deallocate( aaod_ukca_all_modes_um ) + deallocate( sod_ukca_all_modes_um ) + deallocate( aod_ukca_all_modes_um ) + + deallocate( aer_sw_asymmetry_um ) + deallocate( aer_sw_scattering_um ) + deallocate( aer_sw_absorption_um ) + deallocate( aer_lw_asymmetry_um ) + deallocate( aer_lw_scattering_um ) + deallocate( aer_lw_absorption_um ) + + deallocate( ukca_mode_mix_ratio_um ) end subroutine radaer_code From d69ed193c2267c66471f348e59da824a6899a65b Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Thu, 16 Jul 2026 14:35:51 +0100 Subject: [PATCH 02/14] messed up git again --- .../source/kernel/radaer_kernel_mod.F90 | 67 ++++++++++++++----- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index 66471bbe5d..fa08f3d9be 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -1107,25 +1107,25 @@ subroutine radaer_code( nlayers, & case( 'pvol_wat_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_wat_ait_sol( map_wth(1) + k ), r_um) + pvol_wat_ait_sol( map_wth(1) + k ) end do case( 'pvol_su_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_su_ait_sol( map_wth(1) + k ), r_um) + pvol_su_ait_sol( map_wth(1) + k ) end do case( 'pvol_bc_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_bc_ait_sol( map_wth(1) + k ), r_um) + pvol_bc_ait_sol( map_wth(1) + k ) end do case( 'pvol_om_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_om_ait_sol( map_wth(1) + k ), r_um) + pvol_om_ait_sol( map_wth(1) + k ) end do case( 'null' ) @@ -1151,31 +1151,31 @@ subroutine radaer_code( nlayers, & case( 'pvol_wat_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_wat_acc_sol( map_wth(1) + k ), r_um) + pvol_wat_acc_sol( map_wth(1) + k ) end do case( 'pvol_su_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_su_acc_sol( map_wth(1) + k ), r_um) + pvol_su_acc_sol( map_wth(1) + k ) end do case( 'pvol_bc_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_bc_acc_sol( map_wth(1) + k ), r_um) + pvol_bc_acc_sol( map_wth(1) + k ) end do case( 'pvol_om_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_om_acc_sol( map_wth(1) + k ), r_um) + pvol_om_acc_sol( map_wth(1) + k ) end do case( 'pvol_ss_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_ss_acc_sol( map_wth(1) + k ), r_um) + pvol_ss_acc_sol( map_wth(1) + k ) end do case( 'null' ) @@ -1201,31 +1201,31 @@ subroutine radaer_code( nlayers, & case( 'pvol_wat_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_wat_cor_sol( map_wth(1) + k ), r_um) + pvol_wat_cor_sol( map_wth(1) + k ) end do case( 'pvol_su_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_su_cor_sol( map_wth(1) + k ), r_um) + pvol_su_cor_sol( map_wth(1) + k ) end do case( 'pvol_bc_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_bc_cor_sol( map_wth(1) + k ), r_um) + pvol_bc_cor_sol( map_wth(1) + k ) end do case( 'pvol_om_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_om_cor_sol( map_wth(1) + k ), r_um) + pvol_om_cor_sol( map_wth(1) + k ) end do case( 'pvol_ss_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_ss_cor_sol( map_wth(1) + k ), r_um) + pvol_ss_cor_sol( map_wth(1) + k ) end do case( 'null' ) @@ -1253,13 +1253,13 @@ subroutine radaer_code( nlayers, & case( 'pvol_bc_ait_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_bc_ait_ins( map_wth(1) + k ), r_um) + pvol_bc_ait_ins( map_wth(1) + k ) end do case( 'pvol_om_ait_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_om_ait_ins( map_wth(1) + k ), r_um) + pvol_om_ait_ins( map_wth(1) + k ) end do case( 'null' ) @@ -1287,7 +1287,7 @@ subroutine radaer_code( nlayers, & case( 'pvol_du_acc_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_du_acc_ins( map_wth(1) + k ), r_um) + pvol_du_acc_ins( map_wth(1) + k ) end do case( 'null' ) @@ -1315,7 +1315,7 @@ subroutine radaer_code( nlayers, & case( 'pvol_du_cor_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - real( pvol_du_cor_ins( map_wth(1) + k ), r_um) + pvol_du_cor_ins( map_wth(1) + k ) end do case( 'null' ) @@ -1340,6 +1340,37 @@ subroutine radaer_code( nlayers, & end do + !-------------------------------------------------------------------------- + ! To determine if 32bit KGO change is from differences in addition order + do k = 1, nlayers + ukca_modal_vol_um(1,k,(mode_ait_sol-1)) = pvol_wat_ait_sol(map_wth(1) + k)+& + pvol_su_ait_sol( map_wth(1) + k)+& + pvol_bc_ait_sol( map_wth(1) + k)+& + pvol_om_ait_sol( map_wth(1) + k) + + ukca_modal_vol_um(1,k,(mode_acc_sol-1)) = pvol_wat_acc_sol(map_wth(1) + k)+& + pvol_su_acc_sol( map_wth(1) + k)+& + pvol_bc_acc_sol( map_wth(1) + k)+& + pvol_om_acc_sol( map_wth(1) + k)+& + pvol_ss_acc_sol( map_wth(1) + k) + ! add pvol_du_acc_sol if used + + ukca_modal_vol_um(1,k,(mode_cor_sol-1)) = pvol_wat_cor_sol(map_wth(1) + k)+& + pvol_su_cor_sol( map_wth(1) + k)+& + pvol_bc_cor_sol( map_wth(1) + k)+& + pvol_om_cor_sol( map_wth(1) + k)+& + pvol_ss_cor_sol( map_wth(1) + k) + ! add pvol_du_cor_sol if used + + ukca_modal_vol_um(1,k,(mode_ait_insol-1))=pvol_bc_ait_ins( map_wth(1) + k)+& + pvol_om_ait_ins( map_wth(1) + k) + + ukca_modal_vol_um(1,k,(mode_acc_insol-1))=pvol_du_acc_ins( map_wth(1) + k) + + ukca_modal_vol_um(1,k,(mode_cor_insol-1))=pvol_du_cor_ins( map_wth(1) + k) + end do + !-------------------------------------------------------------------------- + ! -- ukca_modal_wtv_um -- n_fields = size(modal_wtv_names) allocate(ukca_modal_wtv_um(1, nlayers, n_fields)) From ab953f8ca0fb7e5a349a35bef9c238825ddef925 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Thu, 16 Jul 2026 14:38:47 +0100 Subject: [PATCH 03/14] to better show that KGOs are specific to this change --- .../source/kernel/radaer_kernel_mod.F90 | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index fa08f3d9be..9c0e7b3d83 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -1107,25 +1107,25 @@ subroutine radaer_code( nlayers, & case( 'pvol_wat_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_wat_ait_sol( map_wth(1) + k ) + real( pvol_wat_ait_sol( map_wth(1) + k ), r_um) end do case( 'pvol_su_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_su_ait_sol( map_wth(1) + k ) + real( pvol_su_ait_sol( map_wth(1) + k ), r_um) end do case( 'pvol_bc_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_bc_ait_sol( map_wth(1) + k ) + real( pvol_bc_ait_sol( map_wth(1) + k ), r_um) end do case( 'pvol_om_ait_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_om_ait_sol( map_wth(1) + k ) + real( pvol_om_ait_sol( map_wth(1) + k ), r_um) end do case( 'null' ) @@ -1151,31 +1151,31 @@ subroutine radaer_code( nlayers, & case( 'pvol_wat_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_wat_acc_sol( map_wth(1) + k ) + real( pvol_wat_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_su_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_su_acc_sol( map_wth(1) + k ) + real( pvol_su_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_bc_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_bc_acc_sol( map_wth(1) + k ) + real( pvol_bc_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_om_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_om_acc_sol( map_wth(1) + k ) + real( pvol_om_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_ss_acc_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_ss_acc_sol( map_wth(1) + k ) + real( pvol_ss_acc_sol( map_wth(1) + k ), r_um) end do case( 'null' ) @@ -1201,31 +1201,31 @@ subroutine radaer_code( nlayers, & case( 'pvol_wat_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_wat_cor_sol( map_wth(1) + k ) + real( pvol_wat_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_su_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_su_cor_sol( map_wth(1) + k ) + real( pvol_su_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_bc_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_bc_cor_sol( map_wth(1) + k ) + real( pvol_bc_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_om_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_om_cor_sol( map_wth(1) + k ) + real( pvol_om_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_ss_cor_sol' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_ss_cor_sol( map_wth(1) + k ) + real( pvol_ss_cor_sol( map_wth(1) + k ), r_um) end do case( 'null' ) @@ -1253,13 +1253,13 @@ subroutine radaer_code( nlayers, & case( 'pvol_bc_ait_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_bc_ait_ins( map_wth(1) + k ) + real( pvol_bc_ait_ins( map_wth(1) + k ), r_um) end do case( 'pvol_om_ait_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_om_ait_ins( map_wth(1) + k ) + real( pvol_om_ait_ins( map_wth(1) + k ), r_um) end do case( 'null' ) @@ -1287,7 +1287,7 @@ subroutine radaer_code( nlayers, & case( 'pvol_du_acc_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_du_acc_ins( map_wth(1) + k ) + real( pvol_du_acc_ins( map_wth(1) + k ), r_um) end do case( 'null' ) @@ -1315,7 +1315,7 @@ subroutine radaer_code( nlayers, & case( 'pvol_du_cor_ins' ) do k = 1, nlayers ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & - pvol_du_cor_ins( map_wth(1) + k ) + real( pvol_du_cor_ins( map_wth(1) + k ), r_um) end do case( 'null' ) @@ -1365,9 +1365,6 @@ subroutine radaer_code( nlayers, & ukca_modal_vol_um(1,k,(mode_ait_insol-1))=pvol_bc_ait_ins( map_wth(1) + k)+& pvol_om_ait_ins( map_wth(1) + k) - ukca_modal_vol_um(1,k,(mode_acc_insol-1))=pvol_du_acc_ins( map_wth(1) + k) - - ukca_modal_vol_um(1,k,(mode_cor_insol-1))=pvol_du_cor_ins( map_wth(1) + k) end do !-------------------------------------------------------------------------- From 4bf2d99a8976437f5314c12dff7aa6c2e569ac58 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Thu, 16 Jul 2026 15:39:53 +0100 Subject: [PATCH 04/14] run this to generate KGO changes --- .../source/kernel/radaer_kernel_mod.F90 | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index 9c0e7b3d83..66471bbe5d 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -1340,34 +1340,6 @@ subroutine radaer_code( nlayers, & end do - !-------------------------------------------------------------------------- - ! To determine if 32bit KGO change is from differences in addition order - do k = 1, nlayers - ukca_modal_vol_um(1,k,(mode_ait_sol-1)) = pvol_wat_ait_sol(map_wth(1) + k)+& - pvol_su_ait_sol( map_wth(1) + k)+& - pvol_bc_ait_sol( map_wth(1) + k)+& - pvol_om_ait_sol( map_wth(1) + k) - - ukca_modal_vol_um(1,k,(mode_acc_sol-1)) = pvol_wat_acc_sol(map_wth(1) + k)+& - pvol_su_acc_sol( map_wth(1) + k)+& - pvol_bc_acc_sol( map_wth(1) + k)+& - pvol_om_acc_sol( map_wth(1) + k)+& - pvol_ss_acc_sol( map_wth(1) + k) - ! add pvol_du_acc_sol if used - - ukca_modal_vol_um(1,k,(mode_cor_sol-1)) = pvol_wat_cor_sol(map_wth(1) + k)+& - pvol_su_cor_sol( map_wth(1) + k)+& - pvol_bc_cor_sol( map_wth(1) + k)+& - pvol_om_cor_sol( map_wth(1) + k)+& - pvol_ss_cor_sol( map_wth(1) + k) - ! add pvol_du_cor_sol if used - - ukca_modal_vol_um(1,k,(mode_ait_insol-1))=pvol_bc_ait_ins( map_wth(1) + k)+& - pvol_om_ait_ins( map_wth(1) + k) - - end do - !-------------------------------------------------------------------------- - ! -- ukca_modal_wtv_um -- n_fields = size(modal_wtv_names) allocate(ukca_modal_wtv_um(1, nlayers, n_fields)) From 80b50027366fcc1c1a2d83f9037d82263673eaa3 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Thu, 16 Jul 2026 15:45:52 +0100 Subject: [PATCH 05/14] point at a branch split from stable --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index fec9be9038..853b9bf2b7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -51,4 +51,4 @@ socrates-spectral: ukca: source: git@github.com:alanjhewitt/ukca.git - ref: radaer_api_ukca_side_2 + ref: radaer_api_ukca_side_3 From bafd4164cd6a55285e14ad6ddf87beb61243f236 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Thu, 16 Jul 2026 16:42:13 +0100 Subject: [PATCH 06/14] update checksums --- ...lim_gal9-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...l9_short-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...nwp_gal9-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...l9_debug-C12_azspice_gnu_full-debug-32bit.txt | 12 ++++++------ ...l9_short-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt | 16 ++++++++-------- ..._ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt | 16 ++++++++-------- ...xmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt | 16 ++++++++-------- ...m_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...lim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...lim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...tm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ..._gal9_debug-C12_ex1a_cce_full-debug-32bit.txt | 12 ++++++------ ..._gal9_short-C12_ex1a_cce_fast-debug-32bit.txt | 12 ++++++------ ...tm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ..._mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- 21 files changed, 148 insertions(+), 148 deletions(-) diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9-C12_azspice_gnu_fast-debug-32bit.txt index 0b0299a998..7d1bed21bc 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D552C2 -Inner product checksum theta = 518ED761 -Inner product checksum u = 6AF9062A -Inner product checksum mr1 = 3FE1FDDC -Inner product checksum mr2 = 3741AD00 -Inner product checksum mr3 = 351684B6 -Inner product checksum mr4 = 36A099BE +Inner product checksum rho = 46D55979 +Inner product checksum theta = 518EDEF7 +Inner product checksum u = 6AF88297 +Inner product checksum mr1 = 3FE19392 +Inner product checksum mr2 = 372026BC +Inner product checksum mr3 = 3523D7AD +Inner product checksum mr4 = 369F3800 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt index 5ac113daf6..a1098f5d89 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D6859D -Inner product checksum theta = 519A8C17 -Inner product checksum u = 6B2FD7B0 -Inner product checksum mr1 = 3FCB84C2 -Inner product checksum mr2 = 374F320C -Inner product checksum mr3 = 35DFD488 -Inner product checksum mr4 = 379DAF52 +Inner product checksum rho = 46D685A0 +Inner product checksum theta = 519A8C1B +Inner product checksum u = 6B2FD702 +Inner product checksum mr1 = 3FCB84EE +Inner product checksum mr2 = 3751C104 +Inner product checksum mr3 = 35E20B80 +Inner product checksum mr4 = 379DB486 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C12_azspice_gnu_fast-debug-32bit.txt index 1edfec4885..9894b99dd0 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D85B40 -Inner product checksum theta = 518CDD3B -Inner product checksum u = 6A887414 -Inner product checksum mr1 = 3FD09281 -Inner product checksum mr2 = 37B99628 -Inner product checksum mr3 = 3584EEC7 -Inner product checksum mr4 = 36E7D8E4 +Inner product checksum rho = 46D859DC +Inner product checksum theta = 518CDC1C +Inner product checksum u = 6A88E23B +Inner product checksum mr1 = 3FD0729F +Inner product checksum mr2 = 37C5C6DB +Inner product checksum mr3 = 35A04A80 +Inner product checksum mr4 = 3728BC35 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C12_azspice_gnu_full-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C12_azspice_gnu_full-debug-32bit.txt index 9a0596bbf4..70717756e7 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C12_azspice_gnu_full-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C12_azspice_gnu_full-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D824AF +Inner product checksum rho = 46D824B3 Inner product checksum theta = 51952836 -Inner product checksum u = 6AD01B78 -Inner product checksum mr1 = 3FC89112 -Inner product checksum mr2 = 37B07EAC -Inner product checksum mr3 = 35202152 -Inner product checksum mr4 = 36A0C43E +Inner product checksum u = 6AD01BC8 +Inner product checksum mr1 = 3FC89057 +Inner product checksum mr2 = 37AE72A3 +Inner product checksum mr3 = 351DF3B3 +Inner product checksum mr4 = 36A0B8A6 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt index 99bebb35d1..7ca9e14aea 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_short-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82C3B -Inner product checksum theta = 5194F750 -Inner product checksum u = 6AE733CA -Inner product checksum mr1 = 3FC8CCD0 -Inner product checksum mr2 = 37A62CA6 -Inner product checksum mr3 = 35563F53 -Inner product checksum mr4 = 371D117F +Inner product checksum rho = 46D82C3A +Inner product checksum theta = 5194F74E +Inner product checksum u = 6AE733E0 +Inner product checksum mr1 = 3FC8CC4C +Inner product checksum mr2 = 37A98C55 +Inner product checksum mr3 = 355B234C +Inner product checksum mr4 = 371CBA64 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt index 60fdd1bb0a..4032a047d7 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48399774 -Inner product checksum theta = 5135493E -Inner product checksum u = 612F454A -Inner product checksum mr1 = 4090F564 -Inner product checksum mr2 = 35AC3C55 -Inner product checksum mr3 = 2FA5F7C0 -Inner product checksum mr4 = 33F4FD5A -Inner product checksum mr5 = BEDD43D +Inner product checksum rho = 48399772 +Inner product checksum theta = 5135493D +Inner product checksum u = 612F4543 +Inner product checksum mr1 = 4090F583 +Inner product checksum mr2 = 35B8C8A6 +Inner product checksum mr3 = 2FA5F6B8 +Inner product checksum mr4 = 33F4FD6A +Inner product checksum mr5 = BEDD3C8 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt index d70fddbee3..67275182cd 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48399985 -Inner product checksum theta = 51354898 -Inner product checksum u = 612F4B6A -Inner product checksum mr1 = 40916361 -Inner product checksum mr2 = 3684D2A0 -Inner product checksum mr3 = 2FAD3D2F -Inner product checksum mr4 = 33F4FE0F -Inner product checksum mr5 = BF85CFF +Inner product checksum rho = 4839998F +Inner product checksum theta = 51354893 +Inner product checksum u = 612F4B5F +Inner product checksum mr1 = 4091642D +Inner product checksum mr2 = 3663B8A0 +Inner product checksum mr3 = 2FAD1046 +Inner product checksum mr4 = 33F4FE22 +Inner product checksum mr5 = BF85D9E Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt index 080a10a1b2..1e277fdd79 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48398C72 -Inner product checksum theta = 513542FA -Inner product checksum u = 612EE1C7 -Inner product checksum mr1 = 40910314 -Inner product checksum mr2 = 358600ED -Inner product checksum mr3 = 3000FB73 -Inner product checksum mr4 = 3404ABEC -Inner product checksum mr5 = C1462BB +Inner product checksum rho = 48398C70 +Inner product checksum theta = 513542F9 +Inner product checksum u = 612EE1CC +Inner product checksum mr1 = 409102B4 +Inner product checksum mr2 = 359368AB +Inner product checksum mr3 = 3000F84C +Inner product checksum mr4 = 3404AC2B +Inner product checksum mr5 = C1462B4 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt index 1815adb106..e966a1c44b 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D553CA -Inner product checksum theta = 518ECEB5 -Inner product checksum u = 6AFAE9D8 -Inner product checksum mr1 = 3FE14B20 -Inner product checksum mr2 = 370F9D84 -Inner product checksum mr3 = 3523C677 -Inner product checksum mr4 = 3696A781 +Inner product checksum rho = 46D55775 +Inner product checksum theta = 518ED500 +Inner product checksum u = 6AFB1CD9 +Inner product checksum mr1 = 3FE1E8EA +Inner product checksum mr2 = 3732F689 +Inner product checksum mr3 = 35344454 +Inner product checksum mr4 = 36A27A84 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt index aa9c625d7c..727e0bb115 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66E11 -Inner product checksum theta = 5193C464 -Inner product checksum u = 6B198006 -Inner product checksum mr1 = 3FCF858E -Inner product checksum mr2 = 373E2E9C -Inner product checksum mr3 = 3541A34C -Inner product checksum mr4 = 369B731D +Inner product checksum rho = 46D66E68 +Inner product checksum theta = 5193C440 +Inner product checksum u = 6B197844 +Inner product checksum mr1 = 3FCF742A +Inner product checksum mr2 = 3734EE31 +Inner product checksum mr3 = 35537800 +Inner product checksum mr4 = 36A327FE Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt index e0ac3a7f47..63e25c1177 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66D86 -Inner product checksum theta = 5193C44E -Inner product checksum u = 6B1966B5 -Inner product checksum mr1 = 3FCF8519 -Inner product checksum mr2 = 371FDDA6 -Inner product checksum mr3 = 35361069 -Inner product checksum mr4 = 368EFCD2 +Inner product checksum rho = 46D66D8E +Inner product checksum theta = 5193C42E +Inner product checksum u = 6B196EB6 +Inner product checksum mr1 = 3FCF7216 +Inner product checksum mr2 = 373287E4 +Inner product checksum mr3 = 3541E12E +Inner product checksum mr4 = 3691A10A Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt index 20dff69335..7fd628712a 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66D70 -Inner product checksum theta = 5193C3A6 -Inner product checksum u = 6B19E468 -Inner product checksum mr1 = 3FCF95B4 -Inner product checksum mr2 = 3739CE4A -Inner product checksum mr3 = 354B9996 -Inner product checksum mr4 = 369EF6F8 +Inner product checksum rho = 46D66D5F +Inner product checksum theta = 5193C3A0 +Inner product checksum u = 6B19E2AC +Inner product checksum mr1 = 3FCF93A8 +Inner product checksum mr2 = 373FA452 +Inner product checksum mr3 = 354D24EC +Inner product checksum mr4 = 36A32534 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt index ea9d93b3d5..b704b9f0af 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66E4F -Inner product checksum theta = 5193C380 -Inner product checksum u = 6B1A173A -Inner product checksum mr1 = 3FCF734B -Inner product checksum mr2 = 372C9D8C -Inner product checksum mr3 = 353F4872 -Inner product checksum mr4 = 36A0B05A +Inner product checksum rho = 46D66D9A +Inner product checksum theta = 5193C373 +Inner product checksum u = 6B19F546 +Inner product checksum mr1 = 3FCF92DF +Inner product checksum mr2 = 3734FF8E +Inner product checksum mr3 = 3554EF6E +Inner product checksum mr4 = 36A54306 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt index 99cb6e9cfd..1704ef5980 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D85C5F -Inner product checksum theta = 518CDBDC -Inner product checksum u = 6A888B76 -Inner product checksum mr1 = 3FD08F0A -Inner product checksum mr2 = 37C3A28B -Inner product checksum mr3 = 358A0008 -Inner product checksum mr4 = 37034B0F +Inner product checksum rho = 46D858F4 +Inner product checksum theta = 518CDA09 +Inner product checksum u = 6A88881E +Inner product checksum mr1 = 3FD08737 +Inner product checksum mr2 = 37BFC569 +Inner product checksum mr3 = 35A49EF0 +Inner product checksum mr4 = 371347AE Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt index e485be1736..924ec9b73c 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D813F2 -Inner product checksum theta = 518FB71F -Inner product checksum u = 6AF7C2FE -Inner product checksum mr1 = 3FCC0E8A -Inner product checksum mr2 = 37AE6078 -Inner product checksum mr3 = 34A914FC -Inner product checksum mr4 = 36D07B9B +Inner product checksum rho = 46D81429 +Inner product checksum theta = 518FB741 +Inner product checksum u = 6AF78146 +Inner product checksum mr1 = 3FCC0ABA +Inner product checksum mr2 = 37ABDC4A +Inner product checksum mr3 = 349FD984 +Inner product checksum mr4 = 36D68944 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt index ebad551374..64fabcb2e5 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D81424 -Inner product checksum theta = 518FB734 -Inner product checksum u = 6AF79FAB -Inner product checksum mr1 = 3FCC17AC -Inner product checksum mr2 = 37AE9140 -Inner product checksum mr3 = 349255F8 -Inner product checksum mr4 = 36CFEC88 +Inner product checksum rho = 46D8143E +Inner product checksum theta = 518FB717 +Inner product checksum u = 6AF797B9 +Inner product checksum mr1 = 3FCC0844 +Inner product checksum mr2 = 37A2E6D6 +Inner product checksum mr3 = 34BAF1E4 +Inner product checksum mr4 = 36D4F796 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C12_ex1a_cce_full-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C12_ex1a_cce_full-debug-32bit.txt index 10557ee538..95eceb2808 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C12_ex1a_cce_full-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C12_ex1a_cce_full-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D824C3 +Inner product checksum rho = 46D824BF Inner product checksum theta = 5195283B -Inner product checksum u = 6AD01B5F -Inner product checksum mr1 = 3FC894B8 -Inner product checksum mr2 = 37AFCAFA -Inner product checksum mr3 = 3520B790 -Inner product checksum mr4 = 36A0BEC3 +Inner product checksum u = 6AD01B88 +Inner product checksum mr1 = 3FC8949C +Inner product checksum mr2 = 37AFF7D6 +Inner product checksum mr3 = 3521848E +Inner product checksum mr4 = 36A0B7AA Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt index b63e7d9c44..07d41efa57 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82C2E +Inner product checksum rho = 46D82C30 Inner product checksum theta = 5194F74C -Inner product checksum u = 6AE739DF -Inner product checksum mr1 = 3FC8CA52 -Inner product checksum mr2 = 37A43F02 -Inner product checksum mr3 = 35571D4E -Inner product checksum mr4 = 371F5600 +Inner product checksum u = 6AE739A7 +Inner product checksum mr1 = 3FC8CAAE +Inner product checksum mr2 = 37A4A396 +Inner product checksum mr3 = 3558139A +Inner product checksum mr4 = 371FDBE0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt index 1d1d7b6f1b..5bcd3e4206 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 483997B2 +Inner product checksum rho = 483997B8 Inner product checksum theta = 51354962 -Inner product checksum u = 612F4912 -Inner product checksum mr1 = 4090FC04 -Inner product checksum mr2 = 35B167C4 -Inner product checksum mr3 = 2FA645AF -Inner product checksum mr4 = 33F4FE48 -Inner product checksum mr5 = BECFC33 +Inner product checksum u = 612F48FD +Inner product checksum mr1 = 4090FA95 +Inner product checksum mr2 = 35B41EA8 +Inner product checksum mr3 = 2FA64477 +Inner product checksum mr4 = 33F4FE31 +Inner product checksum mr5 = BECFCC0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt index d02beb6cb8..5aa6f5e28f 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 483997E0 -Inner product checksum theta = 5135494E -Inner product checksum u = 612F4984 -Inner product checksum mr1 = 409110E8 -Inner product checksum mr2 = 35E540AB -Inner product checksum mr3 = 2FA98AF3 -Inner product checksum mr4 = 33F4FF5D -Inner product checksum mr5 = BF18191 +Inner product checksum rho = 483997E6 +Inner product checksum theta = 5135494C +Inner product checksum u = 612F4981 +Inner product checksum mr1 = 40911010 +Inner product checksum mr2 = 35E7733C +Inner product checksum mr3 = 2FA83F7C +Inner product checksum mr4 = 33F4FF41 +Inner product checksum mr5 = BF17D84 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt index 4a1ddd9a11..dc68904044 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48398C6B +Inner product checksum rho = 48398C6A Inner product checksum theta = 51354302 -Inner product checksum u = 612EDCBC -Inner product checksum mr1 = 40910380 -Inner product checksum mr2 = 358489D6 -Inner product checksum mr3 = 3000F2CD -Inner product checksum mr4 = 3404AC27 -Inner product checksum mr5 = C14A272 +Inner product checksum u = 612EDCB6 +Inner product checksum mr1 = 4091033E +Inner product checksum mr2 = 358A714E +Inner product checksum mr3 = 3000FD12 +Inner product checksum mr4 = 3404AC81 +Inner product checksum mr5 = C14A273 Inner product checksum mr6 = 0 From 5a7b2a8c22e50418225cabac77f64185fe15e3ca Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Thu, 16 Jul 2026 18:25:33 +0100 Subject: [PATCH 07/14] should have run all group the first time --- ...9_chem-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ..._casim-C12_azspice_gnu_fast-debug-32bit.txt | 18 +++++++++--------- ..._coma9-C12_azspice_gnu_fast-debug-32bit.txt | 16 ++++++++-------- ...ph_dev-C12_azspice_gnu_fast-debug-32bit.txt | 16 ++++++++-------- ...al9-C48_MG_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...9-pert-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...ero-C48_MG_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...al9_da-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...bug-C48_MG_azspice_gnu_full-debug-32bit.txt | 10 +++++----- ...l9_eda-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...a_jada-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...l9_mol-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...era-C48_MG_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...rse-C48_MG_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...al9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt | 18 +++++++++--------- ...nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ...morph_dev-C12_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ...omorph_tb-C12_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ...p_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_2T-C48_MG_ex1a_cce_full-debug-32bit.txt | 14 +++++++------- ...al9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...e_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...readed-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...readed-C48_MG_ex1a_gnu_fast-debug-32bit.txt | 14 +++++++------- ...p_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ..._debug-C48_MG_ex1a_cce_full-debug-32bit.txt | 14 +++++++------- ..._gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ..._eda_jada-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ..._gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- 36 files changed, 259 insertions(+), 259 deletions(-) diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_chem-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_chem-C12_azspice_gnu_fast-debug-32bit.txt index 8de3d841d6..e67895d1c1 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_chem-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_clim_gal9_chem-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D5578A -Inner product checksum theta = 518ED8FB -Inner product checksum u = 6AF94DEC -Inner product checksum mr1 = 3FE1FD6A -Inner product checksum mr2 = 3736FE04 -Inner product checksum mr3 = 350C5B3F -Inner product checksum mr4 = 36AF8892 +Inner product checksum rho = 46D554C2 +Inner product checksum theta = 518ECFD5 +Inner product checksum u = 6AF92581 +Inner product checksum mr1 = 3FE1BB79 +Inner product checksum mr2 = 373366D4 +Inner product checksum mr3 = 351E9D22 +Inner product checksum mr4 = 369AC44C Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_casim-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_casim-C12_azspice_gnu_fast-debug-32bit.txt index 219515be2c..7e62dc572d 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_casim-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_casim-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D870E9 -Inner product checksum theta = 518CDC70 -Inner product checksum u = 6A8B6667 -Inner product checksum mr1 = 3FCC8CF3 -Inner product checksum mr2 = 3837FCDE -Inner product checksum mr3 = 35411158 -Inner product checksum mr4 = 369FE708 -Inner product checksum mr5 = 2EAC5C04 -Inner product checksum mr6 = 353FD98D +Inner product checksum rho = 46D8730B +Inner product checksum theta = 518CD7C0 +Inner product checksum u = 6A8C0970 +Inner product checksum mr1 = 3FCD52D2 +Inner product checksum mr2 = 38370FD3 +Inner product checksum mr3 = 3564D88A +Inner product checksum mr4 = 36B16C6A +Inner product checksum mr5 = 2F194230 +Inner product checksum mr6 = 355261C0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_coma9-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_coma9-C12_azspice_gnu_fast-debug-32bit.txt index 49ce1075f2..bb78531bd8 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_coma9-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_coma9-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D868F4 -Inner product checksum theta = 518CDD4D -Inner product checksum u = 6A871B9A -Inner product checksum mr1 = 3FD03689 -Inner product checksum mr2 = 37F037E4 -Inner product checksum mr3 = 379AA00B -Inner product checksum mr4 = 37A424D9 -Inner product checksum mr5 = 36A77130 +Inner product checksum rho = 46D86747 +Inner product checksum theta = 518CDA74 +Inner product checksum u = 6A87A65D +Inner product checksum mr1 = 3FD023CF +Inner product checksum mr2 = 37E620D6 +Inner product checksum mr3 = 379A7ACB +Inner product checksum mr4 = 37963896 +Inner product checksum mr5 = 36B7EFE4 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_comorph_dev-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_comorph_dev-C12_azspice_gnu_fast-debug-32bit.txt index 69521dedf0..ed8e813895 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_comorph_dev-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_comorph_dev-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D858B1 -Inner product checksum theta = 518CE449 -Inner product checksum u = 6A86DFFC -Inner product checksum mr1 = 3FD1B4B2 -Inner product checksum mr2 = 37ED7B41 -Inner product checksum mr3 = 377827F3 -Inner product checksum mr4 = 37BAAA06 -Inner product checksum mr5 = 36A37633 +Inner product checksum rho = 46D85998 +Inner product checksum theta = 518CE396 +Inner product checksum u = 6A8692AE +Inner product checksum mr1 = 3FD1F0D7 +Inner product checksum mr2 = 37DF1695 +Inner product checksum mr3 = 37889FDD +Inner product checksum mr4 = 37CAFB3B +Inner product checksum mr5 = 36AD422C Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C48_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C48_MG_azspice_gnu_fast-debug-32bit.txt index dee6d7e916..f7b3a2c0a5 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C48_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C48_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8018C -Inner product checksum theta = 5392FB13 -Inner product checksum u = 6A97BE9F -Inner product checksum mr1 = 41CCFFD6 -Inner product checksum mr2 = 39CE183C -Inner product checksum mr3 = 37AA2A89 -Inner product checksum mr4 = 395B8F94 +Inner product checksum rho = 48D8019C +Inner product checksum theta = 5392FB14 +Inner product checksum u = 6A97B22A +Inner product checksum mr1 = 41CD02F1 +Inner product checksum mr2 = 39CD4904 +Inner product checksum mr3 = 37A8A4A9 +Inner product checksum mr4 = 395D3F63 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-pert-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-pert-C12_azspice_gnu_fast-debug-32bit.txt index 74dbe45ef9..1787753874 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-pert-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-pert-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D83093 -Inner product checksum theta = 51946D1C -Inner product checksum u = 6B12D0D9 -Inner product checksum mr1 = 3FC8D0AC -Inner product checksum mr2 = 379C5134 -Inner product checksum mr3 = 3590547D -Inner product checksum mr4 = 378F98CC +Inner product checksum rho = 46D8308A +Inner product checksum theta = 51946D19 +Inner product checksum u = 6B12CF9D +Inner product checksum mr1 = 3FC8D48E +Inner product checksum mr2 = 379C1B98 +Inner product checksum mr3 = 35907C3A +Inner product checksum mr4 = 378FBCF2 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_azspice_gnu_fast-debug-32bit.txt index 78cd9367d5..f11a7c0dd5 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D80202 -Inner product checksum theta = 5392FB27 -Inner product checksum u = 6A97BD7E -Inner product checksum mr1 = 41CD0563 -Inner product checksum mr2 = 39CEF093 -Inner product checksum mr3 = 37A8FE76 -Inner product checksum mr4 = 395E85FC +Inner product checksum rho = 48D80216 +Inner product checksum theta = 5392FB20 +Inner product checksum u = 6A97BA73 +Inner product checksum mr1 = 41CD0373 +Inner product checksum mr2 = 39CEA5EF +Inner product checksum mr3 = 37ADA356 +Inner product checksum mr4 = 395D7408 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt index cbbf0e27dd..8c3ea9dbfa 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82088 -Inner product checksum theta = 518A7526 -Inner product checksum u = 6A8DA149 -Inner product checksum mr1 = 3FD3CCFA -Inner product checksum mr2 = 37CA11A6 -Inner product checksum mr3 = 35AC24B6 -Inner product checksum mr4 = 36DD326D +Inner product checksum rho = 46D82410 +Inner product checksum theta = 518A79DC +Inner product checksum u = 6A8C991B +Inner product checksum mr1 = 3FD43D53 +Inner product checksum mr2 = 37CEFE56 +Inner product checksum mr3 = 35B2F72F +Inner product checksum mr4 = 36D0DE45 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C48_MG_azspice_gnu_full-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C48_MG_azspice_gnu_full-debug-32bit.txt index 48df79180d..0450bd8443 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C48_MG_azspice_gnu_full-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_debug-C48_MG_azspice_gnu_full-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 48D81C6C Inner product checksum theta = 53952784 -Inner product checksum u = 6AA47E12 -Inner product checksum mr1 = 41C845F8 -Inner product checksum mr2 = 3999927E -Inner product checksum mr3 = 3779DAC2 -Inner product checksum mr4 = 392E263E +Inner product checksum u = 6AA47DEA +Inner product checksum mr1 = 41C845B8 +Inner product checksum mr2 = 3999D0E1 +Inner product checksum mr3 = 3778335A +Inner product checksum mr4 = 392E22C9 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt index ceb411dbae..2c6015f21e 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82484 -Inner product checksum theta = 518A5967 -Inner product checksum u = 6A910A4E -Inner product checksum mr1 = 3FD0AF5C -Inner product checksum mr2 = 37F05781 -Inner product checksum mr3 = 3594AAC6 -Inner product checksum mr4 = 36DC48BA +Inner product checksum rho = 46D82677 +Inner product checksum theta = 518A5918 +Inner product checksum u = 6A90BD46 +Inner product checksum mr1 = 3FD0E279 +Inner product checksum mr2 = 37D9CA8F +Inner product checksum mr3 = 359E5484 +Inner product checksum mr4 = 36E1AAEC Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt index 52ec8a2c7d..92a34489d9 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D8212F -Inner product checksum theta = 518A731A -Inner product checksum u = 6A8CF5FA -Inner product checksum mr1 = 3FD3A181 -Inner product checksum mr2 = 37DF77FC -Inner product checksum mr3 = 35A013C2 -Inner product checksum mr4 = 36B312FE +Inner product checksum rho = 46D82185 +Inner product checksum theta = 518A73C9 +Inner product checksum u = 6A8D698F +Inner product checksum mr1 = 3FD3E4E9 +Inner product checksum mr2 = 37CD050A +Inner product checksum mr3 = 35A154D4 +Inner product checksum mr4 = 36CBA41D Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_mol-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_mol-C12_azspice_gnu_fast-debug-32bit.txt index 21a46c6448..b93d155f0d 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_mol-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_mol-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D85E30 -Inner product checksum theta = 5193AF41 -Inner product checksum u = 6A86156B -Inner product checksum mr1 = 3FD04C1E -Inner product checksum mr2 = 37B337F6 -Inner product checksum mr3 = 3545CE28 -Inner product checksum mr4 = 36ECD0E0 +Inner product checksum rho = 46D86158 +Inner product checksum theta = 5193AF52 +Inner product checksum u = 6A85B2AF +Inner product checksum mr1 = 3FD07E63 +Inner product checksum mr2 = 37BAE553 +Inner product checksum mr3 = 354D8534 +Inner product checksum mr4 = 36C046E0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-C48_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-C48_MG_azspice_gnu_fast-debug-32bit.txt index 223e55a9fb..748b3f574e 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-C48_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-C48_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D818B2 -Inner product checksum theta = 53948CAD -Inner product checksum u = 6AA1D21A -Inner product checksum mr1 = 41C960BC -Inner product checksum mr2 = 39A9CFF3 -Inner product checksum mr3 = 37844180 -Inner product checksum mr4 = 3923F952 +Inner product checksum rho = 48D818B4 +Inner product checksum theta = 53948CA8 +Inner product checksum u = 6AA1D26B +Inner product checksum mr1 = 41C9617A +Inner product checksum mr2 = 39AA4FC1 +Inner product checksum mr3 = 378392B0 +Inner product checksum mr4 = 3922D3A5 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-coarse-C48_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-coarse-C48_MG_azspice_gnu_fast-debug-32bit.txt index 223e55a9fb..748b3f574e 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-coarse-C48_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_nudging-era-coarse-C48_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D818B2 -Inner product checksum theta = 53948CAD -Inner product checksum u = 6AA1D21A -Inner product checksum mr1 = 41C960BC -Inner product checksum mr2 = 39A9CFF3 -Inner product checksum mr3 = 37844180 -Inner product checksum mr4 = 3923F952 +Inner product checksum rho = 48D818B4 +Inner product checksum theta = 53948CA8 +Inner product checksum u = 6AA1D26B +Inner product checksum mr1 = 41C9617A +Inner product checksum mr2 = 39AA4FC1 +Inner product checksum mr3 = 378392B0 +Inner product checksum mr4 = 3922D3A5 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt index 6bc6e52e57..a5bf342d44 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D660E1 -Inner product checksum theta = 539A0A3B -Inner product checksum u = 6B127765 -Inner product checksum mr1 = 41CC3BE8 -Inner product checksum mr2 = 396B3CEF -Inner product checksum mr3 = 37C4C8DA -Inner product checksum mr4 = 394747CD +Inner product checksum rho = 48D660EE +Inner product checksum theta = 539A0A3D +Inner product checksum u = 6B127747 +Inner product checksum mr1 = 41CC3C18 +Inner product checksum mr2 = 3968D85C +Inner product checksum mr3 = 37C35903 +Inner product checksum mr4 = 39476FE6 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt index a7b72cb03a..82af0af7f3 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D660F4 -Inner product checksum theta = 539A0A42 -Inner product checksum u = 6B12765E -Inner product checksum mr1 = 41CC3E3B -Inner product checksum mr2 = 396BFB5A -Inner product checksum mr3 = 37C92E26 -Inner product checksum mr4 = 394763A2 +Inner product checksum rho = 48D660F2 +Inner product checksum theta = 539A0A40 +Inner product checksum u = 6B1277B9 +Inner product checksum mr1 = 41CC3D65 +Inner product checksum mr2 = 396ADFDE +Inner product checksum mr3 = 37C61CDF +Inner product checksum mr4 = 39477BA7 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt index 9309f7da94..a52cdbadf6 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D660F6 -Inner product checksum theta = 539A0A3C -Inner product checksum u = 6B12774C -Inner product checksum mr1 = 41CC3A36 -Inner product checksum mr2 = 3966A9D6 -Inner product checksum mr3 = 37C15DC4 -Inner product checksum mr4 = 3946083E +Inner product checksum rho = 48D660FB +Inner product checksum theta = 539A0A40 +Inner product checksum u = 6B127743 +Inner product checksum mr1 = 41CC3CC6 +Inner product checksum mr2 = 396A08DC +Inner product checksum mr3 = 37C64996 +Inner product checksum mr4 = 39468D56 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt index 578ea2b9fd..60d053edf1 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D55581 -Inner product checksum theta = 518ED2B5 -Inner product checksum u = 6AFB3227 -Inner product checksum mr1 = 3FE17762 -Inner product checksum mr2 = 3720F9CA -Inner product checksum mr3 = 35365C5C -Inner product checksum mr4 = 3690D5BE +Inner product checksum rho = 46D55CE2 +Inner product checksum theta = 518EDA64 +Inner product checksum u = 6AFA0B97 +Inner product checksum mr1 = 3FE1627D +Inner product checksum mr2 = 3726D046 +Inner product checksum mr3 = 353CA0C5 +Inner product checksum mr4 = 36B92A82 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt index be1a31281d..4c9b31ed8f 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D8710C -Inner product checksum theta = 518CD914 -Inner product checksum u = 6A8AFB8B -Inner product checksum mr1 = 3FCD851A -Inner product checksum mr2 = 3827840A -Inner product checksum mr3 = 356DE64E -Inner product checksum mr4 = 3697321A -Inner product checksum mr5 = 2E218564 -Inner product checksum mr6 = 35597E65 +Inner product checksum rho = 46D87253 +Inner product checksum theta = 518CDB51 +Inner product checksum u = 6A8B3F5C +Inner product checksum mr1 = 3FCCB9A6 +Inner product checksum mr2 = 382F8C8A +Inner product checksum mr3 = 35537DBB +Inner product checksum mr4 = 369C7042 +Inner product checksum mr5 = 2E8D7032 +Inner product checksum mr6 = 354A9D79 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt index c4a03fd2a8..1104f2d3fe 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D8692A -Inner product checksum theta = 518CDF94 -Inner product checksum u = 6A87F56D -Inner product checksum mr1 = 3FD0988D -Inner product checksum mr2 = 37E807AE -Inner product checksum mr3 = 37940152 -Inner product checksum mr4 = 379E9EA4 -Inner product checksum mr5 = 36AD8928 +Inner product checksum rho = 46D8680C +Inner product checksum theta = 518CDC46 +Inner product checksum u = 6A8817BE +Inner product checksum mr1 = 3FD0483F +Inner product checksum mr2 = 37EE50C5 +Inner product checksum mr3 = 379F6DD9 +Inner product checksum mr4 = 379E7D92 +Inner product checksum mr5 = 36AF1A27 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt index b829f48f9d..75095d69d8 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D85982 -Inner product checksum theta = 518CE388 -Inner product checksum u = 6A86EBB7 -Inner product checksum mr1 = 3FD1F86B -Inner product checksum mr2 = 37E77034 -Inner product checksum mr3 = 37817C8E -Inner product checksum mr4 = 37C0B965 -Inner product checksum mr5 = 36A437DA +Inner product checksum rho = 46D85A0E +Inner product checksum theta = 518CE3E8 +Inner product checksum u = 6A875E57 +Inner product checksum mr1 = 3FD1CBB8 +Inner product checksum mr2 = 37F0AFCB +Inner product checksum mr3 = 37853DF0 +Inner product checksum mr4 = 37D3206A +Inner product checksum mr5 = 36B1C48A Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt index 26eff6ad86..1ef8638202 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D87623 -Inner product checksum theta = 518CE954 -Inner product checksum u = 6A84C677 -Inner product checksum mr1 = 3FCEBC3D -Inner product checksum mr2 = 37ECEE7D -Inner product checksum mr3 = 37943DBB -Inner product checksum mr4 = 3761CF82 -Inner product checksum mr5 = 35FC2E2C +Inner product checksum rho = 46D87451 +Inner product checksum theta = 518CEAB4 +Inner product checksum u = 6A84E598 +Inner product checksum mr1 = 3FCEAA54 +Inner product checksum mr2 = 37F676C3 +Inner product checksum mr3 = 3785898E +Inner product checksum mr4 = 377EDD74 +Inner product checksum mr5 = 36081FEA Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt index ba79d7fde3..c3a2b69344 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D802A2 -Inner product checksum theta = 5392FAEE -Inner product checksum u = 6A97BE98 -Inner product checksum mr1 = 41CD11B6 -Inner product checksum mr2 = 39D29CF4 -Inner product checksum mr3 = 37ABEABC -Inner product checksum mr4 = 395797DC +Inner product checksum rho = 48D8026E +Inner product checksum theta = 5392FAF1 +Inner product checksum u = 6A97C948 +Inner product checksum mr1 = 41CD0BB2 +Inner product checksum mr2 = 39CEECFC +Inner product checksum mr3 = 37AA8952 +Inner product checksum mr4 = 395BCFA7 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt index 59f98ffff9..fc84e94dde 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D830AF -Inner product checksum theta = 51946D1A -Inner product checksum u = 6B12D2F4 -Inner product checksum mr1 = 3FC8D569 -Inner product checksum mr2 = 379F7E86 -Inner product checksum mr3 = 358B6A7C -Inner product checksum mr4 = 3792104C +Inner product checksum rho = 46D830A4 +Inner product checksum theta = 51946D18 +Inner product checksum u = 6B12D0C6 +Inner product checksum mr1 = 3FC8D4BE +Inner product checksum mr2 = 37A3BEF8 +Inner product checksum mr3 = 35912743 +Inner product checksum mr4 = 378EFDB6 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt index ba79d7fde3..c3a2b69344 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D802A2 -Inner product checksum theta = 5392FAEE -Inner product checksum u = 6A97BE98 -Inner product checksum mr1 = 41CD11B6 -Inner product checksum mr2 = 39D29CF4 -Inner product checksum mr3 = 37ABEABC -Inner product checksum mr4 = 395797DC +Inner product checksum rho = 48D8026E +Inner product checksum theta = 5392FAF1 +Inner product checksum u = 6A97C948 +Inner product checksum mr1 = 41CD0BB2 +Inner product checksum mr2 = 39CEECFC +Inner product checksum mr3 = 37AA8952 +Inner product checksum mr4 = 395BCFA7 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt index 9d3752b0a7..e53a0c8e26 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8027C -Inner product checksum theta = 5392FAE8 -Inner product checksum u = 6A97C83E -Inner product checksum mr1 = 41CD0E2D -Inner product checksum mr2 = 39CF4B62 -Inner product checksum mr3 = 37AED380 -Inner product checksum mr4 = 395C2AA8 +Inner product checksum rho = 48D802B2 +Inner product checksum theta = 5392FAF3 +Inner product checksum u = 6A97CD5E +Inner product checksum mr1 = 41CD1657 +Inner product checksum mr2 = 39CFF348 +Inner product checksum mr3 = 37A5B47C +Inner product checksum mr4 = 395BA2F6 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_full-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_full-debug-32bit.txt index 7f1e51d433..f26c63a9f9 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_full-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_full-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D801A6 -Inner product checksum theta = 5392FB09 -Inner product checksum u = 6A97BA3E -Inner product checksum mr1 = 41CD0CA7 -Inner product checksum mr2 = 39CB19BA -Inner product checksum mr3 = 37A9F1CA -Inner product checksum mr4 = 395853D0 +Inner product checksum rho = 48D801A2 +Inner product checksum theta = 5392FB15 +Inner product checksum u = 6A97BE16 +Inner product checksum mr1 = 41CD0EA6 +Inner product checksum mr2 = 39CD5354 +Inner product checksum mr3 = 37A6FC56 +Inner product checksum mr4 = 395B6BB2 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt index c2e697ee79..2c1caf9abf 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D802A2 -Inner product checksum theta = 5392FB04 -Inner product checksum u = 6A97BC6C -Inner product checksum mr1 = 41CD1036 -Inner product checksum mr2 = 39CE3BA5 -Inner product checksum mr3 = 37AC6552 -Inner product checksum mr4 = 3957937E +Inner product checksum rho = 48D8027B +Inner product checksum theta = 5392FAF7 +Inner product checksum u = 6A97C214 +Inner product checksum mr1 = 41CD0C8C +Inner product checksum mr2 = 39CFE7EA +Inner product checksum mr3 = 37A6F0D9 +Inner product checksum mr4 = 395B3778 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt index edfe0be655..41b9b4da97 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8031D -Inner product checksum theta = 5392FB13 -Inner product checksum u = 6A97C2A5 -Inner product checksum mr1 = 41CD07A8 -Inner product checksum mr2 = 39CFD168 -Inner product checksum mr3 = 37AB6032 -Inner product checksum mr4 = 3958F610 +Inner product checksum rho = 48D8033C +Inner product checksum theta = 5392FB0E +Inner product checksum u = 6A97C759 +Inner product checksum mr1 = 41CD0B58 +Inner product checksum mr2 = 39CE99BE +Inner product checksum mr3 = 37A8F42E +Inner product checksum mr4 = 395D16B4 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt index 1e37c7be49..72446a938f 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D80106 -Inner product checksum theta = 5392FB2E -Inner product checksum u = 6A97BF93 -Inner product checksum mr1 = 41CCE6F0 -Inner product checksum mr2 = 39D2731B -Inner product checksum mr3 = 37A94579 -Inner product checksum mr4 = 39714EC6 +Inner product checksum rho = 48D80122 +Inner product checksum theta = 5392FB58 +Inner product checksum u = 6A97BFFA +Inner product checksum mr1 = 41CCE649 +Inner product checksum mr2 = 39CCF794 +Inner product checksum mr3 = 37AE187D +Inner product checksum mr4 = 3970A2E9 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_gnu_fast-debug-32bit.txt index 1a865c06cf..5ffd9fc0e3 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8000F -Inner product checksum theta = 5392FB21 -Inner product checksum u = 6A97B84A -Inner product checksum mr1 = 41CCE7B3 -Inner product checksum mr2 = 39D0975E -Inner product checksum mr3 = 37A94691 -Inner product checksum mr4 = 396E515C +Inner product checksum rho = 48D7FFD9 +Inner product checksum theta = 5392FB25 +Inner product checksum u = 6A97BB18 +Inner product checksum mr1 = 41CCEC0C +Inner product checksum mr2 = 39D16D01 +Inner product checksum mr3 = 37AD13C3 +Inner product checksum mr4 = 396F8671 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt index 1420b16ba3..69b58643f7 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D8216E -Inner product checksum theta = 518A762E -Inner product checksum u = 6A8CF11F -Inner product checksum mr1 = 3FD4046A -Inner product checksum mr2 = 37BF14E4 -Inner product checksum mr3 = 35A66CBD -Inner product checksum mr4 = 3702B356 +Inner product checksum rho = 46D820BC +Inner product checksum theta = 518A7848 +Inner product checksum u = 6A8D03E5 +Inner product checksum mr1 = 3FD3E2AE +Inner product checksum mr2 = 37BB3D6D +Inner product checksum mr3 = 35A97B9A +Inner product checksum mr4 = 36CCD7F7 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C48_MG_ex1a_cce_full-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C48_MG_ex1a_cce_full-debug-32bit.txt index c2ca2273d3..3f3506c464 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C48_MG_ex1a_cce_full-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_debug-C48_MG_ex1a_cce_full-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D81C6A -Inner product checksum theta = 53952785 -Inner product checksum u = 6AA47DEC -Inner product checksum mr1 = 41C845DD -Inner product checksum mr2 = 3999D1AC -Inner product checksum mr3 = 377ACE28 -Inner product checksum mr4 = 392E3B81 +Inner product checksum rho = 48D81C6C +Inner product checksum theta = 53952784 +Inner product checksum u = 6AA47E0C +Inner product checksum mr1 = 41C845C6 +Inner product checksum mr2 = 399A0803 +Inner product checksum mr3 = 377A3109 +Inner product checksum mr4 = 392E201B Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt index 78bb876a0a..9f10f40e80 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82302 -Inner product checksum theta = 518A5565 -Inner product checksum u = 6A906F5F -Inner product checksum mr1 = 3FD0FD62 -Inner product checksum mr2 = 37E31AEA -Inner product checksum mr3 = 35A29AA7 -Inner product checksum mr4 = 36FC0A34 +Inner product checksum rho = 46D82261 +Inner product checksum theta = 518A5400 +Inner product checksum u = 6A90C2C4 +Inner product checksum mr1 = 3FD0D366 +Inner product checksum mr2 = 37CA793A +Inner product checksum mr3 = 35BE669E +Inner product checksum mr4 = 36F32438 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt index d5cb4ee56c..53c1d065d9 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82272 -Inner product checksum theta = 518A76EA -Inner product checksum u = 6A8CA7C6 -Inner product checksum mr1 = 3FD3D711 -Inner product checksum mr2 = 37B76C73 -Inner product checksum mr3 = 35A34C22 -Inner product checksum mr4 = 36DDD026 +Inner product checksum rho = 46D823E7 +Inner product checksum theta = 518A73B8 +Inner product checksum u = 6A8CD920 +Inner product checksum mr1 = 3FD3D23D +Inner product checksum mr2 = 37C61BA2 +Inner product checksum mr3 = 35AC49AA +Inner product checksum mr4 = 3709B4E9 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt index 8eff44da85..69c75f4be0 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D85F86 -Inner product checksum theta = 5193AFF4 -Inner product checksum u = 6A85CBD0 -Inner product checksum mr1 = 3FD062C8 -Inner product checksum mr2 = 37A81340 -Inner product checksum mr3 = 352DDFB0 -Inner product checksum mr4 = 36CCECD8 +Inner product checksum rho = 46D85D7F +Inner product checksum theta = 5193AF5E +Inner product checksum u = 6A85EBDE +Inner product checksum mr1 = 3FD05992 +Inner product checksum mr2 = 37AA84DD +Inner product checksum mr3 = 3527D888 +Inner product checksum mr4 = 36C16B40 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 From 4b12ec28d2b156701859793b411f8b57aba5b715 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Mon, 27 Jul 2026 11:40:22 +0100 Subject: [PATCH 08/14] Ian suggested change --- .../source/kernel/radaer_kernel_mod.F90 | 458 +++++++++--------- 1 file changed, 229 insertions(+), 229 deletions(-) diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index 66471bbe5d..b45413782b 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -542,42 +542,42 @@ subroutine radaer_code( nlayers, & integer(i_um) :: ncp_max_x_nmodes ! pressure on theta levels - real(r_um),dimension( row_length, rows, nlayers ) :: p_theta_levels_um + real(r_um),dimension( row_length, rows, nlayers ) :: p_theta_levels ! temperature on theta levels - real(r_um),dimension( row_length, rows, nlayers ) :: t_theta_levels_um + real(r_um),dimension( row_length, rows, nlayers ) :: t_theta_levels ! d_mass on theta levels - real(r_um),dimension( row_length, rows, nlayers ) :: d_mass_theta_levels_um + real(r_um),dimension( row_length, rows, nlayers ) :: d_mass_theta_levels ! Allocation of arrays - real(r_um), allocatable :: ukca_comp_vol_um(:,:,:) - real(r_um), allocatable :: ukca_mix_ratio_um(:,:,:) - real(r_um), allocatable :: ukca_dry_diam_um(:,:,:) - real(r_um), allocatable :: ukca_wet_diam_um(:,:,:) - real(r_um), allocatable :: ukca_modal_nbr_um(:,:,:) - real(r_um), allocatable :: ukca_modal_rho_um(:,:,:) - real(r_um), allocatable :: ukca_modal_vol_um(:,:,:) - real(r_um), allocatable :: ukca_modal_wtv_um(:,:,:) - - real(r_um), allocatable :: ukca_mode_mix_ratio_um(:,:,:) - - real(r_um), allocatable :: aer_lw_absorption_um(:,:,:,:) - real(r_um), allocatable :: aer_lw_scattering_um(:,:,:,:) - real(r_um), allocatable :: aer_lw_asymmetry_um(:,:,:,:) - real(r_um), allocatable :: aer_sw_absorption_um(:,:,:,:) - real(r_um), allocatable :: aer_sw_scattering_um(:,:,:,:) - real(r_um), allocatable :: aer_sw_asymmetry_um(:,:,:,:) - real(r_um), allocatable :: aod_ukca_all_modes_um(:,:,:) - real(r_um), allocatable :: sod_ukca_all_modes_um(:,:,:) - real(r_um), allocatable :: aaod_ukca_all_modes_um(:,:,:) + real(r_um), allocatable :: ukca_comp_vol(:,:,:) + real(r_um), allocatable :: ukca_mix_ratio(:,:,:) + real(r_um), allocatable :: ukca_dry_diam(:,:,:) + real(r_um), allocatable :: ukca_wet_diam(:,:,:) + real(r_um), allocatable :: ukca_modal_nbr(:,:,:) + real(r_um), allocatable :: ukca_modal_rho(:,:,:) + real(r_um), allocatable :: ukca_modal_vol(:,:,:) + real(r_um), allocatable :: ukca_modal_wtv(:,:,:) + + real(r_um), allocatable :: ukca_mode_mix_ratio(:,:,:) + + real(r_um), allocatable :: aer_lw_absorption(:,:,:,:) + real(r_um), allocatable :: aer_lw_scattering(:,:,:,:) + real(r_um), allocatable :: aer_lw_asymmetry(:,:,:,:) + real(r_um), allocatable :: aer_sw_absorption(:,:,:,:) + real(r_um), allocatable :: aer_sw_scattering(:,:,:,:) + real(r_um), allocatable :: aer_sw_asymmetry(:,:,:,:) + real(r_um), allocatable :: aod_ukca_all_modes(:,:,:) + real(r_um), allocatable :: sod_ukca_all_modes(:,:,:) + real(r_um), allocatable :: aaod_ukca_all_modes(:,:,:) ! By convention, arrays are inverted in UM radiation code ! Since we are calling from LFRic, arrays will not be inverted ! This matters for determining whether a level is above the tropopause logical, parameter :: l_inverted = .false. - integer(i_um) :: trindxrad_um( row_length * rows ) + integer(i_um) :: trindxrad( row_length * rows ) ! Variables close to but not exactly 1 or -1 for bounding asymmetry real(r_def), parameter :: one_minus_eps = 1.0_r_def - epsilon(1.0_r_def) @@ -586,12 +586,12 @@ subroutine radaer_code( nlayers, & !----------------------------------------------------------------------- ! UKCA modal optical depth diagnostics: full column - real(r_um) :: aod_ukca_this_mode_um( row_length*rows, npd_ukca_aod_wavel ) + real(r_um) :: aod_ukca_this_mode( row_length*rows, npd_ukca_aod_wavel ) ! Not yet included as diagnostic ! UKCA modal optical depth diagnostics: stratosphere - real(r_um) :: sod_ukca_this_mode_um( row_length*rows, npd_ukca_aod_wavel ) + real(r_um) :: sod_ukca_this_mode( row_length*rows, npd_ukca_aod_wavel ) ! UKCA modal absorption optical depth diagnostics: full column - real(r_um) :: aaod_ukca_this_mode_um( row_length*rows, npd_ukca_aod_wavel ) + real(r_um) :: aaod_ukca_this_mode( row_length*rows, npd_ukca_aod_wavel ) !----------------------------------------------------------------------- @@ -607,7 +607,7 @@ subroutine radaer_code( nlayers, & logical :: l_aaod_ukca_acc_ins logical :: l_aod_ukca_cor_ins logical :: l_aaod_ukca_cor_ins - logical :: l_any_lit_points_um + logical :: l_any_lit_points !----------------------------------------------------------------------- @@ -738,7 +738,7 @@ subroutine radaer_code( nlayers, & ! Note that this is inverted compared to the UM ! This will be dealt with in ukca_radaer_band_average - trindxrad_um(1) = trop_level( map_2d(1) ) + trindxrad(1) = trop_level( map_2d(1) ) !----------------------------------------------------------------------- ! Populate ukca_radaer element arrays @@ -760,219 +760,219 @@ subroutine radaer_code( nlayers, & !----------------------------------------------------------------------- ! Allocation of arrays - allocate( ukca_mode_mix_ratio_um( 1, nlayers, n_radaer_mode ) ) - allocate( aer_lw_absorption_um( 1, nlayers, n_radaer_mode, n_lw_band ) ) - allocate( aer_lw_scattering_um( 1, nlayers, n_radaer_mode, n_lw_band ) ) - allocate( aer_lw_asymmetry_um( 1, nlayers, n_radaer_mode, n_lw_band ) ) - allocate( aer_sw_absorption_um( 1, nlayers, n_radaer_mode, n_sw_band ) ) - allocate( aer_sw_scattering_um( 1, nlayers, n_radaer_mode, n_sw_band ) ) - allocate( aer_sw_asymmetry_um( 1, nlayers, n_radaer_mode, n_sw_band ) ) - allocate( aod_ukca_all_modes_um( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) - allocate( sod_ukca_all_modes_um( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) - allocate( aaod_ukca_all_modes_um( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) + allocate( ukca_mode_mix_ratio( 1, nlayers, n_radaer_mode ) ) + allocate( aer_lw_absorption( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_lw_scattering( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_lw_asymmetry( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_sw_absorption( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aer_sw_scattering( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aer_sw_asymmetry( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aod_ukca_all_modes( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) + allocate( sod_ukca_all_modes( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) + allocate( aaod_ukca_all_modes( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) !----------------------------------------------------------------------- ! Segmentation and openmp would start here !----------------------------------------------------------------------- ! Whether we need to run shortwave band_average because lit or not - l_any_lit_points_um = .false. + l_any_lit_points = .false. if ( n_radaer_step > 1 ) then - l_any_lit_points_um = .true. + l_any_lit_points = .true. else if ( lit_fraction( map_2d(1) ) > 0.0_r_def ) then - l_any_lit_points_um = .true. + l_any_lit_points = .true. end if end if ! Note that this is inverted compared to the UM ! This will be dealt with in ukca_radaer_band_average - trindxrad_um(1) = trop_level( map_2d(1) ) + trindxrad(1) = trop_level( map_2d(1) ) !----------------------------------------------------------------------- ! Initialisation of prognostic variables and arrays !----------------------------------------------------------------------- do k = 1, nlayers - p_theta_levels_um(1,1,k) = p_zero * & + p_theta_levels(1,1,k) = p_zero * & ( exner_in_wth(map_wth(1) + k) )**(1.0_r_um/kappa) end do do k = 1, nlayers - t_theta_levels_um(1,1,k) = exner_in_wth(map_wth(1) + k) * & + t_theta_levels(1,1,k) = exner_in_wth(map_wth(1) + k) * & theta_in_wth(map_wth(1) + k) end do !----------------------------------------------------------------------- - ! -- ukca_comp_vol_um -- + ! -- ukca_comp_vol -- n_fields = size(pvol_comp_names) - allocate(ukca_comp_vol_um(n_fields, 1, nlayers)) - ukca_comp_vol_um = 0.0_r_um + allocate(ukca_comp_vol(n_fields, 1, nlayers)) + ukca_comp_vol = 0.0_r_um do m = 1, n_fields select case(trim(pvol_comp_names(m))) case('fldname_pvol_su_ait_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_su_ait_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_su_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_bc_ait_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_bc_ait_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_bc_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_om_ait_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_om_ait_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_om_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_su_acc_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_su_acc_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_su_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_bc_acc_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_bc_acc_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_bc_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_om_acc_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_om_acc_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_om_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_ss_acc_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_ss_acc_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_ss_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_du_acc_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= 0.0_r_um + ukca_comp_vol(m, 1, k)= 0.0_r_um end do case('fldname_pvol_su_cor_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_su_cor_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_su_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_bc_cor_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_bc_cor_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_bc_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_om_cor_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_om_cor_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_om_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_ss_cor_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_ss_cor_sol(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_ss_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_du_cor_sol') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= 0.0_r_um + ukca_comp_vol(m, 1, k)= 0.0_r_um end do case('fldname_pvol_bc_ait_ins') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_bc_ait_ins(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_bc_ait_ins(map_wth(1) + k), r_um ) end do case('fldname_pvol_om_ait_ins') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_om_ait_ins(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_om_ait_ins(map_wth(1) + k), r_um ) end do case('fldname_pvol_du_acc_ins') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_du_acc_ins(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_du_acc_ins(map_wth(1) + k), r_um ) end do case('fldname_pvol_du_cor_ins') do k = 1, nlayers - ukca_comp_vol_um(m, 1, k)= real( pvol_du_cor_ins(map_wth(1) + k), r_um ) + ukca_comp_vol(m, 1, k)= real( pvol_du_cor_ins(map_wth(1) + k), r_um ) end do case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_comp_vol_um : ', pvol_comp_names(m) + 'Missing required ukca_comp_vol : ', pvol_comp_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do - ! -- ukca_mix_ratio_um -- + ! -- ukca_mix_ratio -- n_fields = size(comp_names) - allocate(ukca_mix_ratio_um(n_fields, 1, nlayers)) - ukca_mix_ratio_um = 0.0_r_um + allocate(ukca_mix_ratio(n_fields, 1, nlayers)) + ukca_mix_ratio = 0.0_r_um do m = 1, n_fields select case(trim(comp_names(m))) case('fldname_ait_sol_su') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( ait_sol_su(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( ait_sol_su(map_wth(1) + k), r_um ) end do case('fldname_ait_sol_bc') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( ait_sol_bc(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( ait_sol_bc(map_wth(1) + k), r_um ) end do case('fldname_ait_sol_om') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( ait_sol_om(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( ait_sol_om(map_wth(1) + k), r_um ) end do case('fldname_acc_sol_su') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( acc_sol_su(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( acc_sol_su(map_wth(1) + k), r_um ) end do case('fldname_acc_sol_bc') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( acc_sol_bc(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( acc_sol_bc(map_wth(1) + k), r_um ) end do case('fldname_acc_sol_om') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( acc_sol_om(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( acc_sol_om(map_wth(1) + k), r_um ) end do case('fldname_acc_sol_ss') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( acc_sol_ss(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( acc_sol_ss(map_wth(1) + k), r_um ) end do case('fldname_acc_sol_du') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = 0.0_r_um + ukca_mix_ratio(m, 1, k) = 0.0_r_um end do case('fldname_cor_sol_su') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( cor_sol_su(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( cor_sol_su(map_wth(1) + k), r_um ) end do case('fldname_cor_sol_bc') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( cor_sol_bc(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( cor_sol_bc(map_wth(1) + k), r_um ) end do case('fldname_cor_sol_om') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( cor_sol_om(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( cor_sol_om(map_wth(1) + k), r_um ) end do case('fldname_cor_sol_ss') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( cor_sol_ss(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( cor_sol_ss(map_wth(1) + k), r_um ) end do case('fldname_cor_sol_du') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = 0.0_r_um + ukca_mix_ratio(m, 1, k) = 0.0_r_um end do case('fldname_ait_ins_bc') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( ait_ins_bc(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( ait_ins_bc(map_wth(1) + k), r_um ) end do case('fldname_ait_ins_om') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( ait_ins_om(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( ait_ins_om(map_wth(1) + k), r_um ) end do case('fldname_acc_ins_du') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( acc_ins_du(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( acc_ins_du(map_wth(1) + k), r_um ) end do case('fldname_cor_ins_du') do k = 1, nlayers - ukca_mix_ratio_um(m, 1, k) = real( cor_ins_du(map_wth(1) + k), r_um ) + ukca_mix_ratio(m, 1, k) = real( cor_ins_du(map_wth(1) + k), r_um ) end do case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_mix_ratio_um : ', comp_names(m) + 'Missing required ukca_mix_ratio : ', comp_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do - ! -- ukca_modal_nbr_um -- + ! -- ukca_modal_nbr -- n_fields = size(mode_names) - allocate(ukca_modal_nbr_um(1, nlayers, n_fields)) - ukca_modal_nbr_um = 0.0_r_um + allocate(ukca_modal_nbr(1, nlayers, n_fields)) + ukca_modal_nbr = 0.0_r_um do m = 1, n_fields select case(trim(mode_names(m))) @@ -982,115 +982,115 @@ subroutine radaer_code( nlayers, & call log_event( log_scratch_space, LOG_LEVEL_ERROR ) case('fldname_n_ait_sol') do k = 1, nlayers - ukca_modal_nbr_um(1, k, m) = real( n_ait_sol(map_wth(1) + k), r_um ) + ukca_modal_nbr(1, k, m) = real( n_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_n_acc_sol') do k = 1, nlayers - ukca_modal_nbr_um(1, k, m) = real( n_acc_sol(map_wth(1) + k), r_um ) + ukca_modal_nbr(1, k, m) = real( n_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_n_cor_sol') do k = 1, nlayers - ukca_modal_nbr_um(1, k, m) = real( n_cor_sol(map_wth(1) + k), r_um ) + ukca_modal_nbr(1, k, m) = real( n_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_n_ait_ins') do k = 1, nlayers - ukca_modal_nbr_um(1, k, m) = real( n_ait_ins(map_wth(1) + k), r_um ) + ukca_modal_nbr(1, k, m) = real( n_ait_ins(map_wth(1) + k), r_um ) end do case('fldname_n_acc_ins') do k = 1, nlayers - ukca_modal_nbr_um(1, k, m) = real( n_acc_ins(map_wth(1) + k), r_um ) + ukca_modal_nbr(1, k, m) = real( n_acc_ins(map_wth(1) + k), r_um ) end do case('fldname_n_cor_ins') do k = 1, nlayers - ukca_modal_nbr_um(1, k, m) = real( n_cor_ins(map_wth(1) + k), r_um ) + ukca_modal_nbr(1, k, m) = real( n_cor_ins(map_wth(1) + k), r_um ) end do case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_nbr_um : ', mode_names(m) + 'Missing required ukca_modal_nbr : ', mode_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do - ! -- ukca_modal_rho_um -- + ! -- ukca_modal_rho -- n_fields = size(rhopar_mode_names) - allocate(ukca_modal_rho_um(1, nlayers, n_fields)) - ukca_modal_rho_um = 0.0_r_um + allocate(ukca_modal_rho(1, nlayers, n_fields)) + ukca_modal_rho = 0.0_r_um do m = 1, n_fields select case(trim(rhopar_mode_names(m))) case('fldname_rhopar_ait_sol') do k = 1, nlayers - ukca_modal_rho_um(1, k, m)= real( rhopar_ait_sol(map_wth(1) + k), r_um ) + ukca_modal_rho(1, k, m)= real( rhopar_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_rhopar_acc_sol') do k = 1, nlayers - ukca_modal_rho_um(1, k, m)= real( rhopar_acc_sol(map_wth(1) + k), r_um ) + ukca_modal_rho(1, k, m)= real( rhopar_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_rhopar_cor_sol') do k = 1, nlayers - ukca_modal_rho_um(1, k, m)= real( rhopar_cor_sol(map_wth(1) + k), r_um ) + ukca_modal_rho(1, k, m)= real( rhopar_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_rhopar_ait_ins') do k = 1, nlayers - ukca_modal_rho_um(1, k, m)= real( rhopar_ait_ins(map_wth(1) + k), r_um ) + ukca_modal_rho(1, k, m)= real( rhopar_ait_ins(map_wth(1) + k), r_um ) end do case('fldname_rhopar_acc_ins') do k = 1, nlayers - ukca_modal_rho_um(1, k, m)= real( rhopar_acc_ins(map_wth(1) + k), r_um ) + ukca_modal_rho(1, k, m)= real( rhopar_acc_ins(map_wth(1) + k), r_um ) end do case('fldname_rhopar_cor_ins') do k = 1, nlayers - ukca_modal_rho_um(1, k, m)= real( rhopar_cor_ins(map_wth(1) + k), r_um ) + ukca_modal_rho(1, k, m)= real( rhopar_cor_ins(map_wth(1) + k), r_um ) end do case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_nbr_um : ', rhopar_mode_names(m) + 'Missing required ukca_modal_nbr : ', rhopar_mode_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do - ! -- ukca_dry_diam_um -- + ! -- ukca_dry_diam -- n_fields = size(dry_diam_mode_names) - allocate(ukca_dry_diam_um(1, nlayers, n_fields)) - ukca_dry_diam_um = 0.0_r_um + allocate(ukca_dry_diam(1, nlayers, n_fields)) + ukca_dry_diam = 0.0_r_um do m = 1, n_fields select case(trim(dry_diam_mode_names(m))) case('fldname_drydp_ait_sol') do k = 1, nlayers - ukca_dry_diam_um(1, k, m) = real( drydp_ait_sol(map_wth(1) + k), r_um ) + ukca_dry_diam(1, k, m) = real( drydp_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_drydp_acc_sol') do k = 1, nlayers - ukca_dry_diam_um(1, k, m) = real( drydp_acc_sol(map_wth(1) + k), r_um ) + ukca_dry_diam(1, k, m) = real( drydp_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_drydp_cor_sol') do k = 1, nlayers - ukca_dry_diam_um(1, k, m) = real( drydp_cor_sol(map_wth(1) + k), r_um ) + ukca_dry_diam(1, k, m) = real( drydp_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_drydp_ait_ins') do k = 1, nlayers - ukca_dry_diam_um(1, k, m) = real( drydp_ait_ins(map_wth(1) + k), r_um ) + ukca_dry_diam(1, k, m) = real( drydp_ait_ins(map_wth(1) + k), r_um ) end do case('fldname_drydp_acc_ins') do k = 1, nlayers - ukca_dry_diam_um(1, k, m) = real( drydp_acc_ins(map_wth(1) + k), r_um ) + ukca_dry_diam(1, k, m) = real( drydp_acc_ins(map_wth(1) + k), r_um ) end do case('fldname_drydp_cor_ins') do k = 1, nlayers - ukca_dry_diam_um(1, k, m) = real( drydp_cor_ins(map_wth(1) + k), r_um ) + ukca_dry_diam(1, k, m) = real( drydp_cor_ins(map_wth(1) + k), r_um ) end do case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_dry_diam_um : ', dry_diam_mode_names(m) + 'Missing required ukca_dry_diam : ', dry_diam_mode_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do - ! -- ukca_modal_vol_um -- + ! -- ukca_modal_vol -- n_fields = size(modal_volume_names) - allocate(ukca_modal_vol_um(1, nlayers, n_fields)) - ukca_modal_vol_um = 0.0_r_um + allocate(ukca_modal_vol(1, nlayers, n_fields)) + ukca_modal_vol = 0.0_r_um do m = 1, n_fields @@ -1106,25 +1106,25 @@ subroutine radaer_code( nlayers, & case( 'pvol_wat_ait_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_wat_ait_sol( map_wth(1) + k ), r_um) end do case( 'pvol_su_ait_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_su_ait_sol( map_wth(1) + k ), r_um) end do case( 'pvol_bc_ait_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_bc_ait_sol( map_wth(1) + k ), r_um) end do case( 'pvol_om_ait_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_om_ait_sol( map_wth(1) + k ), r_um) end do @@ -1136,7 +1136,7 @@ subroutine radaer_code( nlayers, & case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_vol_um : ', ait_sol_volume_names(mm) + 'Missing required ukca_modal_vol : ', ait_sol_volume_names(mm) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select @@ -1150,31 +1150,31 @@ subroutine radaer_code( nlayers, & select case( trim( acc_sol_volume_names(mm) ) ) case( 'pvol_wat_acc_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_wat_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_su_acc_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_su_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_bc_acc_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_bc_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_om_acc_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_om_acc_sol( map_wth(1) + k ), r_um) end do case( 'pvol_ss_acc_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_ss_acc_sol( map_wth(1) + k ), r_um) end do @@ -1186,7 +1186,7 @@ subroutine radaer_code( nlayers, & case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_vol_um : ', acc_sol_volume_names(mm) + 'Missing required ukca_modal_vol : ', acc_sol_volume_names(mm) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select @@ -1200,31 +1200,31 @@ subroutine radaer_code( nlayers, & select case( trim( cor_sol_volume_names(mm) ) ) case( 'pvol_wat_cor_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_wat_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_su_cor_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_su_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_bc_cor_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_bc_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_om_cor_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_om_cor_sol( map_wth(1) + k ), r_um) end do case( 'pvol_ss_cor_sol' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_ss_cor_sol( map_wth(1) + k ), r_um) end do @@ -1236,7 +1236,7 @@ subroutine radaer_code( nlayers, & case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_vol_um : ', cor_sol_volume_names(mm) + 'Missing required ukca_modal_vol : ', cor_sol_volume_names(mm) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select @@ -1252,13 +1252,13 @@ subroutine radaer_code( nlayers, & case( 'pvol_bc_ait_ins' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_bc_ait_ins( map_wth(1) + k ), r_um) end do case( 'pvol_om_ait_ins' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_om_ait_ins( map_wth(1) + k ), r_um) end do @@ -1270,7 +1270,7 @@ subroutine radaer_code( nlayers, & case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_vol_um : ', ait_ins_volume_names(mm) + 'Missing required ukca_modal_vol : ', ait_ins_volume_names(mm) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select @@ -1286,7 +1286,7 @@ subroutine radaer_code( nlayers, & case( 'pvol_du_acc_ins' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_du_acc_ins( map_wth(1) + k ), r_um) end do @@ -1298,7 +1298,7 @@ subroutine radaer_code( nlayers, & case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_vol_um : ', acc_ins_volume_names(mm) + 'Missing required ukca_modal_vol : ', acc_ins_volume_names(mm) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select @@ -1314,7 +1314,7 @@ subroutine radaer_code( nlayers, & case( 'pvol_du_cor_ins' ) do k = 1, nlayers - ukca_modal_vol_um(1, k, m) = ukca_modal_vol_um(1, k, m) + & + ukca_modal_vol(1, k, m) = ukca_modal_vol(1, k, m) + & real( pvol_du_cor_ins( map_wth(1) + k ), r_um) end do @@ -1326,7 +1326,7 @@ subroutine radaer_code( nlayers, & case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_vol_um : ', cor_ins_volume_names(mm) + 'Missing required ukca_modal_vol : ', cor_ins_volume_names(mm) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select @@ -1334,87 +1334,87 @@ subroutine radaer_code( nlayers, & case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_vol_um : ', modal_volume_names(m) + 'Missing required ukca_modal_vol : ', modal_volume_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do - ! -- ukca_modal_wtv_um -- + ! -- ukca_modal_wtv -- n_fields = size(modal_wtv_names) - allocate(ukca_modal_wtv_um(1, nlayers, n_fields)) - ukca_modal_wtv_um = 0.0_r_um + allocate(ukca_modal_wtv(1, nlayers, n_fields)) + ukca_modal_wtv = 0.0_r_um do m = 1, n_fields select case(trim(modal_wtv_names(m))) case('fldname_pvol_wat_ait_sol') do k = 1, nlayers - ukca_modal_wtv_um(1,k,m) =real( pvol_wat_ait_sol(map_wth(1) + k), r_um ) + ukca_modal_wtv(1,k,m) =real( pvol_wat_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_wat_acc_sol') do k = 1, nlayers - ukca_modal_wtv_um(1,k,m) =real( pvol_wat_acc_sol(map_wth(1) + k), r_um ) + ukca_modal_wtv(1,k,m) =real( pvol_wat_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_wat_cor_sol') do k = 1, nlayers - ukca_modal_wtv_um(1,k,m) =real( pvol_wat_cor_sol(map_wth(1) + k), r_um ) + ukca_modal_wtv(1,k,m) =real( pvol_wat_cor_sol(map_wth(1) + k), r_um ) end do case('fldname_pvol_wat_ait_ins') do k = 1, nlayers - ukca_modal_wtv_um(1,k,m) = 0.0_r_um + ukca_modal_wtv(1,k,m) = 0.0_r_um end do case('fldname_pvol_wat_acc_ins') do k = 1, nlayers - ukca_modal_wtv_um(1,k,m) = 0.0_r_um + ukca_modal_wtv(1,k,m) = 0.0_r_um end do case('fldname_pvol_wat_cor_ins') do k = 1, nlayers - ukca_modal_wtv_um(1,k,m) = 0.0_r_um + ukca_modal_wtv(1,k,m) = 0.0_r_um end do case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_modal_wtv_um : ', modal_wtv_names(m) + 'Missing required ukca_modal_wtv : ', modal_wtv_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do - ! -- ukca_wet_diam_um -- + ! -- ukca_wet_diam -- n_fields = size(wet_diam_mode_names) - allocate(ukca_wet_diam_um(1, nlayers, n_fields)) - ukca_wet_diam_um = 0.0_r_um + allocate(ukca_wet_diam(1, nlayers, n_fields)) + ukca_wet_diam = 0.0_r_um do m = 1, n_fields select case(trim(wet_diam_mode_names(m))) case('fldname_wetdp_ait_sol') do k = 1, nlayers - ukca_wet_diam_um(1, k, m) = real( wetdp_ait_sol(map_wth(1) + k), r_um ) + ukca_wet_diam(1, k, m) = real( wetdp_ait_sol(map_wth(1) + k), r_um ) end do case('fldname_wetdp_acc_sol') do k = 1, nlayers - ukca_wet_diam_um(1, k, m) = real( wetdp_acc_sol(map_wth(1) + k), r_um ) + ukca_wet_diam(1, k, m) = real( wetdp_acc_sol(map_wth(1) + k), r_um ) end do case('fldname_wetdp_cor_sol') do k = 1, nlayers - ukca_wet_diam_um(1, k, m) = real( wetdp_cor_sol(map_wth(1) + k), r_um ) + ukca_wet_diam(1, k, m) = real( wetdp_cor_sol(map_wth(1) + k), r_um ) end do !!!!! Note that wet and dry diameter are the same for insoluble modes case('fldname_wetdp_ait_ins') do k = 1, nlayers - ukca_wet_diam_um(1, k, m) = real( drydp_ait_ins(map_wth(1) + k), r_um ) + ukca_wet_diam(1, k, m) = real( drydp_ait_ins(map_wth(1) + k), r_um ) end do !!!!! Note that wet and dry diameter are the same for insoluble modes case('fldname_wetdp_acc_ins') do k = 1, nlayers - ukca_wet_diam_um(1, k, m) = real( drydp_acc_ins(map_wth(1) + k), r_um ) + ukca_wet_diam(1, k, m) = real( drydp_acc_ins(map_wth(1) + k), r_um ) end do !!!!! Note that wet and dry diameter are the same for insoluble modes case('fldname_wetdp_cor_ins') do k = 1, nlayers - ukca_wet_diam_um(1, k, m) = real( drydp_cor_ins(map_wth(1) + k), r_um ) + ukca_wet_diam(1, k, m) = real( drydp_cor_ins(map_wth(1) + k), r_um ) end do case default write( log_scratch_space, '(A,A)' ) & - 'Missing required ukca_wet_diam_um : ', wet_diam_mode_names(m) + 'Missing required ukca_wet_diam : ', wet_diam_mode_names(m) call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end select end do @@ -1435,16 +1435,16 @@ subroutine radaer_code( nlayers, & ( .not. associated( aod_ukca_cor_ins, empty_real_data ) ) .or. & ( .not. associated( aaod_ukca_cor_ins, empty_real_data ) ) ) then - d_mass_theta_levels_um(1,1,1) = rho_in_wth( map_wth(2) ) * & + d_mass_theta_levels(1,1,1) = rho_in_wth( map_wth(2) ) * & ( dz_in_wth( map_wth(2) ) + & dz_in_wth( map_wth(1) ) ) do k = 2, nlayers - 1 - d_mass_theta_levels_um(1,1,k) = rho_in_wth( map_wth(1) + k ) * & - dz_in_wth( map_wth(1) + k ) + d_mass_theta_levels(1,1,k) = rho_in_wth( map_wth(1) + k ) * & + dz_in_wth( map_wth(1) + k ) end do - d_mass_theta_levels_um(1,1,nlayers) = p_zero * & + d_mass_theta_levels(1,1,nlayers) = p_zero * & exner_in_w3( map_w3(1) + nlayers-1 )** & ( 1.0_r_def / kappa ) / gravity end if @@ -1473,29 +1473,29 @@ subroutine radaer_code( nlayers, & l_exclude_lw, & l_exclude_sw, & ! Modal diameters from UKCA module (input) - ukca_dry_diam_um, & - ukca_wet_diam_um, & + ukca_dry_diam, & + ukca_wet_diam, & ! Other inputs from UKCA module (input) - ukca_comp_vol_um, & - ukca_modal_vol_um, & - ukca_modal_rho_um, & - ukca_modal_wtv_um, & + ukca_comp_vol, & + ukca_modal_vol, & + ukca_modal_rho, & + ukca_modal_wtv, & ! Logical to describe orientation l_inverted, & ! Control option for prescribed single scattering albedo array i_ukca_radaer_prescribe_ssa, & ! Model level of the tropopause (input) - trindxrad_um, & + trindxrad, & ! Whether we need to run shortwave band_average because lit or not - l_any_lit_points_um, & + l_any_lit_points, & ! Prescription of single-scattering albedo ukca_radaer_presc_ssa, & ! Input Component mass-mixing ratios - ukca_mix_ratio_um, & + ukca_mix_ratio, & ! Input modal number concentrations - ukca_modal_nbr_um, & + ukca_modal_nbr, & ! Input Pressure and temperature - p_theta_levels_um, t_theta_levels_um, & + p_theta_levels, t_theta_levels, & ! Which aerosol optical depth diagnostics to calculate l_aod_ukca_ait_sol, l_aaod_ukca_ait_sol, & l_aod_ukca_acc_sol, l_aaod_ukca_acc_sol, & @@ -1504,18 +1504,18 @@ subroutine radaer_code( nlayers, & l_aod_ukca_acc_ins, l_aaod_ukca_acc_ins, & l_aod_ukca_cor_ins, l_aaod_ukca_cor_ins, & ! Mass thickness of layers - d_mass_theta_levels_um, & + d_mass_theta_levels, & ! Modal mass-mixing ratios (input output) - ukca_mode_mix_ratio_um, & + ukca_mode_mix_ratio, & ! Band-averaged optical properties (output) - aer_lw_absorption_um, & - aer_sw_absorption_um, & - aer_lw_scattering_um, & - aer_sw_scattering_um, & - aer_lw_asymmetry_um, & - aer_sw_asymmetry_um, & - aod_ukca_all_modes_um, & - aaod_ukca_all_modes_um ) + aer_lw_absorption, & + aer_sw_absorption, & + aer_lw_scattering, & + aer_sw_scattering, & + aer_lw_asymmetry, & + aer_sw_asymmetry, & + aod_ukca_all_modes, & + aaod_ukca_all_modes ) !----------------------------------------------------------------------- ! Convert back to LFRic arrays @@ -1525,8 +1525,8 @@ subroutine radaer_code( nlayers, & do i_mode = 1, n_radaer_mode do k = 1, nlayers - aer_mix_ratio( map_mode(1) + ( (i_mode-1)*(nlayers+1) ) + k ) = & - ukca_mode_mix_ratio_um( 1, k, i_mode ) + aer_mix_ratio( map_mode(1) + ( (i_mode-1)*(nlayers+1) ) + k ) = & + ukca_mode_mix_ratio( 1, k, i_mode ) end do end do @@ -1540,16 +1540,16 @@ subroutine radaer_code( nlayers, & aer_lw_absorption( map_rmode_lw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_lw_absorption_um( 1, k, i_mode, i_band ) + aer_lw_absorption( 1, k, i_mode, i_band ) aer_lw_scattering( map_rmode_lw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_lw_scattering_um( 1, k, i_mode, i_band ) + aer_lw_scattering( 1, k, i_mode, i_band ) aer_lw_asymmetry( map_rmode_lw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & max(minus1_plus_eps, min(one_minus_eps, & - aer_lw_asymmetry_um( 1, k, i_mode, i_band ) ) ) + aer_lw_asymmetry( 1, k, i_mode, i_band ) ) ) end do ! n_layers end do ! n_radaer_mode @@ -1576,21 +1576,21 @@ subroutine radaer_code( nlayers, & i_rmode = i_rmode + 1 do k = 1, nlayers - if ( ( lit_fraction(map_2d(1)) > 0.0_r_def ) .or. & + if ( ( lit_fraction(map_2d(1)) > 0.0_r_def ) .or. & n_radaer_step > 1 ) then aer_sw_absorption( map_rmode_sw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_sw_absorption_um( 1, k, i_mode, i_band ) + aer_sw_absorption( 1, k, i_mode, i_band ) aer_sw_scattering( map_rmode_sw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_sw_scattering_um( 1, k, i_mode, i_band ) + aer_sw_scattering( 1, k, i_mode, i_band ) aer_sw_asymmetry( map_rmode_sw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & max(minus1_plus_eps, min(one_minus_eps, & - aer_sw_asymmetry_um( 1, k, i_mode, i_band ) ) ) + aer_sw_asymmetry( 1, k, i_mode, i_band ) ) ) ! unlit points else @@ -1624,7 +1624,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_ait_sol( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_all_modes_um(i,k,mode_ait_sol-1) + aod_ukca_all_modes(i,k,mode_ait_sol-1) end do end do end if @@ -1633,7 +1633,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_ait_sol( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_all_modes_um(i,k,mode_ait_sol-1) + aaod_ukca_all_modes(i,k,mode_ait_sol-1) end do end do end if @@ -1645,7 +1645,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_acc_sol( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_all_modes_um(i,k,mode_acc_sol-1) + aod_ukca_all_modes(i,k,mode_acc_sol-1) end do end do end if @@ -1654,7 +1654,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_acc_sol( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_all_modes_um(i,k,mode_acc_sol-1) + aaod_ukca_all_modes(i,k,mode_acc_sol-1) end do end do end if @@ -1666,7 +1666,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_cor_sol( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_all_modes_um(i,k,mode_cor_sol-1) + aod_ukca_all_modes(i,k,mode_cor_sol-1) end do end do end if @@ -1675,7 +1675,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_cor_sol( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_all_modes_um(i,k,mode_cor_sol-1) + aaod_ukca_all_modes(i,k,mode_cor_sol-1) end do end do end if @@ -1687,7 +1687,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_ait_ins( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_all_modes_um(i,k,mode_ait_insol-1) + aod_ukca_all_modes(i,k,mode_ait_insol-1) end do end do end if @@ -1696,7 +1696,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_ait_ins( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_all_modes_um(i,k,mode_ait_insol-1) + aaod_ukca_all_modes(i,k,mode_ait_insol-1) end do end do end if @@ -1708,7 +1708,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_acc_ins( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_all_modes_um(i,k,mode_acc_insol-1) + aod_ukca_all_modes(i,k,mode_acc_insol-1) end do end do end if @@ -1717,7 +1717,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_acc_ins( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_all_modes_um(i,k,mode_acc_insol-1) + aaod_ukca_all_modes(i,k,mode_acc_insol-1) end do end do end if @@ -1729,7 +1729,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aod_ukca_cor_ins( map_aod_wavel(i) + k - 1 ) = & - aod_ukca_all_modes_um(i,k,mode_cor_insol-1) + aod_ukca_all_modes(i,k,mode_cor_insol-1) end do end do end if @@ -1738,7 +1738,7 @@ subroutine radaer_code( nlayers, & do k = 1, npd_ukca_aod_wavel do i = 1, row_length aaod_ukca_cor_ins( map_aod_wavel(i) + k - 1 ) = & - aaod_ukca_all_modes_um(i,k,mode_cor_insol-1) + aaod_ukca_all_modes(i,k,mode_cor_insol-1) end do end do end if @@ -1747,28 +1747,28 @@ subroutine radaer_code( nlayers, & ! This is where we would close segmentation and openmp !------------------------------------------------ - deallocate( ukca_modal_wtv_um ) - deallocate( ukca_modal_vol_um ) - deallocate( ukca_modal_rho_um ) - deallocate( ukca_modal_nbr_um ) - deallocate( ukca_wet_diam_um ) - deallocate( ukca_dry_diam_um ) + deallocate( ukca_modal_wtv ) + deallocate( ukca_modal_vol ) + deallocate( ukca_modal_rho ) + deallocate( ukca_modal_nbr ) + deallocate( ukca_wet_diam ) + deallocate( ukca_dry_diam ) - deallocate( ukca_mix_ratio_um ) - deallocate( ukca_comp_vol_um ) + deallocate( ukca_mix_ratio ) + deallocate( ukca_comp_vol ) - deallocate( aaod_ukca_all_modes_um ) - deallocate( sod_ukca_all_modes_um ) - deallocate( aod_ukca_all_modes_um ) + deallocate( aaod_ukca_all_modes ) + deallocate( sod_ukca_all_modes ) + deallocate( aod_ukca_all_modes ) - deallocate( aer_sw_asymmetry_um ) - deallocate( aer_sw_scattering_um ) - deallocate( aer_sw_absorption_um ) - deallocate( aer_lw_asymmetry_um ) - deallocate( aer_lw_scattering_um ) - deallocate( aer_lw_absorption_um ) + deallocate( aer_sw_asymmetry ) + deallocate( aer_sw_scattering ) + deallocate( aer_sw_absorption ) + deallocate( aer_lw_asymmetry ) + deallocate( aer_lw_scattering ) + deallocate( aer_lw_absorption ) - deallocate( ukca_mode_mix_ratio_um ) + deallocate( ukca_mode_mix_ratio ) end subroutine radaer_code From 40606f602011d51226b8aeb9331c0518380d689e Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Tue, 28 Jul 2026 13:34:04 +0100 Subject: [PATCH 09/14] For Mohit - stops problems with Box model --- .../source/kernel/radaer_kernel_mod.F90 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index b45413782b..15e11c6a30 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -1462,6 +1462,14 @@ subroutine radaer_code( nlayers, & npd_exclude_sw, & npd_ukca_aod_wavel, & ncp_max_x_nmodes, & + n_radaer_mode, & + ! Spectral Information + n_sw_band, & + n_lw_band, & + sw_n_band_exclude, & + lw_n_band_exclude, & + sw_index_exclude, & + lw_index_exclude, & ! Actual array dimensions (input) n_ukca_mode, & n_ukca_cpnt, & From 904578cc583d18fc1359835abb955a5ef09fceb4 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Tue, 28 Jul 2026 14:05:09 +0100 Subject: [PATCH 10/14] For Mohit - Comment on mode indexing --- .../source/kernel/radaer_kernel_mod.F90 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index 15e11c6a30..3156cc2051 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -1627,6 +1627,7 @@ subroutine radaer_code( nlayers, & !------------------------------------------------ ! Now calculate aod and aaod for Aitken Soluble mode + ! Note that we start from the second mode and so mode index has minus one. if ( .not. associated( aod_ukca_ait_sol, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel @@ -1648,6 +1649,7 @@ subroutine radaer_code( nlayers, & !------------------------------------------------ ! Now calculate aod and aaod for Accumulation Soluble mode + ! Note that we start from the second mode and so mode index has minus one. if ( .not. associated( aod_ukca_acc_sol, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel @@ -1669,6 +1671,7 @@ subroutine radaer_code( nlayers, & !------------------------------------------------ ! Now calculate aod and aaod for Coarse Soluble mode + ! Note that we start from the second mode and so mode index has minus one. if ( .not. associated( aod_ukca_cor_sol, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel @@ -1690,6 +1693,7 @@ subroutine radaer_code( nlayers, & !------------------------------------------------ ! Now calculate aod and aaod for Aitken Insoluble mode + ! Note that we start from the second mode and so mode index has minus one. if ( .not. associated( aod_ukca_ait_ins, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel @@ -1711,6 +1715,7 @@ subroutine radaer_code( nlayers, & !------------------------------------------------ ! Now calculate aod and aaod for Accumulation Insoluble mode + ! Note that we start from the second mode and so mode index has minus one. if ( .not. associated( aod_ukca_acc_ins, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel @@ -1732,6 +1737,7 @@ subroutine radaer_code( nlayers, & !------------------------------------------------ ! Now calculate aod and aaod for Coarse Insoluble mode + ! Note that we start from the second mode and so mode index has minus one. if ( .not. associated( aod_ukca_cor_ins, empty_real_data ) ) then do k = 1, npd_ukca_aod_wavel From 5f4bc70105c164b504e58e6df8012a38b0ee8562 Mon Sep 17 00:00:00 2001 From: Alan J Hewitt <40797340+alanjhewitt@users.noreply.github.com> Date: Tue, 28 Jul 2026 14:53:34 +0100 Subject: [PATCH 11/14] to distinguish between r_def and r_um --- .../source/kernel/radaer_kernel_mod.F90 | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 index 3156cc2051..42b55e903f 100644 --- a/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 +++ b/interfaces/physics_schemes_interface/source/kernel/radaer_kernel_mod.F90 @@ -563,12 +563,12 @@ subroutine radaer_code( nlayers, & real(r_um), allocatable :: ukca_mode_mix_ratio(:,:,:) - real(r_um), allocatable :: aer_lw_absorption(:,:,:,:) - real(r_um), allocatable :: aer_lw_scattering(:,:,:,:) - real(r_um), allocatable :: aer_lw_asymmetry(:,:,:,:) - real(r_um), allocatable :: aer_sw_absorption(:,:,:,:) - real(r_um), allocatable :: aer_sw_scattering(:,:,:,:) - real(r_um), allocatable :: aer_sw_asymmetry(:,:,:,:) + real(r_um), allocatable :: aer_lw_absorption_radaer(:,:,:,:) + real(r_um), allocatable :: aer_lw_scattering_radaer(:,:,:,:) + real(r_um), allocatable :: aer_lw_asymmetry_radaer(:,:,:,:) + real(r_um), allocatable :: aer_sw_absorption_radaer(:,:,:,:) + real(r_um), allocatable :: aer_sw_scattering_radaer(:,:,:,:) + real(r_um), allocatable :: aer_sw_asymmetry_radaer(:,:,:,:) real(r_um), allocatable :: aod_ukca_all_modes(:,:,:) real(r_um), allocatable :: sod_ukca_all_modes(:,:,:) real(r_um), allocatable :: aaod_ukca_all_modes(:,:,:) @@ -761,12 +761,12 @@ subroutine radaer_code( nlayers, & ! Allocation of arrays allocate( ukca_mode_mix_ratio( 1, nlayers, n_radaer_mode ) ) - allocate( aer_lw_absorption( 1, nlayers, n_radaer_mode, n_lw_band ) ) - allocate( aer_lw_scattering( 1, nlayers, n_radaer_mode, n_lw_band ) ) - allocate( aer_lw_asymmetry( 1, nlayers, n_radaer_mode, n_lw_band ) ) - allocate( aer_sw_absorption( 1, nlayers, n_radaer_mode, n_sw_band ) ) - allocate( aer_sw_scattering( 1, nlayers, n_radaer_mode, n_sw_band ) ) - allocate( aer_sw_asymmetry( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aer_lw_absorption_radaer( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_lw_scattering_radaer( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_lw_asymmetry_radaer( 1, nlayers, n_radaer_mode, n_lw_band ) ) + allocate( aer_sw_absorption_radaer( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aer_sw_scattering_radaer( 1, nlayers, n_radaer_mode, n_sw_band ) ) + allocate( aer_sw_asymmetry_radaer( 1, nlayers, n_radaer_mode, n_sw_band ) ) allocate( aod_ukca_all_modes( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) allocate( sod_ukca_all_modes( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) allocate( aaod_ukca_all_modes( 1, npd_ukca_aod_wavel, n_ukca_mode ) ) @@ -1516,12 +1516,12 @@ subroutine radaer_code( nlayers, & ! Modal mass-mixing ratios (input output) ukca_mode_mix_ratio, & ! Band-averaged optical properties (output) - aer_lw_absorption, & - aer_sw_absorption, & - aer_lw_scattering, & - aer_sw_scattering, & - aer_lw_asymmetry, & - aer_sw_asymmetry, & + aer_lw_absorption_radaer, & + aer_sw_absorption_radaer, & + aer_lw_scattering_radaer, & + aer_sw_scattering_radaer, & + aer_lw_asymmetry_radaer, & + aer_sw_asymmetry_radaer, & aod_ukca_all_modes, & aaod_ukca_all_modes ) @@ -1548,16 +1548,16 @@ subroutine radaer_code( nlayers, & aer_lw_absorption( map_rmode_lw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_lw_absorption( 1, k, i_mode, i_band ) + aer_lw_absorption_radaer( 1, k, i_mode, i_band ) aer_lw_scattering( map_rmode_lw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_lw_scattering( 1, k, i_mode, i_band ) + aer_lw_scattering_radaer( 1, k, i_mode, i_band ) aer_lw_asymmetry( map_rmode_lw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & max(minus1_plus_eps, min(one_minus_eps, & - aer_lw_asymmetry( 1, k, i_mode, i_band ) ) ) + aer_lw_asymmetry_radaer(1, k, i_mode, i_band ) ) ) end do ! n_layers end do ! n_radaer_mode @@ -1589,16 +1589,16 @@ subroutine radaer_code( nlayers, & aer_sw_absorption( map_rmode_sw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_sw_absorption( 1, k, i_mode, i_band ) + aer_sw_absorption_radaer(1, k, i_mode, i_band ) aer_sw_scattering( map_rmode_sw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & - aer_sw_scattering( 1, k, i_mode, i_band ) + aer_sw_scattering_radaer(1, k, i_mode, i_band ) aer_sw_asymmetry( map_rmode_sw(1) + & ( (i_rmode-1)*(nlayers+1) ) + k ) = & max(minus1_plus_eps, min(one_minus_eps, & - aer_sw_asymmetry( 1, k, i_mode, i_band ) ) ) + aer_sw_asymmetry_radaer(1,k,i_mode, i_band ) ) ) ! unlit points else @@ -1775,12 +1775,12 @@ subroutine radaer_code( nlayers, & deallocate( sod_ukca_all_modes ) deallocate( aod_ukca_all_modes ) - deallocate( aer_sw_asymmetry ) - deallocate( aer_sw_scattering ) - deallocate( aer_sw_absorption ) - deallocate( aer_lw_asymmetry ) - deallocate( aer_lw_scattering ) - deallocate( aer_lw_absorption ) + deallocate( aer_sw_asymmetry_radaer ) + deallocate( aer_sw_scattering_radaer ) + deallocate( aer_sw_absorption_radaer ) + deallocate( aer_lw_asymmetry_radaer ) + deallocate( aer_lw_scattering_radaer ) + deallocate( aer_lw_absorption_radaer ) deallocate( ukca_mode_mix_ratio ) From 07b5b50e90ede05fc6e67bdb713add1b401f6e7a Mon Sep 17 00:00:00 2001 From: yaswant <2984440+yaswant@users.noreply.github.com> Date: Fri, 31 Jul 2026 16:20:00 +0100 Subject: [PATCH 12/14] Update ukca local path --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index d025e9fa97..84e1169cde 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -50,5 +50,5 @@ socrates-spectral: ref: 2026.07.1 ukca: - source: cazcron1:/data/users/yaswant.pradhan/reviews/linked/ukca.git + source: cazcron1:/data/users/yaswant.pradhan/reviews/linked/ukca ref: radaer_api_ukca_side_3 From 7fb5f3c6dfa9716fa51e6e2d14724fe3678dd473 Mon Sep 17 00:00:00 2001 From: yaswant <2984440+yaswant@users.noreply.github.com> Date: Fri, 31 Jul 2026 16:40:14 +0100 Subject: [PATCH 13/14] Change host --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 84e1169cde..09abb89d84 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -50,5 +50,5 @@ socrates-spectral: ref: 2026.07.1 ukca: - source: cazcron1:/data/users/yaswant.pradhan/reviews/linked/ukca + source: cazldt00000C:/data/users/yaswant.pradhan/reviews/linked/ukca ref: radaer_api_ukca_side_3 From 0a341e499b6e26f8f0cc1ba4e4eef064e530d6b1 Mon Sep 17 00:00:00 2001 From: yaswant <2984440+yaswant@users.noreply.github.com> Date: Mon, 3 Aug 2026 13:51:57 +0100 Subject: [PATCH 14/14] Update checksums --- dependencies.yaml | 4 ++-- ...al9_da-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...l9_eda-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...a_jada-C12_azspice_gnu_fast-debug-32bit.txt | 14 +++++++------- ...clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...m_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...m_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 12 ++++++------ ...al9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt | 18 +++++++++--------- ...nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ...morph_dev-C12_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ...omorph_tb-C12_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ..._nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...p_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt | 12 ++++++------ ...p_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...p_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...e_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...readed-C48_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...p_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ..._gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ..._eda_jada-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ..._gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- ...al9_short-C12_ex1a_cce_fast-debug-32bit.txt | 12 ++++++------ ..._ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt | 16 ++++++++-------- ...3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt | 12 ++++++------ ...ixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt | 14 +++++++------- 35 files changed, 242 insertions(+), 242 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 09abb89d84..33d00fabea 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -50,5 +50,5 @@ socrates-spectral: ref: 2026.07.1 ukca: - source: cazldt00000C:/data/users/yaswant.pradhan/reviews/linked/ukca - ref: radaer_api_ukca_side_3 + source: git@github.com:MetOffice/ukca.git + ref: 9fc2b6da8701f4904911b561a2738e3f16c4e501 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt index 8c3ea9dbfa..1b6a5abbf7 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_da-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82410 -Inner product checksum theta = 518A79DC -Inner product checksum u = 6A8C991B -Inner product checksum mr1 = 3FD43D53 -Inner product checksum mr2 = 37CEFE56 -Inner product checksum mr3 = 35B2F72F -Inner product checksum mr4 = 36D0DE45 +Inner product checksum rho = 46D81DE6 +Inner product checksum theta = 518A7492 +Inner product checksum u = 6A8CA23A +Inner product checksum mr1 = 3FD4169C +Inner product checksum mr2 = 37D5E841 +Inner product checksum mr3 = 35BCE864 +Inner product checksum mr4 = 36F42939 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt index 2c6015f21e..d57646c094 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82677 -Inner product checksum theta = 518A5918 -Inner product checksum u = 6A90BD46 -Inner product checksum mr1 = 3FD0E279 -Inner product checksum mr2 = 37D9CA8F -Inner product checksum mr3 = 359E5484 -Inner product checksum mr4 = 36E1AAEC +Inner product checksum rho = 46D8222A +Inner product checksum theta = 518A578E +Inner product checksum u = 6A9033C9 +Inner product checksum mr1 = 3FD104AC +Inner product checksum mr2 = 37CA86DB +Inner product checksum mr3 = 35C42B10 +Inner product checksum mr4 = 37014F88 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt index 92a34489d9..d67217db63 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9_eda_jada-C12_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82185 -Inner product checksum theta = 518A73C9 -Inner product checksum u = 6A8D698F -Inner product checksum mr1 = 3FD3E4E9 -Inner product checksum mr2 = 37CD050A -Inner product checksum mr3 = 35A154D4 -Inner product checksum mr4 = 36CBA41D +Inner product checksum rho = 46D81D7C +Inner product checksum theta = 518A71D5 +Inner product checksum u = 6A8D4511 +Inner product checksum mr1 = 3FD3D2DC +Inner product checksum mr2 = 37CD9093 +Inner product checksum mr3 = 35ABD2A7 +Inner product checksum mr4 = 36F26EFE Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt index e966a1c44b..711b713de9 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D55775 -Inner product checksum theta = 518ED500 -Inner product checksum u = 6AFB1CD9 -Inner product checksum mr1 = 3FE1E8EA -Inner product checksum mr2 = 3732F689 -Inner product checksum mr3 = 35344454 -Inner product checksum mr4 = 36A27A84 +Inner product checksum rho = 46D55549 +Inner product checksum theta = 518ECE90 +Inner product checksum u = 6AFA5356 +Inner product checksum mr1 = 3FE1A092 +Inner product checksum mr2 = 371913C4 +Inner product checksum mr3 = 35315E0A +Inner product checksum mr4 = 369FF29A Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt index 727e0bb115..11c4e2d901 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66E68 -Inner product checksum theta = 5193C440 -Inner product checksum u = 6B197844 -Inner product checksum mr1 = 3FCF742A -Inner product checksum mr2 = 3734EE31 -Inner product checksum mr3 = 35537800 -Inner product checksum mr4 = 36A327FE +Inner product checksum rho = 46D66E12 +Inner product checksum theta = 5193C393 +Inner product checksum u = 6B197C00 +Inner product checksum mr1 = 3FCF63E0 +Inner product checksum mr2 = 3726FC0F +Inner product checksum mr3 = 35434F94 +Inner product checksum mr4 = 369701FE Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt index a5bf342d44..e101aa4dc4 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D660EE -Inner product checksum theta = 539A0A3D -Inner product checksum u = 6B127747 -Inner product checksum mr1 = 41CC3C18 -Inner product checksum mr2 = 3968D85C -Inner product checksum mr3 = 37C35903 -Inner product checksum mr4 = 39476FE6 +Inner product checksum rho = 48D660EB +Inner product checksum theta = 539A0A42 +Inner product checksum u = 6B12779D +Inner product checksum mr1 = 41CC3F3A +Inner product checksum mr2 = 396DAB46 +Inner product checksum mr3 = 37C0E259 +Inner product checksum mr4 = 394769E6 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt index 63e25c1177..58dc64d715 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66D8E -Inner product checksum theta = 5193C42E -Inner product checksum u = 6B196EB6 -Inner product checksum mr1 = 3FCF7216 -Inner product checksum mr2 = 373287E4 -Inner product checksum mr3 = 3541E12E -Inner product checksum mr4 = 3691A10A +Inner product checksum rho = 46D66D58 +Inner product checksum theta = 5193C408 +Inner product checksum u = 6B197783 +Inner product checksum mr1 = 3FCF6B73 +Inner product checksum mr2 = 372132E2 +Inner product checksum mr3 = 353483B4 +Inner product checksum mr4 = 36900DD2 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt index 82af0af7f3..4193ad596d 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D660F2 +Inner product checksum rho = 48D660FA Inner product checksum theta = 539A0A40 -Inner product checksum u = 6B1277B9 -Inner product checksum mr1 = 41CC3D65 -Inner product checksum mr2 = 396ADFDE -Inner product checksum mr3 = 37C61CDF -Inner product checksum mr4 = 39477BA7 +Inner product checksum u = 6B1277A8 +Inner product checksum mr1 = 41CC3E30 +Inner product checksum mr2 = 3968B73E +Inner product checksum mr3 = 37CA5475 +Inner product checksum mr4 = 3946AE12 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt index a52cdbadf6..0492c581ec 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D660FB -Inner product checksum theta = 539A0A40 -Inner product checksum u = 6B127743 -Inner product checksum mr1 = 41CC3CC6 -Inner product checksum mr2 = 396A08DC -Inner product checksum mr3 = 37C64996 -Inner product checksum mr4 = 39468D56 +Inner product checksum rho = 48D660EF +Inner product checksum theta = 539A0A42 +Inner product checksum u = 6B127821 +Inner product checksum mr1 = 41CC3CE4 +Inner product checksum mr2 = 396E061E +Inner product checksum mr3 = 37C25803 +Inner product checksum mr4 = 39464A1C Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt index 60d053edf1..e59abe73cf 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D55CE2 -Inner product checksum theta = 518EDA64 -Inner product checksum u = 6AFA0B97 -Inner product checksum mr1 = 3FE1627D -Inner product checksum mr2 = 3726D046 -Inner product checksum mr3 = 353CA0C5 -Inner product checksum mr4 = 36B92A82 +Inner product checksum rho = 46D55A56 +Inner product checksum theta = 518ED363 +Inner product checksum u = 6AFAE11A +Inner product checksum mr1 = 3FE15202 +Inner product checksum mr2 = 371EDF3C +Inner product checksum mr3 = 351C6CB0 +Inner product checksum mr4 = 369B1E76 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt index 7fd628712a..a097a722a3 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66D5F -Inner product checksum theta = 5193C3A0 -Inner product checksum u = 6B19E2AC -Inner product checksum mr1 = 3FCF93A8 -Inner product checksum mr2 = 373FA452 -Inner product checksum mr3 = 354D24EC -Inner product checksum mr4 = 36A32534 +Inner product checksum rho = 46D66D99 +Inner product checksum theta = 5193C3E8 +Inner product checksum u = 6B19D94C +Inner product checksum mr1 = 3FCF8CCA +Inner product checksum mr2 = 3735AFBC +Inner product checksum mr3 = 353FD2B4 +Inner product checksum mr4 = 369656EC Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt index b704b9f0af..18b9a18446 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D66D9A -Inner product checksum theta = 5193C373 -Inner product checksum u = 6B19F546 -Inner product checksum mr1 = 3FCF92DF -Inner product checksum mr2 = 3734FF8E -Inner product checksum mr3 = 3554EF6E -Inner product checksum mr4 = 36A54306 +Inner product checksum rho = 46D66DD0 +Inner product checksum theta = 5193C3C4 +Inner product checksum u = 6B1A0D3D +Inner product checksum mr1 = 3FCF9140 +Inner product checksum mr2 = 37540362 +Inner product checksum mr3 = 353F7AE2 +Inner product checksum mr4 = 3693242C Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt index 4c9b31ed8f..087aa24888 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_casim-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D87253 -Inner product checksum theta = 518CDB51 -Inner product checksum u = 6A8B3F5C -Inner product checksum mr1 = 3FCCB9A6 -Inner product checksum mr2 = 382F8C8A -Inner product checksum mr3 = 35537DBB -Inner product checksum mr4 = 369C7042 -Inner product checksum mr5 = 2E8D7032 -Inner product checksum mr6 = 354A9D79 +Inner product checksum rho = 46D872DA +Inner product checksum theta = 518CD537 +Inner product checksum u = 6A8B1F08 +Inner product checksum mr1 = 3FCDA06C +Inner product checksum mr2 = 3833AEA2 +Inner product checksum mr3 = 35839C82 +Inner product checksum mr4 = 36B62268 +Inner product checksum mr5 = 2F0E7901 +Inner product checksum mr6 = 355DF8CE diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt index 1104f2d3fe..be1b46ebc7 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_coma9-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D8680C -Inner product checksum theta = 518CDC46 -Inner product checksum u = 6A8817BE -Inner product checksum mr1 = 3FD0483F -Inner product checksum mr2 = 37EE50C5 -Inner product checksum mr3 = 379F6DD9 -Inner product checksum mr4 = 379E7D92 -Inner product checksum mr5 = 36AF1A27 +Inner product checksum rho = 46D866CA +Inner product checksum theta = 518CDB0A +Inner product checksum u = 6A87ED5F +Inner product checksum mr1 = 3FD0A046 +Inner product checksum mr2 = 37DF4BDD +Inner product checksum mr3 = 37A3BABF +Inner product checksum mr4 = 379F554B +Inner product checksum mr5 = 36C66810 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt index 75095d69d8..0c52e8603c 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_dev-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D85A0E -Inner product checksum theta = 518CE3E8 -Inner product checksum u = 6A875E57 -Inner product checksum mr1 = 3FD1CBB8 -Inner product checksum mr2 = 37F0AFCB -Inner product checksum mr3 = 37853DF0 -Inner product checksum mr4 = 37D3206A -Inner product checksum mr5 = 36B1C48A +Inner product checksum rho = 46D85839 +Inner product checksum theta = 518CE688 +Inner product checksum u = 6A872B8A +Inner product checksum mr1 = 3FD21FFA +Inner product checksum mr2 = 37D62086 +Inner product checksum mr3 = 3793A911 +Inner product checksum mr4 = 37CCAE12 +Inner product checksum mr5 = 36B25674 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt index 1ef8638202..62064ce4f4 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_comorph_tb-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D87451 -Inner product checksum theta = 518CEAB4 -Inner product checksum u = 6A84E598 -Inner product checksum mr1 = 3FCEAA54 -Inner product checksum mr2 = 37F676C3 -Inner product checksum mr3 = 3785898E -Inner product checksum mr4 = 377EDD74 -Inner product checksum mr5 = 36081FEA +Inner product checksum rho = 46D874B6 +Inner product checksum theta = 518CEA99 +Inner product checksum u = 6A850734 +Inner product checksum mr1 = 3FCE89E0 +Inner product checksum mr2 = 37EE81FA +Inner product checksum mr3 = 377F8682 +Inner product checksum mr4 = 37513D9A +Inner product checksum mr5 = 35FC5774 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt index 1704ef5980..50cbc54ca0 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D858F4 -Inner product checksum theta = 518CDA09 -Inner product checksum u = 6A88881E -Inner product checksum mr1 = 3FD08737 -Inner product checksum mr2 = 37BFC569 -Inner product checksum mr3 = 35A49EF0 -Inner product checksum mr4 = 371347AE +Inner product checksum rho = 46D85BB8 +Inner product checksum theta = 518CDCFE +Inner product checksum u = 6A88AB3E +Inner product checksum mr1 = 3FD070AB +Inner product checksum mr2 = 37B9024D +Inner product checksum mr3 = 35AAE730 +Inner product checksum mr4 = 3730C8CA Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt index c3a2b69344..0f7c085945 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8026E -Inner product checksum theta = 5392FAF1 -Inner product checksum u = 6A97C948 -Inner product checksum mr1 = 41CD0BB2 -Inner product checksum mr2 = 39CEECFC -Inner product checksum mr3 = 37AA8952 -Inner product checksum mr4 = 395BCFA7 +Inner product checksum rho = 48D802A4 +Inner product checksum theta = 5392FAB8 +Inner product checksum u = 6A97C8FD +Inner product checksum mr1 = 41CD0CC2 +Inner product checksum mr2 = 39CF8BFA +Inner product checksum mr3 = 37ABC86F +Inner product checksum mr4 = 395A20A1 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt index fc84e94dde..a1a5706f9d 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-pert-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D830A4 +Inner product checksum rho = 46D830AA Inner product checksum theta = 51946D18 -Inner product checksum u = 6B12D0C6 -Inner product checksum mr1 = 3FC8D4BE -Inner product checksum mr2 = 37A3BEF8 -Inner product checksum mr3 = 35912743 -Inner product checksum mr4 = 378EFDB6 +Inner product checksum u = 6B12D20C +Inner product checksum mr1 = 3FC8D199 +Inner product checksum mr2 = 379ED119 +Inner product checksum mr3 = 358F2F0C +Inner product checksum mr4 = 378F355C Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt index 924ec9b73c..69d5af3b85 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D81429 -Inner product checksum theta = 518FB741 -Inner product checksum u = 6AF78146 -Inner product checksum mr1 = 3FCC0ABA -Inner product checksum mr2 = 37ABDC4A -Inner product checksum mr3 = 349FD984 -Inner product checksum mr4 = 36D68944 +Inner product checksum rho = 46D81416 +Inner product checksum theta = 518FB74E +Inner product checksum u = 6AF79AA6 +Inner product checksum mr1 = 3FCC1CB3 +Inner product checksum mr2 = 37AB66C4 +Inner product checksum mr3 = 34A15B45 +Inner product checksum mr4 = 36CFA1D9 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt index c3a2b69344..0f7c085945 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8026E -Inner product checksum theta = 5392FAF1 -Inner product checksum u = 6A97C948 -Inner product checksum mr1 = 41CD0BB2 -Inner product checksum mr2 = 39CEECFC -Inner product checksum mr3 = 37AA8952 -Inner product checksum mr4 = 395BCFA7 +Inner product checksum rho = 48D802A4 +Inner product checksum theta = 5392FAB8 +Inner product checksum u = 6A97C8FD +Inner product checksum mr1 = 41CD0CC2 +Inner product checksum mr2 = 39CF8BFA +Inner product checksum mr3 = 37ABC86F +Inner product checksum mr4 = 395A20A1 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt index 64fabcb2e5..0f8baf6f55 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D8143E -Inner product checksum theta = 518FB717 -Inner product checksum u = 6AF797B9 -Inner product checksum mr1 = 3FCC0844 -Inner product checksum mr2 = 37A2E6D6 -Inner product checksum mr3 = 34BAF1E4 -Inner product checksum mr4 = 36D4F796 +Inner product checksum rho = 46D81448 +Inner product checksum theta = 518FB734 +Inner product checksum u = 6AF763D8 +Inner product checksum mr1 = 3FCC0BD8 +Inner product checksum mr2 = 37A9AD8A +Inner product checksum mr3 = 34A34684 +Inner product checksum mr4 = 36BE7AF2 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt index e53a0c8e26..ce52497353 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D802B2 -Inner product checksum theta = 5392FAF3 -Inner product checksum u = 6A97CD5E -Inner product checksum mr1 = 41CD1657 -Inner product checksum mr2 = 39CFF348 -Inner product checksum mr3 = 37A5B47C -Inner product checksum mr4 = 395BA2F6 +Inner product checksum rho = 48D802B0 +Inner product checksum theta = 5392FB0A +Inner product checksum u = 6A97C2EE +Inner product checksum mr1 = 41CD1878 +Inner product checksum mr2 = 39CC53D6 +Inner product checksum mr3 = 37AC6D8E +Inner product checksum mr4 = 395B6562 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt index 2c1caf9abf..d53e1a60f4 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8027B -Inner product checksum theta = 5392FAF7 -Inner product checksum u = 6A97C214 -Inner product checksum mr1 = 41CD0C8C -Inner product checksum mr2 = 39CFE7EA -Inner product checksum mr3 = 37A6F0D9 -Inner product checksum mr4 = 395B3778 +Inner product checksum rho = 48D80258 +Inner product checksum theta = 5392FB00 +Inner product checksum u = 6A97C5F2 +Inner product checksum mr1 = 41CD09A6 +Inner product checksum mr2 = 39CF00CE +Inner product checksum mr3 = 37A7E4C9 +Inner product checksum mr4 = 395CD662 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt index 41b9b4da97..4f752825cb 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D8033C -Inner product checksum theta = 5392FB0E -Inner product checksum u = 6A97C759 -Inner product checksum mr1 = 41CD0B58 -Inner product checksum mr2 = 39CE99BE -Inner product checksum mr3 = 37A8F42E -Inner product checksum mr4 = 395D16B4 +Inner product checksum rho = 48D8030C +Inner product checksum theta = 5392FB1B +Inner product checksum u = 6A97BF62 +Inner product checksum mr1 = 41CD082D +Inner product checksum mr2 = 39D108DC +Inner product checksum mr3 = 37A6F018 +Inner product checksum mr4 = 395B2A1C Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt index 72446a938f..c59c47ae2d 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D80122 -Inner product checksum theta = 5392FB58 -Inner product checksum u = 6A97BFFA -Inner product checksum mr1 = 41CCE649 -Inner product checksum mr2 = 39CCF794 -Inner product checksum mr3 = 37AE187D -Inner product checksum mr4 = 3970A2E9 +Inner product checksum rho = 48D8011B +Inner product checksum theta = 5392FB72 +Inner product checksum u = 6A97C0F4 +Inner product checksum mr1 = 41CCF2FB +Inner product checksum mr2 = 39CDF0DE +Inner product checksum mr3 = 37A5568C +Inner product checksum mr4 = 396DC5DA Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt index 69b58643f7..7ee54c0fd5 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_da-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D820BC -Inner product checksum theta = 518A7848 -Inner product checksum u = 6A8D03E5 -Inner product checksum mr1 = 3FD3E2AE -Inner product checksum mr2 = 37BB3D6D -Inner product checksum mr3 = 35A97B9A -Inner product checksum mr4 = 36CCD7F7 +Inner product checksum rho = 46D81EC5 +Inner product checksum theta = 518A7380 +Inner product checksum u = 6A8D07CA +Inner product checksum mr1 = 3FD3F636 +Inner product checksum mr2 = 37CDAB91 +Inner product checksum mr3 = 35A26FF2 +Inner product checksum mr4 = 36C4D689 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt index 9f10f40e80..6e8915d717 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82261 -Inner product checksum theta = 518A5400 -Inner product checksum u = 6A90C2C4 -Inner product checksum mr1 = 3FD0D366 -Inner product checksum mr2 = 37CA793A -Inner product checksum mr3 = 35BE669E -Inner product checksum mr4 = 36F32438 +Inner product checksum rho = 46D823FC +Inner product checksum theta = 518A56C0 +Inner product checksum u = 6A8FE4DE +Inner product checksum mr1 = 3FD094B0 +Inner product checksum mr2 = 37DE9C07 +Inner product checksum mr3 = 35AB2BA0 +Inner product checksum mr4 = 36F6875A Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt index 53c1d065d9..6e481ad137 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_eda_jada-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D823E7 -Inner product checksum theta = 518A73B8 -Inner product checksum u = 6A8CD920 -Inner product checksum mr1 = 3FD3D23D -Inner product checksum mr2 = 37C61BA2 -Inner product checksum mr3 = 35AC49AA -Inner product checksum mr4 = 3709B4E9 +Inner product checksum rho = 46D81EDC +Inner product checksum theta = 518A7105 +Inner product checksum u = 6A8CB09A +Inner product checksum mr1 = 3FD39C0E +Inner product checksum mr2 = 37D1DF0A +Inner product checksum mr3 = 35C68364 +Inner product checksum mr4 = 37065C66 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt index 69c75f4be0..3d0b50af90 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_mol-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D85D7F -Inner product checksum theta = 5193AF5E -Inner product checksum u = 6A85EBDE -Inner product checksum mr1 = 3FD05992 -Inner product checksum mr2 = 37AA84DD -Inner product checksum mr3 = 3527D888 -Inner product checksum mr4 = 36C16B40 +Inner product checksum rho = 46D85DA0 +Inner product checksum theta = 5193B0D2 +Inner product checksum u = 6A85BECD +Inner product checksum mr1 = 3FD0813C +Inner product checksum mr2 = 37BB44C8 +Inner product checksum mr3 = 3553A1B6 +Inner product checksum mr4 = 36EBBABD Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt index 07d41efa57..a769020356 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_short-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D82C30 +Inner product checksum rho = 46D82C2E Inner product checksum theta = 5194F74C -Inner product checksum u = 6AE739A7 -Inner product checksum mr1 = 3FC8CAAE -Inner product checksum mr2 = 37A4A396 -Inner product checksum mr3 = 3558139A -Inner product checksum mr4 = 371FDBE0 +Inner product checksum u = 6AE739E2 +Inner product checksum mr1 = 3FC8CA3C +Inner product checksum mr2 = 37A4350A +Inner product checksum mr3 = 35577AC6 +Inner product checksum mr4 = 371FAC35 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt index 5bcd3e4206..3b92abbce1 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 483997B8 -Inner product checksum theta = 51354962 -Inner product checksum u = 612F48FD -Inner product checksum mr1 = 4090FA95 -Inner product checksum mr2 = 35B41EA8 -Inner product checksum mr3 = 2FA64477 -Inner product checksum mr4 = 33F4FE31 -Inner product checksum mr5 = BECFCC0 +Inner product checksum rho = 483997B7 +Inner product checksum theta = 51354960 +Inner product checksum u = 612F490C +Inner product checksum mr1 = 4090FB20 +Inner product checksum mr2 = 35B09A78 +Inner product checksum mr3 = 2FA64B39 +Inner product checksum mr4 = 33F4FE4B +Inner product checksum mr5 = BECFC74 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt index 5aa6f5e28f..e97ebe485e 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 483997E6 Inner product checksum theta = 5135494C -Inner product checksum u = 612F4981 -Inner product checksum mr1 = 40911010 -Inner product checksum mr2 = 35E7733C -Inner product checksum mr3 = 2FA83F7C -Inner product checksum mr4 = 33F4FF41 -Inner product checksum mr5 = BF17D84 +Inner product checksum u = 612F4990 +Inner product checksum mr1 = 40910FA6 +Inner product checksum mr2 = 35E5FDCA +Inner product checksum mr3 = 2FA95B08 +Inner product checksum mr4 = 33F4FF72 +Inner product checksum mr5 = BF18362 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt index dc68904044..5861af5002 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48398C6A +Inner product checksum rho = 48398C6C Inner product checksum theta = 51354302 -Inner product checksum u = 612EDCB6 -Inner product checksum mr1 = 4091033E -Inner product checksum mr2 = 358A714E -Inner product checksum mr3 = 3000FD12 -Inner product checksum mr4 = 3404AC81 -Inner product checksum mr5 = C14A273 +Inner product checksum u = 612EDCC0 +Inner product checksum mr1 = 40910327 +Inner product checksum mr2 = 35899AC5 +Inner product checksum mr3 = 3000FD2C +Inner product checksum mr4 = 3404AC17 +Inner product checksum mr5 = C14A26C Inner product checksum mr6 = 0