diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 5c277da0b..10e9ced23 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -12,4 +12,4 @@ | DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 | | MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 | | timgraham-Met | Tim Graham | Met Office | 2026-01-15 | -| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 | +| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 | \ No newline at end of file diff --git a/interfaces/physics_schemes_interface/source/support/um_ukca_init_mod.f90 b/interfaces/physics_schemes_interface/source/support/um_ukca_init_mod.f90 index c13d50b8c..351f034ba 100644 --- a/interfaces/physics_schemes_interface/source/support/um_ukca_init_mod.f90 +++ b/interfaces/physics_schemes_interface/source/support/um_ukca_init_mod.f90 @@ -30,7 +30,7 @@ module um_ukca_init_mod top_bdy_opt_overwrt_only_top_lev, & top_bdy_opt_overwrt_co_no_o3_top, & top_bdy_opt_overwrt_co_no_o3_h2o_top, & - ! Variables related to initialisation of photolysis + ! Variables related to initialisation of photolysis photol_scheme, photol_scheme_off, & photol_scheme_fastjx, & photol_scheme_prescribed, fastjx_mode, & @@ -580,7 +580,7 @@ module um_ukca_init_mod integer(kind=i_um), allocatable :: jind(:) ! Index of species from files character(len=photol_jlabel_len), allocatable :: jlabel(:) ! Copy of species ! names to match those from files - real(kind=r_um), pointer :: ratj_jfacta(:) ! Quantum yield + real(kind=r_um), pointer :: ratj_jfacta(:) ! Quantum yield real(kind=r_um), allocatable :: jfacta(:) ! copy of quantum yield in correct units character(len=photol_jlabel_len), allocatable :: titlej(:) @@ -659,7 +659,7 @@ subroutine um_ukca_init(ncells_ukca, model_clock) c3_grass, c4_grass, & shrub, urban, lake, soil, ice - ! UM modules used + ! UM modules used use cv_run_mod, only: l_param_conv implicit none @@ -709,14 +709,14 @@ subroutine um_ukca_init(ncells_ukca, model_clock) if ( chem_timestep < 0_i_def ) then i_chem_timestep = default_chem_timestep - else + else if ( chem_timestep < i_timestep .or. & mod(chem_timestep, i_timestep) /= 0_i_def ) then write(log_scratch_space, '(A,I0,A,A)')'Incorrect chem_timestep found ', & chem_timestep,' This cannot be less than model timestep and has to ', & 'be fully divisible. (Check: namelist:chemistry)' call log_event(log_scratch_space, LOG_LEVEL_ERROR) - else + else i_chem_timestep = int(chem_timestep, i_um) end if end if @@ -848,11 +848,11 @@ subroutine ukca_init( row_length, rows, model_levels, bl_levels, & integer :: i_ukca_light_param=1 ! Internal Price-Rind scheme integer :: i_ukca_quasinewton_start=2, i_ukca_quasinewton_end=3 integer :: i_ukca_scenario=ukca_strat_lbc_env - integer:: i_ukca_mode_seg_size=4 ! GLOMAP-mode segment size - real(r_um) :: linox_scale_in - + integer:: i_ukca_mode_seg_size ! GLOMAP-mode segment size + real(r_um) :: linox_scale_in + character(len=ukca_photol_varname_len) :: adjusted_fname ! intermediate spc/ filename copy - + ! Variables for UKCA error handling integer :: ukca_errcode character(len=ukca_maxlen_message) :: ukca_errmsg @@ -937,8 +937,9 @@ subroutine ukca_init( row_length, rows, model_levels, bl_levels, & end if ! Set default GLOMAP segment size if no factor supplied + i_ukca_mode_seg_size = 4 ! Current working seg size for LFRic if ( ukca_mode_seg_size /= imdi ) THEN - i_ukca_mode_seg_size = ukca_mode_seg_size + i_ukca_mode_seg_size = ukca_mode_seg_size end if call ukca_setup( ukca_errcode, & @@ -1102,7 +1103,7 @@ subroutine ukca_init( row_length, rows, model_levels, bl_levels, & 'Mismatch in expected and registered photolysis reactions: ', & n_phot_spc, jppj,'. Check definitions in ukca_photol_param_mod' call log_event( log_scratch_space, LOG_LEVEL_ERROR ) - end if + end if else if ( photol_scheme == photol_scheme_fastjx ) then ! Read spectral data files, allocate arrays and set up @@ -1122,7 +1123,7 @@ subroutine ukca_init( row_length, rows, model_levels, bl_levels, & jlabel(i)=adjusted_fname(1:photol_jlabel_len) write(log_scratch_space,'(A,I6,E12.3,A12)')'FJX_JFACTA ', i, & jfacta(i),jlabel(i) - call log_event(log_scratch_space, LOG_LEVEL_INFO) + call log_event(log_scratch_space, LOG_LEVEL_INFO) end do ! call wrapper routine that reads FastJX spectral and solar cycle data @@ -1149,11 +1150,11 @@ subroutine ukca_init( row_length, rows, model_levels, bl_levels, & ! include future schemes select case (photol_scheme) case(photol_scheme_fastjx) - i_photol_scheme = photol_fastjx - case default - i_photol_scheme = photol_off + i_photol_scheme = photol_fastjx + case default + i_photol_scheme = photol_off end select - + ! Call Photolysis setup routine to initialise Photolysis ! Hardwired options, CCA field defined on full_face_level_grid, so ! l_3d_cca = .true. and n_cca_lev = number_of_layers (model_levels) @@ -1210,11 +1211,11 @@ subroutine ukca_init( row_length, rows, model_levels, bl_levels, & if (ukca_errcode /= 0) then write( log_scratch_space, '(A,I0,A,A,A,A)' ) 'Photolysis error ', & ukca_errcode, ' in ', ukca_errproc, ': ', ukca_errmsg - call log_event( log_scratch_space, LOG_LEVEL_ERROR ) + call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end if ! Obtain the list of environment fields required by Photolysis n_phot_flds_req = 0 - + call photol_get_environ_varlist(ukca_errcode, & varnames_scalar_real_ptr=photol_fldnames_scalar_real, & varnames_flat_integer_ptr=photol_fldnames_flat_integer, & @@ -1242,7 +1243,7 @@ subroutine ukca_init( row_length, rows, model_levels, bl_levels, & ! Deallocate fastjx spectral data arrays as no longer needed if ( photol_scheme == photol_scheme_fastjx ) & call deallocate_fastjx_filevars() - + end if ! Strattrop and l_ukca_photolysis ! Switch on optional UM microphysics diagnostics required by UKCA @@ -1763,7 +1764,7 @@ subroutine set_ukca_field_lists() end subroutine set_ukca_field_lists subroutine aerosol_ukca_dust_only_init( row_length, rows, model_levels, & - bl_levels, timestep, l_param_conv ) + bl_levels, timestep, l_param_conv ) implicit none @@ -1795,6 +1796,10 @@ subroutine aerosol_ukca_dust_only_init( row_length, rows, model_levels, & character(len=ukca_maxlen_message) :: ukca_errmsg character(len=ukca_maxlen_procname) :: ukca_errproc + ! Some default values - either standard values in UM, or the only ones + ! currently supported in the LFRic-side implementation. + integer:: i_ukca_mode_seg_size ! GLOMAP-mode segment size + ! Set up proto-GA configuration based on GA9. ! The ASAD Newton-Raphson Offline Oxidants scheme (ukca_chem_offline) ! is substituted for the Explicit backward-Euler scheme used in GA9 @@ -1806,6 +1811,12 @@ subroutine aerosol_ukca_dust_only_init( row_length, rows, model_levels, & ! temporary logicals will be on. (i.e. the defaults for these ! logicals, .true. by convention in UKCA, are not overridden.) + ! Set default GLOMAP segment size if no factor supplied + i_ukca_mode_seg_size = 4 ! Current working seg size for LFRic + if ( ukca_mode_seg_size /= imdi ) THEN + i_ukca_mode_seg_size = ukca_mode_seg_size + end if + call ukca_setup( ukca_errcode, & ! Switch to skip setting up constants: these will have already @@ -1842,6 +1853,7 @@ subroutine aerosol_ukca_dust_only_init( row_length, rows, model_levels, & ! General GLOMAP configuration options ! i_mode_nzts=15, & + ukca_mode_seg_size=i_ukca_mode_seg_size, & i_mode_setup=6, & i_mode_nucscav=i_mode_nucscav, & l_cv_rainout=.not.(l_ukca_plume_scav), & @@ -2048,7 +2060,7 @@ subroutine allocate_fastjx_filevars() ! ---------------------------------------------------------------------- ! Description: ! -! allocate arrays that will hold data from FastJX spectral files. +! allocate arrays that will hold data from FastJX spectral files. ! ---------------------------------------------------------------------- implicit none diff --git a/rose-stem/app/test_launch-exe/bin/test_launch_exe_configuration_meto.py b/rose-stem/app/test_launch-exe/bin/test_launch_exe_configuration_meto.py index d77f3275f..c99c7592a 100755 --- a/rose-stem/app/test_launch-exe/bin/test_launch_exe_configuration_meto.py +++ b/rose-stem/app/test_launch-exe/bin/test_launch_exe_configuration_meto.py @@ -157,7 +157,7 @@ def test_run_lfric_atm_scm_ral3_urban2t_BiP2x2_50000x50000_azspice_gnu_fast_debu capture_output=True) assert sr.returncode == 0, sr.stderr.decode("UTF-8") - def test_run_lfric_atm_nwp_gal9_mgnoukca_C48_MG_ex1a_cce_fast_debug_64bit(self, monkeypatch): + def test_run_lfric_atm_nwp_gal9_mg_C48_MG_ex1a_cce_fast_debug_64bit(self, monkeypatch): monkeypatch.setenv("TARGET_PLATFORM", "meto-ex1a") monkeypatch.setenv("RUN_METHOD", "mpiexec") monkeypatch.setenv("HYPERTHREADS", "1") diff --git a/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc b/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc index b7e58ca4d..d24f3d962 100644 --- a/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc +++ b/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc @@ -90,9 +90,9 @@ theta", }) %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_1T-C12" %} +{% elif task_ns.conf_name == "nwp_gal9_1T-C12" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C12", "DT": 1800, "tsteps": 36, @@ -105,9 +105,9 @@ {% do task_dict.update({"kgo_checks": []}) %} {% endif %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_2T-C12" %} +{% elif task_ns.conf_name == "nwp_gal9_2T-C12" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C12", "DT": 1800, "tsteps": 36, @@ -120,9 +120,9 @@ {% do task_dict.update({"kgo_checks": []}) %} {% endif %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_1T-C48_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_1T-C48_MG" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C48_MG", "DT": 1800, "tsteps": 36, @@ -136,9 +136,9 @@ {% do task_dict.update({"kgo_checks": []}) %} {% endif %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_2T-C48_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_2T-C48_MG" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C48_MG", "DT": 1800, "tsteps": 36, @@ -152,9 +152,9 @@ {% do task_dict.update({"kgo_checks": []}) %} {% endif %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_4T-C48_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_4T-C48_MG" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C48_MG", "DT": 1800, "tsteps": 36, @@ -168,10 +168,10 @@ {% do task_dict.update({"kgo_checks": []}) %} {% endif %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_3n_1T-C192_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_3n_1T-C192_MG" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C192_MG", "DT": 720, "tsteps": 120, @@ -179,10 +179,10 @@ "threads": 1, }) %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_3n_2T-C192_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_3n_2T-C192_MG" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C192_MG", "DT": 720, "tsteps": 120, @@ -191,10 +191,10 @@ "threads": 2, }) %} -{% elif task_ns.conf_name == "nwp_gal9_noukca_3n_4T-C192_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_3n_4T-C192_MG" %} {% do task_dict.update({ - "opt_confs": ["physics_segmentation","no_dust","um_dump","no_diags"], + "opt_confs": ["physics_segmentation","um_dump","no_diags"], "resolution": "C192_MG", "DT": 720, "tsteps": 120, diff --git a/rose-stem/site/meto/common/suite_config_ex1a.cylc b/rose-stem/site/meto/common/suite_config_ex1a.cylc index 604eff7ad..98f36c5ba 100644 --- a/rose-stem/site/meto/common/suite_config_ex1a.cylc +++ b/rose-stem/site/meto/common/suite_config_ex1a.cylc @@ -44,6 +44,7 @@ NUMA_REGIONS_PER_NODE = 2 LUSTRE_FILESYSTEM = true ROSE_LAUNCHER = 'mpiexec' + OMP_STACKSIZE=1g [[EX1A_BUILD]] [[[environment]]] diff --git a/rose-stem/site/meto/groups/groups_lfric_atm.cylc b/rose-stem/site/meto/groups/groups_lfric_atm.cylc index 444670968..174b5698f 100644 --- a/rose-stem/site/meto/groups/groups_lfric_atm.cylc +++ b/rose-stem/site/meto/groups/groups_lfric_atm.cylc @@ -201,8 +201,8 @@ "ex1a_omp_gnu", ], "lfric_atm_ex1a_threaded": [ - "lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_full-debug-32bit", - "lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex1a_cce_production-32bit", + "lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_full-debug-32bit", + "lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_production-32bit", "lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_fast-debug-32bit", "lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_cce_production-32bit", "lfric_atm_nwp_gal9_coarse_aero_threaded-C48_MG_ex1a_gnu_fast-debug-32bit", @@ -215,35 +215,35 @@ "ex1a_omp_gnu", ], "ex1a_omp_C12_cce": [ - "lfric_atm_nwp_gal9_noukca_1T-C12_ex1a_cce_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_2T-C12_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit", "lfric_atm_clim_gal9_1T-C12_ex1a_cce_fast-debug-32bit", "lfric_atm_clim_gal9_2T-C12_ex1a_cce_fast-debug-32bit", "lfric_atm_clim_gal9_chem_1T-C12_ex1a_cce_fast-debug-32bit", "lfric_atm_clim_gal9_chem_2T-C12_ex1a_cce_fast-debug-32bit", ], "ex1a_omp_C48_cce": [ - "lfric_atm_nwp_gal9_noukca_1T-C48_MG_ex1a_cce_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit", "lfric_atm_clim_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit", "lfric_atm_clim_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit", "lfric_atm_clim_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit", ], "ex1a_omp_C192_cce": [ - "lfric_atm_nwp_gal9_noukca_3n_1T-C192_MG_ex1a_cce_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_3n_2T-C192_MG_ex1a_cce_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_3n_4T-C192_MG_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_3n_1T-C192_MG_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_3n_2T-C192_MG_ex1a_cce_fast-debug-32bit", + "lfric_atm_nwp_gal9_3n_4T-C192_MG_ex1a_cce_fast-debug-32bit", ], "ex1a_omp_gnu": [ - "lfric_atm_nwp_gal9_noukca_1T-C12_ex1a_gnu_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_2T-C12_ex1a_gnu_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_1T-C48_MG_ex1a_gnu_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_gnu_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex1a_gnu_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_3n_1T-C192_MG_ex1a_gnu_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_3n_2T-C192_MG_ex1a_gnu_fast-debug-32bit", - "lfric_atm_nwp_gal9_noukca_3n_4T-C192_MG_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_1T-C12_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_2T-C12_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_1T-C48_MG_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_2T-C48_MG_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_4T-C48_MG_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_3n_1T-C192_MG_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_3n_2T-C192_MG_ex1a_gnu_fast-debug-32bit", + "lfric_atm_nwp_gal9_3n_4T-C192_MG_ex1a_gnu_fast-debug-32bit", "lfric_atm_clim_gal9_1T-C12_ex1a_gnu_fast-debug-32bit", "lfric_atm_clim_gal9_2T-C12_ex1a_gnu_fast-debug-32bit", "lfric_atm_clim_gal9_chem_1T-C12_ex1a_gnu_fast-debug-32bit", 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 new file mode 100644 index 000000000..251c5378c --- /dev/null +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -0,0 +1,9 @@ +Inner product checksum rho = 46D7F6F5 +Inner product checksum theta = 518E7E86 +Inner product checksum u = 6B17CB5F +Inner product checksum mr1 = 3FCBD858 +Inner product checksum mr2 = 37C2FD11 +Inner product checksum mr3 = 34CEC474 +Inner product checksum mr4 = 36CCBB27 +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 new file mode 100644 index 000000000..145f29b4c --- /dev/null +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -0,0 +1,9 @@ +Inner product checksum rho = 48D7FDF2 +Inner product checksum theta = 5392A6D4 +Inner product checksum u = 6A97C1C8 +Inner product checksum mr1 = 41CD0A6C +Inner product checksum mr2 = 39CA0FC6 +Inner product checksum mr3 = 37B1AE5A +Inner product checksum mr4 = 39608489 +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 new file mode 100644 index 000000000..43dd7db22 --- /dev/null +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -0,0 +1,9 @@ +Inner product checksum rho = 46D7F7DE +Inner product checksum theta = 518E7EA1 +Inner product checksum u = 6B17C572 +Inner product checksum mr1 = 3FCBE9BB +Inner product checksum mr2 = 37B9B7A7 +Inner product checksum mr3 = 34CF2B07 +Inner product checksum mr4 = 36D31CAE +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 new file mode 100644 index 000000000..45169f21d --- /dev/null +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -0,0 +1,9 @@ +Inner product checksum rho = 48D7FE30 +Inner product checksum theta = 5392A6B2 +Inner product checksum u = 6A97C240 +Inner product checksum mr1 = 41CD07BE +Inner product checksum mr2 = 39CE79BE +Inner product checksum mr3 = 37B38AEC +Inner product checksum mr4 = 395E3392 +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 new file mode 100644 index 000000000..a0f66c0a6 --- /dev/null +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_full-debug-32bit.txt @@ -0,0 +1,9 @@ +Inner product checksum rho = 48D7FD0C +Inner product checksum theta = 5392A6D8 +Inner product checksum u = 6A97B91D +Inner product checksum mr1 = 41CD0EA5 +Inner product checksum mr2 = 39CD893A +Inner product checksum mr3 = 37B79510 +Inner product checksum mr4 = 395E278D +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 new file mode 100644 index 000000000..f0cee7a7c --- /dev/null +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -0,0 +1,9 @@ +Inner product checksum rho = 48D7FE4D +Inner product checksum theta = 5392A6C3 +Inner product checksum u = 6A97BE24 +Inner product checksum mr1 = 41CD0B6C +Inner product checksum mr2 = 39CA3DB4 +Inner product checksum mr3 = 37B778BC +Inner product checksum mr4 = 3960FAA3 +Inner product checksum mr5 = 0 +Inner product checksum mr6 = 0 diff --git a/rose-stem/site/ncas/groups/groups_lfric_atm.cylc b/rose-stem/site/ncas/groups/groups_lfric_atm.cylc index a5e6eefdd..b84ccb279 100644 --- a/rose-stem/site/ncas/groups/groups_lfric_atm.cylc +++ b/rose-stem/site/ncas/groups/groups_lfric_atm.cylc @@ -3,40 +3,40 @@ "lfric_atm_nwp_archer2": [ "lfric_atm_nwp_gal9-C48_MG_ex_gnu_full-debug-64bit", "lfric_atm_nwp_gal9-C48_MG_ex_gnu_production-64bit", - "lfric_atm_nwp_gal9_noukca_3n_1T-C192_MG_ex_gnu_production-64bit", + "lfric_atm_nwp_gal9_3n_1T-C192_MG_ex_gnu_production-64bit", ], "archer2_omp_developer": [ "archer2_omp_developer_cce", "archer2_omp_developer_gnu", ], "archer2_omp_developer_cce": [ - "lfric_atm_nwp_gal9_noukca_1T-C12_ex_cce_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_2T-C12_ex_cce_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_1T-C48_MG_ex_cce_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex_cce_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex_cce_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_3n_1T-C192_MG_ex_cce_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_3n_2T-C192_MG_ex_cce_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_3n_4T-C192_MG_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_1T-C12_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_2T-C12_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_1T-C48_MG_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_2T-C48_MG_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_4T-C48_MG_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_3n_1T-C192_MG_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_3n_2T-C192_MG_ex_cce_fast-debug-64bit", + "lfric_atm_nwp_gal9_3n_4T-C192_MG_ex_cce_fast-debug-64bit", ], "archer2_omp_developer_gnu": [ - "lfric_atm_nwp_gal9_noukca_1T-C12_ex_gnu_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_2T-C12_ex_gnu_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_1T-C48_MG_ex_gnu_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex_gnu_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex_gnu_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_3n_1T-C192_MG_ex_gnu_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_3n_2T-C192_MG_ex_gnu_fast-debug-64bit", - "lfric_atm_nwp_gal9_noukca_3n_4T-C192_MG_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_1T-C12_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_2T-C12_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_1T-C48_MG_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_2T-C48_MG_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_4T-C48_MG_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_3n_1T-C192_MG_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_3n_2T-C192_MG_ex_gnu_fast-debug-64bit", + "lfric_atm_nwp_gal9_3n_4T-C192_MG_ex_gnu_fast-debug-64bit", ], "lfric_atm_nwp_quick": [ "lfric_atm_nwp_gal9-C48_MG_ex_gnu_full-debug-64bit", ], "lfric_atm_c192_gnu": [ - "lfric_atm_nwp_gal9_noukca_3n_1T-C192_MG_ex_gnu_production-64bit-rbl32", + "lfric_atm_nwp_gal9_3n_1T-C192_MG_ex_gnu_production-64bit-rbl32", ], "lfric_atm_c192_cce": [ - "lfric_atm_nwp_gal9_noukca_3n_1T-C192_MG_ex_cce_production-64bit-rbl32", + "lfric_atm_nwp_gal9_3n_1T-C192_MG_ex_cce_production-64bit-rbl32", ], "lfric_atm_c192": [ "lfric_atm_c192_gnu", diff --git a/rose-stem/site/ncas/lfric_atm/tasks_lfric_atm.cylc b/rose-stem/site/ncas/lfric_atm/tasks_lfric_atm.cylc index 1e932371b..eaf392cd0 100644 --- a/rose-stem/site/ncas/lfric_atm/tasks_lfric_atm.cylc +++ b/rose-stem/site/ncas/lfric_atm/tasks_lfric_atm.cylc @@ -1,6 +1,6 @@ {% do LOG.debug("Started in site/ncas/lfric_atm/tasks_lfric_atm.cylc") %} -{% if task_ns.conf_name == "nwp_gal9_noukca_3n_1T-C192_MG" %} +{% if task_ns.conf_name == "nwp_gal9_3n_1T-C192_MG" %} {% do task_dict.update({ "xios_nodes": 4, @@ -31,47 +31,47 @@ "plot_str": "", }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_1T-C12" %} +{% elif task_ns.conf_name == "nwp_gal9_1T-C12" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_1T-C12" %} +{% elif task_ns.conf_name == "nwp_gal9_1T-C12" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_2T-C12" %} +{% elif task_ns.conf_name == "nwp_gal9_2T-C12" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_1T-C48_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_1T-C48_MG" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_2T-C48_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_2T-C48_MG" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_4T-C48_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_4T-C48_MG" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_3n_1T-C192_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_3n_1T-C192_MG" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_3n_2T-C192_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_3n_2T-C192_MG" %} {% do task_dict.update({ "kgo_checks": 'None' }) %} -{% elif task_ns.conf_name == "nwp_gal9_mgnoukca_3n_4T-C192_MG" %} +{% elif task_ns.conf_name == "nwp_gal9_3n_4T-C192_MG" %} {% do task_dict.update({ "kgo_checks": 'None' }) %}