diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index da42a74b5..74b8826f0 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -5,3 +5,4 @@ | james-bruten-mo | James Bruten | Met Office | 2025-12-09 | | jennyhickson | Jenny Hickson | Met Office | 2025-12-10 | | mo-marqh | mark Hedley | Met Office | 2025-12-11 | +| tommbendall | Thomas Bendall | Met Office | 2026-01-23 | \ No newline at end of file diff --git a/applications/adjoint_tests/example/configuration.nml b/applications/adjoint_tests/example/configuration.nml index 84ce2a779..19260dfbf 100644 --- a/applications/adjoint_tests/example/configuration.nml +++ b/applications/adjoint_tests/example/configuration.nml @@ -54,6 +54,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/gravity_wave/example/configuration.nml b/applications/gravity_wave/example/configuration.nml index 615f9d0bc..a0d7e7095 100644 --- a/applications/gravity_wave/example/configuration.nml +++ b/applications/gravity_wave/example/configuration.nml @@ -32,6 +32,8 @@ start_dump_filename = '' &finite_element cellshape = 'quadrilateral' coord_order = 1 +coord_order_multigrid = 1, +coord_space = 'Wchi', coord_system = 'native' element_order_h = 0 element_order_v = 0 diff --git a/applications/gravity_wave/unit-test/kernel/compute_q_operator_kernel_mod_test.pf b/applications/gravity_wave/unit-test/kernel/compute_q_operator_kernel_mod_test.pf index e4337c084..ecde0750a 100644 --- a/applications/gravity_wave/unit-test/kernel/compute_q_operator_kernel_mod_test.pf +++ b/applications/gravity_wave/unit-test/kernel/compute_q_operator_kernel_mod_test.pf @@ -31,7 +31,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only: cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only: feign_finite_element_config implicit none @@ -42,6 +42,8 @@ contains cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & coord_system=coord_system_xyz, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=1_i_def, & element_order_v=1_i_def, & rehabilitate=.true., & diff --git a/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf b/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf index 8a3ca705d..cfb66af04 100644 --- a/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf +++ b/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf @@ -28,7 +28,7 @@ contains stretching_method_linear use sci_chi_transform_mod, only : init_chi_transforms use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_finite_element_config, & @@ -60,6 +60,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/applications/gungho_model/example/configuration.nml b/applications/gungho_model/example/configuration.nml index ea60b8aa1..a9f920a1e 100644 --- a/applications/gungho_model/example/configuration.nml +++ b/applications/gungho_model/example/configuration.nml @@ -48,6 +48,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wtheta', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/gungho_model/lam_example/baroclinic/config_driver.nml b/applications/gungho_model/lam_example/baroclinic/config_driver.nml index 43d72b197..a8af48cd6 100644 --- a/applications/gungho_model/lam_example/baroclinic/config_driver.nml +++ b/applications/gungho_model/lam_example/baroclinic/config_driver.nml @@ -43,6 +43,8 @@ lbc_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wtheta', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/gungho_model/lam_example/baroclinic/config_lam.nml b/applications/gungho_model/lam_example/baroclinic/config_lam.nml index d63ada536..ca0998f21 100644 --- a/applications/gungho_model/lam_example/baroclinic/config_lam.nml +++ b/applications/gungho_model/lam_example/baroclinic/config_lam.nml @@ -59,6 +59,8 @@ lbc_filename='lbc', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wtheta', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/gungho_model/lam_example/straka/config_driver.nml b/applications/gungho_model/lam_example/straka/config_driver.nml index 82fd2d418..9141d3226 100644 --- a/applications/gungho_model/lam_example/straka/config_driver.nml +++ b/applications/gungho_model/lam_example/straka/config_driver.nml @@ -45,6 +45,8 @@ lbc_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wtheta', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/gungho_model/lam_example/straka/config_lam.nml b/applications/gungho_model/lam_example/straka/config_lam.nml index 636c9e6e0..563c333d2 100644 --- a/applications/gungho_model/lam_example/straka/config_lam.nml +++ b/applications/gungho_model/lam_example/straka/config_lam.nml @@ -57,6 +57,8 @@ lbc_filename='lbc', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wtheta', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example/configuration.nml b/applications/jedi_lfric_tests/example/configuration.nml index b2d3c1ff0..e83ff167b 100644 --- a/applications/jedi_lfric_tests/example/configuration.nml +++ b/applications/jedi_lfric_tests/example/configuration.nml @@ -69,6 +69,8 @@ start_dump_filename='final_pert', cellshape='quadrilateral', coord_order=1, coord_system='native', +coord_order_multigrid=1, +coord_space='Wchi', element_order_h=0, element_order_v=0, rehabilitate=.true., diff --git a/applications/jedi_lfric_tests/example_forecast/configuration.nml b/applications/jedi_lfric_tests/example_forecast/configuration.nml index 016e61fbc..fdf56e773 100644 --- a/applications/jedi_lfric_tests/example_forecast/configuration.nml +++ b/applications/jedi_lfric_tests/example_forecast/configuration.nml @@ -76,6 +76,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_forecast_pseudo/configuration.nml b/applications/jedi_lfric_tests/example_forecast_pseudo/configuration.nml index 9447dfff7..9f1bce5ed 100644 --- a/applications/jedi_lfric_tests/example_forecast_pseudo/configuration.nml +++ b/applications/jedi_lfric_tests/example_forecast_pseudo/configuration.nml @@ -47,6 +47,8 @@ stretching_method='smooth', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_forecast_pseudo/configuration_op.nml b/applications/jedi_lfric_tests/example_forecast_pseudo/configuration_op.nml index c179e76eb..f15875635 100644 --- a/applications/jedi_lfric_tests/example_forecast_pseudo/configuration_op.nml +++ b/applications/jedi_lfric_tests/example_forecast_pseudo/configuration_op.nml @@ -47,6 +47,8 @@ stretching_method='smooth', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml b/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml index 53acee0fc..4e2e01597 100644 --- a/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml +++ b/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml @@ -106,6 +106,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml b/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml index f61e5aab0..5fdfff10e 100644 --- a/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml +++ b/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml @@ -106,6 +106,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration_op.nml b/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration_op.nml index 7b9d54bf3..49ecc15ed 100644 --- a/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration_op.nml +++ b/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration_op.nml @@ -106,6 +106,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml b/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml index 283c5dafb..fe7d6a8a7 100644 --- a/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml +++ b/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml @@ -107,6 +107,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry.nml b/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry.nml index c9b945825..f802be2ec 100644 --- a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry.nml +++ b/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry.nml @@ -106,6 +106,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry_relaxed.nml b/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry_relaxed.nml index 1296925a7..09f983d90 100644 --- a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry_relaxed.nml +++ b/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry_relaxed.nml @@ -104,6 +104,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/jedi_lfric_tests/integration-test/algorithm/resources/algorithm_test_configuration.nml b/applications/jedi_lfric_tests/integration-test/algorithm/resources/algorithm_test_configuration.nml index 8f09d097b..d3c250ef0 100644 --- a/applications/jedi_lfric_tests/integration-test/algorithm/resources/algorithm_test_configuration.nml +++ b/applications/jedi_lfric_tests/integration-test/algorithm/resources/algorithm_test_configuration.nml @@ -22,6 +22,8 @@ element_order_h=0, element_order_v=0, rehabilitate=.true., coord_order=1 +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native' / diff --git a/applications/jedi_lfric_tests/source/jedi_tlm_tests.f90 b/applications/jedi_lfric_tests/source/jedi_tlm_tests.f90 index f2266fdb5..426432393 100644 --- a/applications/jedi_lfric_tests/source/jedi_tlm_tests.f90 +++ b/applications/jedi_lfric_tests/source/jedi_tlm_tests.f90 @@ -74,7 +74,7 @@ program jedi_tlm_tests character( str_def ) :: forecast_length_str real( kind=r_def ) :: dot_product_1 real( kind=r_def ) :: dot_product_2 - real( kind=r_def ), parameter :: absolute_tolerance = 1.0E-4_r_def + real( kind=r_def ), parameter :: absolute_tolerance = 5.0E-4_r_def real( kind=r_def ) :: machine_tolerance real( kind=r_def ) :: absolute_diff real( kind=r_def ) :: relative_diff diff --git a/applications/jules/example/configuration.nml b/applications/jules/example/configuration.nml index fd648227e..862cf4c0b 100644 --- a/applications/jules/example/configuration.nml +++ b/applications/jules/example/configuration.nml @@ -46,6 +46,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/lfric2lfric/example/configuration.nml b/applications/lfric2lfric/example/configuration.nml index b70cd2d22..a1b9e89ef 100644 --- a/applications/lfric2lfric/example/configuration.nml +++ b/applications/lfric2lfric/example/configuration.nml @@ -38,6 +38,8 @@ element_order_h = 0, element_order_v = 0, rehabilitate = .true., coord_order = 1, +coord_order_multigrid = 1, +coord_space = 'Wchi', / &io diff --git a/applications/lfric_atm/example/configuration.nml b/applications/lfric_atm/example/configuration.nml index 5301f68ed..d4ed1438d 100644 --- a/applications/lfric_atm/example/configuration.nml +++ b/applications/lfric_atm/example/configuration.nml @@ -147,6 +147,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/lfric_coupled/example/configuration.nml b/applications/lfric_coupled/example/configuration.nml index 643f92211..f4843296c 100644 --- a/applications/lfric_coupled/example/configuration.nml +++ b/applications/lfric_coupled/example/configuration.nml @@ -78,6 +78,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wtheta', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/linear_model/example/configuration.nml b/applications/linear_model/example/configuration.nml index 5ed21fc6c..e20716692 100644 --- a/applications/linear_model/example/configuration.nml +++ b/applications/linear_model/example/configuration.nml @@ -48,6 +48,8 @@ ls_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/linear_model/example_file/config_linear.nml b/applications/linear_model/example_file/config_linear.nml index 18df08580..438da326a 100644 --- a/applications/linear_model/example_file/config_linear.nml +++ b/applications/linear_model/example_file/config_linear.nml @@ -45,6 +45,8 @@ ls_filename='ls', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/linear_model/example_file/config_nonlinear.nml b/applications/linear_model/example_file/config_nonlinear.nml index b32d3f15b..4c7a32ede 100644 --- a/applications/linear_model/example_file/config_nonlinear.nml +++ b/applications/linear_model/example_file/config_nonlinear.nml @@ -43,6 +43,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/name_transport/example/configuration.nml b/applications/name_transport/example/configuration.nml index 3bcb4b2f4..0e3207739 100644 --- a/applications/name_transport/example/configuration.nml +++ b/applications/name_transport/example/configuration.nml @@ -32,6 +32,8 @@ element_order_h=0, element_order_v=0, rehabilitate=.true., coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native' vorticity_in_w1=.true., / diff --git a/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf b/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf index 7ae24e5d4..6c47db606 100644 --- a/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf +++ b/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf @@ -37,7 +37,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_finite_element_config, & @@ -67,6 +67,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/applications/ngarch/example/configuration_bl.nml b/applications/ngarch/example/configuration_bl.nml index 87c3e5318..bdc1cea37 100644 --- a/applications/ngarch/example/configuration_bl.nml +++ b/applications/ngarch/example/configuration_bl.nml @@ -116,6 +116,8 @@ surface_frac_ancil_path='vegetation/fractions_cci/qrparm.veg.frac.fixed', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/ngarch/example/configuration_casim.nml b/applications/ngarch/example/configuration_casim.nml index 4db857e52..d41f21910 100644 --- a/applications/ngarch/example/configuration_casim.nml +++ b/applications/ngarch/example/configuration_casim.nml @@ -160,6 +160,8 @@ surface_frac_ancil_path='vegetation/fractions_cci/qrparm.veg.frac.fixed', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', element_order_h=0, element_order_v=0, diff --git a/applications/shallow_water/example/configuration.nml b/applications/shallow_water/example/configuration.nml index d4ab292f9..4ac2428db 100644 --- a/applications/shallow_water/example/configuration.nml +++ b/applications/shallow_water/example/configuration.nml @@ -275,6 +275,8 @@ start_dump_directory = '' ! These do not need changing cellshape = 'quadrilateral' coord_order = 1 +coord_order_multigrid = 1 +coord_space = 'Wchi' coord_system = 'native' element_order_h = 0 element_order_v = 0 diff --git a/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf index fe44262b4..3fe2e4712 100644 --- a/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf @@ -51,7 +51,7 @@ contains feign_planet_config, & feign_shallow_water_settings_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use shallow_water_settings_config_mod, & only : momentum_form_momentum, & @@ -77,6 +77,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf index 3c69d79cb..984d7ce91 100644 --- a/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf @@ -52,7 +52,7 @@ contains feign_shallow_water_settings_config use finite_element_config_mod, & only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use shallow_water_settings_config_mod, & only : momentum_form_momentum, & @@ -78,6 +78,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf index 29103cf75..19653ad39 100644 --- a/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf @@ -51,7 +51,7 @@ contains feign_planet_config, & feign_shallow_water_settings_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use shallow_water_settings_config_mod, & only : momentum_form_momentum, & @@ -77,6 +77,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf index 846105876..db33c9827 100644 --- a/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf @@ -57,7 +57,8 @@ contains feign_shallow_water_test_coeff_config, & feign_shallow_water_settings_config use finite_element_config_mod, only: cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, & + coord_space_wchi use shallow_water_settings_config_mod, only: momentum_form_momentum, & swe_test_swe_gaussian_hill, & time_scheme_semi_implicit @@ -76,6 +77,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & coord_system=coord_system_xyz, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=0_i_def, & element_order_v=0_i_def, & rehabilitate=.true., & diff --git a/applications/solver/example/configuration.nml b/applications/solver/example/configuration.nml index 4eaececfd..e7721cddf 100644 --- a/applications/solver/example/configuration.nml +++ b/applications/solver/example/configuration.nml @@ -27,6 +27,8 @@ element_order_h=0, element_order_v=0, rehabilitate=.true., coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native', / diff --git a/applications/solver/rose-meta/lfric-solver/HEAD/rose-meta.conf b/applications/solver/rose-meta/lfric-solver/HEAD/rose-meta.conf index e068d8a6e..8f95fc215 100644 --- a/applications/solver/rose-meta/lfric-solver/HEAD/rose-meta.conf +++ b/applications/solver/rose-meta/lfric-solver/HEAD/rose-meta.conf @@ -269,17 +269,48 @@ values='triangle', 'quadrilateral' [namelist:finite_element=coord_order] compulsory=true -description=Order of the coordinate space. -fail-if=this < 0 ; -help=Order of the coordinate space. If 0 is chosen, this will be the continuous - =W0 space, with the order set by the element order. This option is only - =possible for certain geometries and topologies. Otherwise, this will be - =a discontinuous space. +description=Horizontal polynomial order of the coordinate space. +fail-if=this < 1 ; +help=Horizontal order of the polynomials used to describe the coordinate space. + =The vertical order is determined by the coordinate system. If a native + =coordinates system is chosen, the vertical coordinates are linear. + =If Cartesian coordinates are chosen, the vertical coordinates have the same + =order as the horizontal. !kind=default -range=0: +range=1: sort-key=Panel-A03 type=integer +[namelist:finite_element=coord_order_multigrid] +compulsory=true +description=Horizontal polynomial order of coordinates for multigrid meshes. +fail-if=this < 1 ; +help=The order of the coordinate spaces can be set separately for the prime + =mesh and the others in a multigrid chain. For instance it may not be + =necessary to use higher order coordinates on coarser meshes. + =The vertical order is set as for the coord_order option. +!kind=default +range=1: +sort-key=Panel-A03 +type=integer + +[namelist:finite_element=coord_space] +compulsory=true +description=The finite element space to use to hold the coordinate fields. +!enumeration=true +fail-if= +help=Different spaces have different continuity properties: + =Wchi: fully discontinuous. + =Wtheta: discontinuous in the horizontal, but continuous in the vertical. + = This is only appropriate for native coordinate systems, which + = separate the horizontal and vertical coordinates. + =W0: fully continuous. This is only appropriate for non-periodic planar + = domains, or when using the 'xyz' coordinate system on spherical + = domains. +sort-key=Panel-A04 +value-titles='Wchi', 'Wtheta', 'W0' +values='Wchi', 'Wtheta', 'W0' + [namelist:finite_element=coord_system] compulsory=true description=The coordinate system that will be stored in the chi coordinate diff --git a/applications/transport/example/configuration.nml b/applications/transport/example/configuration.nml index e240dc3ad..e99ba84d7 100644 --- a/applications/transport/example/configuration.nml +++ b/applications/transport/example/configuration.nml @@ -32,6 +32,8 @@ element_order_h=0, element_order_v=0, rehabilitate=.true., coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native' vorticity_in_w1=.true., / diff --git a/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf b/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf index 7fcd8dc18..da3155fa4 100644 --- a/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf +++ b/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf @@ -46,7 +46,7 @@ contains feign_idealised_config, & feign_initial_tracer_field_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use idealised_config_mod, only : test_slotted_cylinder implicit none @@ -65,6 +65,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf b/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf index 04e00da19..3e7b4c0d4 100644 --- a/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf +++ b/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf @@ -49,7 +49,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_finite_element_config, & @@ -79,6 +79,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/dependencies.yaml b/dependencies.yaml index caab36487..791bdf83d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -30,8 +30,8 @@ lfric_apps: ref: lfric_core: - source: git@github.com:MetOffice/lfric_core.git - ref: 2025.12.1 + source: git@github.com:tommbendall/lfric_core.git + ref: TBendall/CoordSpace moci: source: git@github.com:MetOffice/moci.git diff --git a/interfaces/jedi_lfric_interface/integration-test/time/resources/jedi_lfric_time_test_configuration.nml b/interfaces/jedi_lfric_interface/integration-test/time/resources/jedi_lfric_time_test_configuration.nml index 08bd34982..9a6529b6c 100644 --- a/interfaces/jedi_lfric_interface/integration-test/time/resources/jedi_lfric_time_test_configuration.nml +++ b/interfaces/jedi_lfric_interface/integration-test/time/resources/jedi_lfric_time_test_configuration.nml @@ -22,6 +22,8 @@ element_order_h=0, element_order_v=0, rehabilitate=.true., coord_order=1 +coord_order_multigrid=1, +coord_space='Wchi', coord_system='native' / diff --git a/rose-stem/app/gungho_model/opt/rose-app-agnesi_hyd_cart.conf b/rose-stem/app/gungho_model/opt/rose-app-agnesi_hyd_cart.conf index 910eb4fba..fc744b4fe 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-agnesi_hyd_cart.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-agnesi_hyd_cart.conf @@ -11,6 +11,9 @@ dl_str=0.015 domain_height=50000.0 number_of_layers=200 +[namelist:finite_element] +coord_space='Wchi' + [namelist:formulation] dlayer_on=.true. rotating=.false. diff --git a/rose-stem/app/gungho_model/opt/rose-app-agnesi_nhyd_cart.conf b/rose-stem/app/gungho_model/opt/rose-app-agnesi_nhyd_cart.conf index e5e155e81..66f3a7d0b 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-agnesi_nhyd_cart.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-agnesi_nhyd_cart.conf @@ -11,6 +11,9 @@ dl_str=0.015 domain_height=35000.0 number_of_layers=140 +[namelist:finite_element] +coord_space='Wchi' + [namelist:formulation] dlayer_on=.true. rotating=.false. diff --git a/rose-stem/app/gungho_model/opt/rose-app-robert-moist-lam.conf b/rose-stem/app/gungho_model/opt/rose-app-robert-moist-lam.conf index 436275a25..8a630dc41 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-robert-moist-lam.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-robert-moist-lam.conf @@ -25,6 +25,9 @@ rim_width_ns=-1 domain_height=1500.0 number_of_layers=150 +[namelist:finite_element] +coord_space='Wchi' + [namelist:formulation] moisture_formulation='traditional' rotating=.false. diff --git a/rose-stem/app/gungho_model/opt/rose-app-schar3d_cart.conf b/rose-stem/app/gungho_model/opt/rose-app-schar3d_cart.conf index 734b66817..a64ae874f 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-schar3d_cart.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-schar3d_cart.conf @@ -11,6 +11,9 @@ dl_str=0.15 domain_height=30000.0 number_of_layers=100 +[namelist:finite_element] +coord_space='Wchi' + [namelist:formulation] dlayer_on=.true. rotating=.false. diff --git a/rose-stem/app/gungho_model/opt/rose-app-schar_cart.conf b/rose-stem/app/gungho_model/opt/rose-app-schar_cart.conf index c5f027b99..f79c2e010 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-schar_cart.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-schar_cart.conf @@ -11,6 +11,9 @@ dl_str=0.15 domain_height=30000.0 number_of_layers=100 +[namelist:finite_element] +coord_space='Wchi' + [namelist:formulation] dlayer_on=.true. rotating=.false. diff --git a/rose-stem/app/gungho_model/opt/rose-app-schar_cart_8s.conf b/rose-stem/app/gungho_model/opt/rose-app-schar_cart_8s.conf index bf8322559..476c7bb34 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-schar_cart_8s.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-schar_cart_8s.conf @@ -11,6 +11,9 @@ dl_str=0.15 domain_height=30000.0 number_of_layers=100 +[namelist:finite_element] +coord_space='Wchi' + [namelist:formulation] dlayer_on=.true. rotating=.false. diff --git a/rose-stem/app/gungho_model/rose-app.conf b/rose-stem/app/gungho_model/rose-app.conf index d4bc76fa1..6e300935f 100644 --- a/rose-stem/app/gungho_model/rose-app.conf +++ b/rose-stem/app/gungho_model/rose-app.conf @@ -390,6 +390,8 @@ start_dump_filename='' [namelist:finite_element] cellshape='quadrilateral' coord_order=1 +coord_order_multigrid=1 +coord_space='Wtheta' coord_system='native' element_order_h=0 element_order_v=0 diff --git a/rose-stem/app/jedi_lfric_tests/rose-app.conf b/rose-stem/app/jedi_lfric_tests/rose-app.conf index a683eda8f..0ab0f2101 100644 --- a/rose-stem/app/jedi_lfric_tests/rose-app.conf +++ b/rose-stem/app/jedi_lfric_tests/rose-app.conf @@ -396,6 +396,8 @@ start_dump_filename='final_pert' [namelist:finite_element] cellshape='quadrilateral' coord_order=1 +coord_order_multigrid=1 +coord_space='Wtheta' coord_system='native' element_order_h=0 element_order_v=0 diff --git a/rose-stem/app/lfric2um/rose-app.conf b/rose-stem/app/lfric2um/rose-app.conf index 6271a1339..bce23d074 100644 --- a/rose-stem/app/lfric2um/rose-app.conf +++ b/rose-stem/app/lfric2um/rose-app.conf @@ -79,6 +79,8 @@ planet_radius=6371229.0 [namelist:finite_element] cellshape='quadrilateral' coord_order=1 +coord_order_multigrid=1 +coord_space='Wchi' coord_system='native' element_order_h=0 element_order_v=0 diff --git a/rose-stem/app/lfric_atm/opt/rose-app-hd209458b.conf b/rose-stem/app/lfric_atm/opt/rose-app-hd209458b.conf index e05601b1a..7879e5ef4 100644 --- a/rose-stem/app/lfric_atm/opt/rose-app-hd209458b.conf +++ b/rose-stem/app/lfric_atm/opt/rose-app-hd209458b.conf @@ -78,6 +78,9 @@ start_dump_directory='' start_dump_filename='' !!surface_frac_ancil_path='' +[namelist:finite_element] +coord_space='Wchi' + [namelist:formulation] moisture_formulation='dry' shallow=.false. diff --git a/rose-stem/app/lfric_atm/opt/rose-app-mol.conf b/rose-stem/app/lfric_atm/opt/rose-app-mol.conf index 375345aea..4f2cfad72 100644 --- a/rose-stem/app/lfric_atm/opt/rose-app-mol.conf +++ b/rose-stem/app/lfric_atm/opt/rose-app-mol.conf @@ -1,6 +1,9 @@ [namelist:boundaries] transport_overwrite_freq='split_step' +[namelist:finite_element] +coord_space='Wchi' + [namelist:transport] adjust_vhv_wind=.false. ffsl_unity_3d=.false. diff --git a/rose-stem/app/lfric_atm/rose-app.conf b/rose-stem/app/lfric_atm/rose-app.conf index d7f7988a5..d539635a5 100644 --- a/rose-stem/app/lfric_atm/rose-app.conf +++ b/rose-stem/app/lfric_atm/rose-app.conf @@ -414,7 +414,9 @@ surface_frac_ancil_path='vegetation/fractions_cci/qrparm.veg.frac.fixed' [namelist:finite_element] cellshape='quadrilateral' -coord_order=1 +coord_order=2 +coord_order_multigrid=1 +coord_space='Wtheta' coord_system='native' element_order_h=0 element_order_v=0 diff --git a/rose-stem/app/linear_model/rose-app.conf b/rose-stem/app/linear_model/rose-app.conf index 1c83c6635..bf1d8730a 100644 --- a/rose-stem/app/linear_model/rose-app.conf +++ b/rose-stem/app/linear_model/rose-app.conf @@ -400,6 +400,8 @@ start_dump_filename='final_2021060200-2021060207.pert' [namelist:finite_element] cellshape='quadrilateral' coord_order=1 +coord_order_multigrid=1 +coord_space='Wtheta' coord_system='native' element_order_h=0 element_order_v=0 diff --git a/rose-stem/app/scintelapi/rose-app.conf b/rose-stem/app/scintelapi/rose-app.conf index 4133bc9a9..b7e7f9db8 100644 --- a/rose-stem/app/scintelapi/rose-app.conf +++ b/rose-stem/app/scintelapi/rose-app.conf @@ -50,6 +50,8 @@ planet_radius=6371229.0 [namelist:finite_element] cellshape='quadrilateral' coord_order=1 +coord_order_multigrid=1 +coord_space='Wchi' coord_system='xyz' element_order_h=0 element_order_v=0 diff --git a/rose-stem/app/solver/rose-app.conf b/rose-stem/app/solver/rose-app.conf index 51300e343..3cc3be0b6 100644 --- a/rose-stem/app/solver/rose-app.conf +++ b/rose-stem/app/solver/rose-app.conf @@ -47,6 +47,8 @@ planet_radius=6371229.0 [namelist:finite_element] cellshape='quadrilateral' coord_order=2 +coord_order_multigrid=2 +coord_space='Wchi' coord_system='xyz' element_order_h=0 element_order_v=0 diff --git a/rose-stem/app/um2lfric/rose-app.conf b/rose-stem/app/um2lfric/rose-app.conf index 7e5482141..c0e185f5e 100644 --- a/rose-stem/app/um2lfric/rose-app.conf +++ b/rose-stem/app/um2lfric/rose-app.conf @@ -69,6 +69,8 @@ planet_radius=6371229.0 [namelist:finite_element] cellshape='quadrilateral' coord_order=1 +coord_order_multigrid=1 +coord_space='Wchi' coord_system='native' element_order_h=0 element_order_v=0 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_azspice_gnu_fast-debug-64bit.txt index 02a626e51..dabbc05c2 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40DAA271B80432F1 -Inner product checksum theta = 42418E8249EA97ED -Inner product checksum u = 43F0A73C14A3943D +Inner product checksum rho = 40DAA271B80432F0 +Inner product checksum theta = 42418E8249EA97EE +Inner product checksum u = 43F0A73C14A39438 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-alt1-C24s_MG_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-alt1-C24s_MG_azspice_gnu_fast-debug-64bit.txt index 1839f3574..c3678b42a 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-alt1-C24s_MG_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-alt1-C24s_MG_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40E31B5B7CB337D5 -Inner product checksum theta = 4210461DE3B34870 -Inner product checksum u = 4500F56A544F1F86 +Inner product checksum rho = 40E31B59D4C0228C +Inner product checksum theta = 4210461DCE5D160E +Inner product checksum u = 4500F581FBED9C3B diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_azspice_gnu_fast-debug-64bit.txt index 019d1c4bd..511e6abfc 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40FE89845A997E06 -Inner product checksum theta = 4210F00A9EEFEDF3 -Inner product checksum u = 42EF4B7C9D6C01D8 +Inner product checksum rho = 40FE89845A999BD9 +Inner product checksum theta = 4210F00A9EEFEDB9 +Inner product checksum u = 42EF4B7C9D6628D0 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200-C24_MG_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200-C24_MG_azspice_gnu_fast-debug-64bit.txt index 64287df9b..ac166b089 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200-C24_MG_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200-C24_MG_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40E8E802280ABCF8 -Inner product checksum theta = 4204E59A63CB78B4 -Inner product checksum u = 4391E522B368BE24 +Inner product checksum rho = 40E8E802280ABCFD +Inner product checksum theta = 4204E59A63CB78B3 +Inner product checksum u = 4391E522B31A51BD diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200_realorog-C48_MG_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200_realorog-C48_MG_azspice_gnu_fast-debug-64bit.txt index 0872d11c8..e7e9199fd 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200_realorog-C48_MG_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip200_realorog-C48_MG_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 41094B0D90339E0A -Inner product checksum theta = 4224DF77B2266354 -Inner product checksum u = 438852006BE9E2CD +Inner product checksum rho = 41094B0D90339E14 +Inner product checksum theta = 4224DF77B2266355 +Inner product checksum u = 438852006C17DEC6 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip301-C24_MG_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip301-C24_MG_azspice_gnu_fast-debug-64bit.txt index 81c9f6506..48021ebb0 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip301-C24_MG_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_dcmip301-C24_MG_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40D3FF37BCAE739E -Inner product checksum theta = 41EC4ACBE79A8587 -Inner product checksum u = 44176CD1D18E18FC +Inner product checksum rho = 40D3FF37BCAE74E8 +Inner product checksum theta = 41EC4ACBE79A846A +Inner product checksum u = 44176CD1D18E1CFB diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_lfric-real-domain-C48_MG_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_lfric-real-domain-C48_MG_azspice_gnu_fast-debug-64bit.txt index ef2d843f4..8c3be214f 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_lfric-real-domain-C48_MG_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_lfric-real-domain-C48_MG_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 4122BD52DCC8006A -Inner product checksum theta = 4240B2570BC700C9 -Inner product checksum u = 44F9DB80026D577A +Inner product checksum rho = 4122BD52DCC69A9C +Inner product checksum theta = 4240B2570BC48532 +Inner product checksum u = 44F9DB80026A65AA diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt index 3a9e384d6..88a23a54a 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ -Inner product checksum rho = 41002AB9840956BE -Inner product checksum theta = 4204AB102F77F16E -Inner product checksum u = 42156E231FAF40B2 -Inner product checksum mr1 = 4047451938CF964E +Inner product checksum rho = 41002AB7A7403E1B +Inner product checksum theta = 4204AB102C6CF302 +Inner product checksum u = 42156E20D625DC15 +Inner product checksum mr1 = 4047450C5E6E6764 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt index 072ad5f3b..e6209eef8 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ -Inner product checksum rho = 410029843CDCD5BA -Inner product checksum theta = 4204AB0A9C94010A -Inner product checksum u = 4218421EDC590CAE -Inner product checksum mr1 = 4047C516C5BD62B3 +Inner product checksum rho = 41002983313CE411 +Inner product checksum theta = 4204AB0A9C88FE34 +Inner product checksum u = 4218434F3151533E +Inner product checksum mr1 = 4047C513A581AB70 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_schar_cart-BiP200x8-500x500_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_schar_cart-BiP200x8-500x500_azspice_gnu_fast-debug-64bit.txt index 5697a8812..2a71c14d1 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_schar_cart-BiP200x8-500x500_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_schar_cart-BiP200x8-500x500_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40E1E481066A1517 -Inner product checksum theta = 421139232C3CEFAD -Inner product checksum u = 4393A3C2C7771420 +Inner product checksum rho = 40E1E481066A162D +Inner product checksum theta = 421139232C3CEFD7 +Inner product checksum u = 4393A3C2C7772508 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_azspice_gnu_fast-debug-64bit.txt index ffe89fd94..e26a22813 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40CBD086E89B5CBC -Inner product checksum theta = 41E3A4D10A00A1F3 -Inner product checksum u = 4400A7C1E614149E +Inner product checksum rho = 40CBD086E89B5CC1 +Inner product checksum theta = 41E3A4D10A00A1E4 +Inner product checksum u = 4400A7C1E6141498 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_ex1a_gnu_fast-debug-64bit.txt index e527b8dfb..51b6a2cc6 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40DAA271B80432F0 -Inner product checksum theta = 42418E8249EA97ED -Inner product checksum u = 43F0A73C14A3943C +Inner product checksum rho = 40DAA271B80432EF +Inner product checksum theta = 42418E8249EA97EE +Inner product checksum u = 43F0A73C14A39438 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_baroclinic-alt1-C24s_MG_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_baroclinic-alt1-C24s_MG_ex1a_gnu_fast-debug-64bit.txt index 09869fdd8..d892e3495 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_baroclinic-alt1-C24s_MG_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_baroclinic-alt1-C24s_MG_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40E31B4D10BF0DA0 -Inner product checksum theta = 4210461F9BB0AAAE -Inner product checksum u = 4500F4E3AE6CD8D8 +Inner product checksum rho = 40E31B5CA67BD48E +Inner product checksum theta = 4210461E04F6B387 +Inner product checksum u = 4500F5850ABD012A diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_ex1a_gnu_fast-debug-64bit.txt index a33fd4a1b..817f355c4 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_bryan_fritsch-dry-BiP200x10-100x100_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40FE89845A997E06 -Inner product checksum theta = 4210F00A9EEFEDF3 -Inner product checksum u = 42EF4B7C9D6C01D9 +Inner product checksum rho = 40FE89845A999BDA +Inner product checksum theta = 4210F00A9EEFEDB9 +Inner product checksum u = 42EF4B7C9D6628D1 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200-C24_MG_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200-C24_MG_ex1a_gnu_fast-debug-64bit.txt index a449fc5d3..652039141 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200-C24_MG_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200-C24_MG_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40E8E802280ABCFA +Inner product checksum rho = 40E8E802280ABD02 Inner product checksum theta = 4204E59A63CB78B2 -Inner product checksum u = 4391E522B31489D4 +Inner product checksum u = 4391E522B33348FD diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200_realorog-C48_MG_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200_realorog-C48_MG_ex1a_gnu_fast-debug-64bit.txt index a4fa9f025..3e8ff85e8 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200_realorog-C48_MG_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip200_realorog-C48_MG_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 41094B0D90339E14 -Inner product checksum theta = 4224DF77B226634F -Inner product checksum u = 438852006BFEBBA6 +Inner product checksum rho = 41094B0D90339E10 +Inner product checksum theta = 4224DF77B2266357 +Inner product checksum u = 438852006BE7ACB7 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip301-C24_MG_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip301-C24_MG_ex1a_gnu_fast-debug-64bit.txt index 317fe4b7b..0b0f112a4 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip301-C24_MG_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_dcmip301-C24_MG_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40D3FF37BCAE7576 -Inner product checksum theta = 41EC4ACBE79A8562 -Inner product checksum u = 44176CD1D18E1C00 +Inner product checksum rho = 40D3FF37BCAE748F +Inner product checksum theta = 41EC4ACBE79A8443 +Inner product checksum u = 44176CD1D18E22F2 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_lfric-real-domain-C48_MG_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_lfric-real-domain-C48_MG_ex1a_gnu_fast-debug-64bit.txt index 9a03afb2d..8a076a519 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_lfric-real-domain-C48_MG_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_lfric-real-domain-C48_MG_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 4122BD52DCC6D87A -Inner product checksum theta = 4240B2570BC5F2DA -Inner product checksum u = 44F9DB8002644CBC +Inner product checksum rho = 4122BD52DCC6FF9E +Inner product checksum theta = 4240B2570BC486D8 +Inner product checksum u = 44F9DB80026F12B2 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt index 3a9e384d6..88a23a54a 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-lam-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ -Inner product checksum rho = 41002AB9840956BE -Inner product checksum theta = 4204AB102F77F16E -Inner product checksum u = 42156E231FAF40B2 -Inner product checksum mr1 = 4047451938CF964E +Inner product checksum rho = 41002AB7A7403E1B +Inner product checksum theta = 4204AB102C6CF302 +Inner product checksum u = 42156E20D625DC15 +Inner product checksum mr1 = 4047450C5E6E6764 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt index 072ad5f3b..e6209eef8 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ -Inner product checksum rho = 410029843CDCD5BA -Inner product checksum theta = 4204AB0A9C94010A -Inner product checksum u = 4218421EDC590CAE -Inner product checksum mr1 = 4047C516C5BD62B3 +Inner product checksum rho = 41002983313CE411 +Inner product checksum theta = 4204AB0A9C88FE34 +Inner product checksum u = 4218434F3151533E +Inner product checksum mr1 = 4047C513A581AB70 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_schar_cart-BiP200x8-500x500_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_schar_cart-BiP200x8-500x500_ex1a_gnu_fast-debug-64bit.txt index 5697a8812..2a71c14d1 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_schar_cart-BiP200x8-500x500_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_schar_cart-BiP200x8-500x500_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40E1E481066A1517 -Inner product checksum theta = 421139232C3CEFAD -Inner product checksum u = 4393A3C2C7771420 +Inner product checksum rho = 40E1E481066A162D +Inner product checksum theta = 421139232C3CEFD7 +Inner product checksum u = 4393A3C2C7772508 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_ex1a_gnu_fast-debug-64bit.txt index ffe89fd94..e26a22813 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_skamarock_klemp_gw_p0-BiP300x8-1000x2000_ex1a_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 40CBD086E89B5CBC -Inner product checksum theta = 41E3A4D10A00A1F3 -Inner product checksum u = 4400A7C1E614149E +Inner product checksum rho = 40CBD086E89B5CC1 +Inner product checksum theta = 41E3A4D10A00A1E4 +Inner product checksum u = 4400A7C1E6141498 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 ebbf5d1b7..605093607 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 = 46D66411 -Inner product checksum theta = 518E95C2 -Inner product checksum u = 6AF4A509 -Inner product checksum mr1 = 3FD1977C -Inner product checksum mr2 = 375C8794 -Inner product checksum mr3 = 3534A85C -Inner product checksum mr4 = 36B9C166 +Inner product checksum rho = 46D6633C +Inner product checksum theta = 518E95A2 +Inner product checksum u = 6AF4C19E +Inner product checksum mr1 = 3FD1CB37 +Inner product checksum mr2 = 3734C9A1 +Inner product checksum mr3 = 35631ADF +Inner product checksum mr4 = 36C71835 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_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 208bf5b67..6c5d85900 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 = 46D66282 -Inner product checksum theta = 518E9697 -Inner product checksum u = 6AF4EDB0 -Inner product checksum mr1 = 3FD1A816 -Inner product checksum mr2 = 372DA48E -Inner product checksum mr3 = 355FEEE4 -Inner product checksum mr4 = 36BADA78 +Inner product checksum rho = 46D66495 +Inner product checksum theta = 518E9691 +Inner product checksum u = 6AF39BD2 +Inner product checksum mr1 = 3FD1E0A6 +Inner product checksum mr2 = 3735198A +Inner product checksum mr3 = 3542A478 +Inner product checksum mr4 = 36B7417E 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 e8298690a..84b2eff47 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 = 46D853A2 -Inner product checksum theta = 518BD97F -Inner product checksum u = 6A8B5D0D -Inner product checksum mr1 = 3FCCB5F5 -Inner product checksum mr2 = 383329FE -Inner product checksum mr3 = 354A12DC -Inner product checksum mr4 = 36D48CC3 -Inner product checksum mr5 = 2C0EBB00 -Inner product checksum mr6 = 354FB8FB +Inner product checksum rho = 46D85751 +Inner product checksum theta = 518BD5EE +Inner product checksum u = 6A8B2BEA +Inner product checksum mr1 = 3FCD0365 +Inner product checksum mr2 = 38319DEA +Inner product checksum mr3 = 35336D58 +Inner product checksum mr4 = 36AD3D3E +Inner product checksum mr5 = 2CB254FE +Inner product checksum mr6 = 35216138 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 575d12f26..329c55d80 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 = 46D84776 -Inner product checksum theta = 518BD5CA -Inner product checksum u = 6A876EA4 -Inner product checksum mr1 = 3FCFC573 -Inner product checksum mr2 = 37F982D2 -Inner product checksum mr3 = 378F0686 -Inner product checksum mr4 = 37941390 -Inner product checksum mr5 = 36AD80BB +Inner product checksum rho = 46D8454E +Inner product checksum theta = 518BD6BC +Inner product checksum u = 6A875961 +Inner product checksum mr1 = 3FCFD5E4 +Inner product checksum mr2 = 37F1CC02 +Inner product checksum mr3 = 3790ECFA +Inner product checksum mr4 = 3790A5B9 +Inner product checksum mr5 = 369CC75F 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 689a0c93c..e08a03ead 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 = 46D833DD -Inner product checksum theta = 518BE345 -Inner product checksum u = 6A861A7A -Inner product checksum mr1 = 3FD12CFE -Inner product checksum mr2 = 37EF6FF7 -Inner product checksum mr3 = 377034CF -Inner product checksum mr4 = 37BA8E17 -Inner product checksum mr5 = 3694BA7A +Inner product checksum rho = 46D832ED +Inner product checksum theta = 518BE2C8 +Inner product checksum u = 6A85B428 +Inner product checksum mr1 = 3FD153C2 +Inner product checksum mr2 = 37FB40C8 +Inner product checksum mr3 = 3769C8E3 +Inner product checksum mr4 = 37B2803F +Inner product checksum mr5 = 368C0AD2 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 066b82f4f..cc1e97823 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 = 46D8395D -Inner product checksum theta = 518BD538 -Inner product checksum u = 6A896534 -Inner product checksum mr1 = 3FD027A8 -Inner product checksum mr2 = 37C25DEC -Inner product checksum mr3 = 35A25CC0 -Inner product checksum mr4 = 371736E2 +Inner product checksum rho = 46D83AE4 +Inner product checksum theta = 518BD3D7 +Inner product checksum u = 6A88DCC0 +Inner product checksum mr1 = 3FD02A28 +Inner product checksum mr2 = 37C0AC0E +Inner product checksum mr3 = 35A6EB12 +Inner product checksum mr4 = 370F57D4 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-64bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C12_azspice_gnu_fast-debug-64bit.txt index b2ad06d13..ee7b787c0 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C12_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_nwp_gal9-C12_azspice_gnu_fast-debug-64bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 40DB07687B63446A -Inner product checksum theta = 42317A99CF4E0BC0 -Inner product checksum u = 45512AE8772F7D84 -Inner product checksum mr1 = 3FFA019FB76BA7A3 -Inner product checksum mr2 = 3EF9206AB8DD06F5 -Inner product checksum mr3 = 3EB3C8E43B077FC8 -Inner product checksum mr4 = 3EE4C554CE5D456C +Inner product checksum rho = 40DB07B781DB2F3B +Inner product checksum theta = 42317AF356283B1E +Inner product checksum u = 45513086C34E8564 +Inner product checksum mr1 = 3FF9FF2BC9E57F1C +Inner product checksum mr2 = 3EF8973C99019E93 +Inner product checksum mr3 = 3EB43280B15C39D4 +Inner product checksum mr4 = 3EE0686DD835F71E 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-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 4c7eed6cc..cfbfa5aab 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 = 48D7FD32 -Inner product checksum theta = 5392A6D2 -Inner product checksum u = 6A97B8BA -Inner product checksum mr1 = 41CD0576 -Inner product checksum mr2 = 39CBA1DC -Inner product checksum mr3 = 37B5C87C -Inner product checksum mr4 = 39631544 +Inner product checksum rho = 48D7FD22 +Inner product checksum theta = 5392A6BE +Inner product checksum u = 6A97B9C5 +Inner product checksum mr1 = 41CCFE06 +Inner product checksum mr2 = 39CD4BD0 +Inner product checksum mr3 = 37AEF5CD +Inner product checksum mr4 = 3962A609 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 f8dff9082..1e88c94a9 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 = 46D81310 -Inner product checksum theta = 51944596 -Inner product checksum u = 6B4636E2 -Inner product checksum mr1 = 3FC88E16 -Inner product checksum mr2 = 37A99D46 -Inner product checksum mr3 = 35A2C5C6 -Inner product checksum mr4 = 3788B82C +Inner product checksum rho = 46D812FC +Inner product checksum theta = 51944594 +Inner product checksum u = 6B4637D3 +Inner product checksum mr1 = 3FC88F1F +Inner product checksum mr2 = 37A59435 +Inner product checksum mr3 = 35A76FC6 +Inner product checksum mr4 = 3788DE44 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 35fdec60e..ed6a7ee84 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 = 48D7FDBE -Inner product checksum theta = 5392A6F9 -Inner product checksum u = 6A97B9FA -Inner product checksum mr1 = 41CD0CB2 -Inner product checksum mr2 = 39D05B98 -Inner product checksum mr3 = 37AD4C2E -Inner product checksum mr4 = 395E937D +Inner product checksum rho = 48D7FDDA +Inner product checksum theta = 5392A6C5 +Inner product checksum u = 6A97B57F +Inner product checksum mr1 = 41CD0C86 +Inner product checksum mr2 = 39CE177E +Inner product checksum mr3 = 37ACC2E9 +Inner product checksum mr4 = 395FF9F2 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 cd579c1cb..6d41b5bcf 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 = 46D81241 -Inner product checksum theta = 518BD644 -Inner product checksum u = 6A870A8B -Inner product checksum mr1 = 3FD3D730 -Inner product checksum mr2 = 37E1345C -Inner product checksum mr3 = 35A0FF9C -Inner product checksum mr4 = 36DC35A2 +Inner product checksum rho = 46D8120C +Inner product checksum theta = 518BD7A2 +Inner product checksum u = 6A8775C9 +Inner product checksum mr1 = 3FD3A651 +Inner product checksum mr2 = 37E1D416 +Inner product checksum mr3 = 35BA8A93 +Inner product checksum mr4 = 36EAE8E6 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 e07f68014..3c93bfe7c 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 = 46D80460 -Inner product checksum theta = 519522B0 -Inner product checksum u = 6AE6775E -Inner product checksum mr1 = 3FC86149 -Inner product checksum mr2 = 37CD2A44 -Inner product checksum mr3 = 351EE925 -Inner product checksum mr4 = 36F072B8 +Inner product checksum rho = 46D80461 +Inner product checksum theta = 519522AB +Inner product checksum u = 6AE67481 +Inner product checksum mr1 = 3FC860D5 +Inner product checksum mr2 = 37CF8524 +Inner product checksum mr3 = 351286F2 +Inner product checksum mr4 = 36F101CE 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 c1993e0b9..f1a379393 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 = 48D81496 -Inner product checksum theta = 53952668 -Inner product checksum u = 6AA4D6EE -Inner product checksum mr1 = 41C831AC -Inner product checksum mr2 = 399A2744 -Inner product checksum mr3 = 37789C51 -Inner product checksum mr4 = 39300921 +Inner product checksum rho = 48D81497 +Inner product checksum theta = 5395266A +Inner product checksum u = 6AA4D682 +Inner product checksum mr1 = 41C831EA +Inner product checksum mr2 = 399A38E6 +Inner product checksum mr3 = 3779DF22 +Inner product checksum mr4 = 392FE51E 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 8f87801d6..0689f5050 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 = 46D81952 -Inner product checksum theta = 518BAFFF -Inner product checksum u = 6A8C8B79 -Inner product checksum mr1 = 3FD11C39 -Inner product checksum mr2 = 37E724C0 -Inner product checksum mr3 = 359FEF4C -Inner product checksum mr4 = 37074045 +Inner product checksum rho = 46D818C0 +Inner product checksum theta = 518BB0BB +Inner product checksum u = 6A8C869A +Inner product checksum mr1 = 3FD146D4 +Inner product checksum mr2 = 37ED20E6 +Inner product checksum mr3 = 35DA74A7 +Inner product checksum mr4 = 37338304 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 a5745eb7b..d5726ec52 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 = 46D8137D -Inner product checksum theta = 518BD14C -Inner product checksum u = 6A8868AB -Inner product checksum mr1 = 3FD3A9A6 -Inner product checksum mr2 = 37D9892A -Inner product checksum mr3 = 35B50D72 -Inner product checksum mr4 = 37104F46 +Inner product checksum rho = 46D8149A +Inner product checksum theta = 518BD1CB +Inner product checksum u = 6A8875C2 +Inner product checksum mr1 = 3FD3EFC2 +Inner product checksum mr2 = 37D3F2E5 +Inner product checksum mr3 = 35997D82 +Inner product checksum mr4 = 36E02438 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 60686d791..ec0ee3ffe 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 = 46D85CA4 -Inner product checksum theta = 5193AF09 -Inner product checksum u = 6A862FDC -Inner product checksum mr1 = 3FD02F73 -Inner product checksum mr2 = 37B8193F -Inner product checksum mr3 = 355AA397 -Inner product checksum mr4 = 36FA519C +Inner product checksum rho = 46D85EE4 +Inner product checksum theta = 5193AF04 +Inner product checksum u = 6A85E969 +Inner product checksum mr1 = 3FD06F2F +Inner product checksum mr2 = 37B7D64E +Inner product checksum mr3 = 353E1986 +Inner product checksum mr4 = 3700D014 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 12acd49ab..d450bd67a 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 = 46D7FBF0 +Inner product checksum rho = 46D7FBEE Inner product checksum theta = 5195577F -Inner product checksum u = 6B246B78 -Inner product checksum mr1 = 3FC85292 -Inner product checksum mr2 = 38201B0A -Inner product checksum mr3 = 356269E7 -Inner product checksum mr4 = 36F6669E +Inner product checksum u = 6B246B74 +Inner product checksum mr1 = 3FC8529E +Inner product checksum mr2 = 38202D42 +Inner product checksum mr3 = 356263FB +Inner product checksum mr4 = 36F650F6 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 f22aad7e4..3abba32d7 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 = 483997CA -Inner product checksum theta = 513548FD -Inner product checksum u = 612F5B34 -Inner product checksum mr1 = 4090F669 -Inner product checksum mr2 = 3589856C -Inner product checksum mr3 = 2FA53E3D -Inner product checksum mr4 = 33F4FD6A -Inner product checksum mr5 = BE7D04E +Inner product checksum rho = 483997C1 +Inner product checksum theta = 513548FE +Inner product checksum u = 612F5B3B +Inner product checksum mr1 = 4090F6E6 +Inner product checksum mr2 = 358E7E65 +Inner product checksum mr3 = 2FA52B68 +Inner product checksum mr4 = 33F4FD60 +Inner product checksum mr5 = BE7D07E 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 42525bc73..4ec050271 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 = 483999D4 -Inner product checksum theta = 51354858 -Inner product checksum u = 612F6179 -Inner product checksum mr1 = 40916617 -Inner product checksum mr2 = 364FE1DF -Inner product checksum mr3 = 2FABFD16 -Inner product checksum mr4 = 33F4FDB5 -Inner product checksum mr5 = BF2197F +Inner product checksum rho = 483999D5 +Inner product checksum theta = 51354854 +Inner product checksum u = 612F6177 +Inner product checksum mr1 = 4091656D +Inner product checksum mr2 = 365E3832 +Inner product checksum mr3 = 2FAC1DA9 +Inner product checksum mr4 = 33F4FD86 +Inner product checksum mr5 = BF21861 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 cb46157c6..6e3149eaa 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 = 612EE1BF -Inner product checksum mr1 = 409102F8 -Inner product checksum mr2 = 358C6492 -Inner product checksum mr3 = 300104A8 -Inner product checksum mr4 = 3404ABE7 -Inner product checksum mr5 = C14576D +Inner product checksum rho = 48398C6C +Inner product checksum theta = 513542FB +Inner product checksum u = 612EE1B8 +Inner product checksum mr1 = 40910316 +Inner product checksum mr2 = 359265D5 +Inner product checksum mr3 = 3000F8B5 +Inner product checksum mr4 = 3404ABAE +Inner product checksum mr5 = C145776 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt index c8d190573..c8db8f973 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 4830B5EE -Inner product checksum theta = 513FD8B1 -Inner product checksum u = 5F74A875 -Inner product checksum mr1 = 4155D3E1 -Inner product checksum mr2 = 3A38BFC2 -Inner product checksum mr3 = 309DE635 +Inner product checksum rho = 4830B5AD +Inner product checksum theta = 513FD916 +Inner product checksum u = 5F74B9FF +Inner product checksum mr1 = 41556AA2 +Inner product checksum mr2 = 3A59EFAD +Inner product checksum mr3 = 30ADEE05 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index ced2b2018..d0af98814 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F8B1D8 -Inner product checksum theta = 4D84D80D -Inner product checksum u = 601AD0B1 -Inner product checksum mr1 = 3C870A8F -Inner product checksum mr2 = 354AA3D5 -Inner product checksum mr3 = 31C1E4EB +Inner product checksum theta = 4D84D801 +Inner product checksum u = 601AD0A3 +Inner product checksum mr1 = 3C86FCEC +Inner product checksum mr2 = 3561184B +Inner product checksum mr3 = 31B90547 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 9e5fe63b7..0e686c0cd 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50044 -Inner product checksum theta = 4E044D1A -Inner product checksum u = 5FBD689A -Inner product checksum mr1 = 3CDAE952 -Inner product checksum mr2 = 3464C7F6 -Inner product checksum mr3 = 3198450A -Inner product checksum mr4 = 2EF57FE6 +Inner product checksum theta = 4E044958 +Inner product checksum u = 5FC424C2 +Inner product checksum mr1 = 3CE19D98 +Inner product checksum mr2 = 34528AF7 +Inner product checksum mr3 = 318A1C81 +Inner product checksum mr4 = 2ECB3DC7 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 05fd6514b..cef64bcfd 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F8B1D8 -Inner product checksum theta = 4D84DAFD -Inner product checksum u = 601AD40F -Inner product checksum mr1 = 3C825A8B -Inner product checksum mr2 = 33EB5DE2 -Inner product checksum mr3 = 317D3117 +Inner product checksum theta = 4D84DAF0 +Inner product checksum u = 601AD407 +Inner product checksum mr1 = 3C8279D5 +Inner product checksum mr2 = 341809D9 +Inner product checksum mr3 = 313D5AF7 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 9f49c2720..11aa2d4f4 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50044 -Inner product checksum theta = 4E044E7D -Inner product checksum u = 5FD4B116 -Inner product checksum mr1 = 3CCA582B -Inner product checksum mr2 = 33C805E1 -Inner product checksum mr3 = 30364C90 -Inner product checksum mr4 = 2F0E3313 +Inner product checksum theta = 4E044F15 +Inner product checksum u = 5FDAEC53 +Inner product checksum mr1 = 3CC7333A +Inner product checksum mr2 = 3311B2A6 +Inner product checksum mr3 = 30134C50 +Inner product checksum mr4 = 2F061508 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 6bc48372a..e29287295 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F8B1D8 Inner product checksum theta = 4D84D83D Inner product checksum u = 601AD7EC -Inner product checksum mr1 = 3C80A8FF -Inner product checksum mr2 = 2EE9AF5A -Inner product checksum mr3 = 2DBC2490 +Inner product checksum mr1 = 3C80A900 +Inner product checksum mr2 = 2EE9B140 +Inner product checksum mr3 = 2DBC1A2E Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index f9b176c2b..7e6cf3725 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 433541F2 -Inner product checksum theta = 4C365CF3 -Inner product checksum u = 5FC5C122 -Inner product checksum mr1 = 3C64C682 -Inner product checksum mr2 = 3378E043 -Inner product checksum mr3 = 2DCCEAEC +Inner product checksum theta = 4C365D34 +Inner product checksum u = 5FC5C11A +Inner product checksum mr1 = 3C651950 +Inner product checksum mr2 = 33939457 +Inner product checksum mr3 = 2E1FEF89 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index a3253b51f..a988e1b92 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 433107DD Inner product checksum theta = 4C0844F3 Inner product checksum u = 606FB504 -Inner product checksum mr1 = 3B3F6226 -Inner product checksum mr2 = 3004972C -Inner product checksum mr3 = 29448288 +Inner product checksum mr1 = 3B3F6232 +Inner product checksum mr2 = 3004944C +Inner product checksum mr3 = 29447912 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index fae95bf77..dd98dc350 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42CD4780 -Inner product checksum theta = 4C2F1CCD +Inner product checksum theta = 4C2F1CD0 Inner product checksum u = 6064CD3B -Inner product checksum mr1 = 372352E9 +Inner product checksum mr1 = 37235163 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 -Inner product checksum mr4 = 33E97109 +Inner product checksum mr4 = 33E96715 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 5431afaa8..711d8111f 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 433107DD -Inner product checksum theta = 4C065970 +Inner product checksum theta = 4C06596F Inner product checksum u = 606FB561 -Inner product checksum mr1 = 3A8C498C -Inner product checksum mr2 = 32982158 -Inner product checksum mr3 = 289ECB4D +Inner product checksum mr1 = 3A8C498D +Inner product checksum mr2 = 32982205 +Inner product checksum mr3 = 289ECEDA Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 9aa0cfadb..bb46c57a2 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50044 -Inner product checksum theta = 4E0455D4 -Inner product checksum u = 5FB5E70A -Inner product checksum mr1 = 3CEA7E92 -Inner product checksum mr2 = 33AB53A5 -Inner product checksum mr3 = 3136031C -Inner product checksum mr4 = 2F10C263 +Inner product checksum theta = 4E045656 +Inner product checksum u = 5FB8BFDC +Inner product checksum mr1 = 3CE4DCC4 +Inner product checksum mr2 = 33E492E9 +Inner product checksum mr3 = 2FDA67C0 +Inner product checksum mr4 = 2F270121 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 2ffb20200..f657b71c1 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 434FEE7A -Inner product checksum theta = 4C47E450 -Inner product checksum u = 62E3D54D -Inner product checksum mr1 = 3A360401 -Inner product checksum mr2 = 335D3C99 -Inner product checksum mr3 = 28AE5070 -Inner product checksum mr4 = 340087AA -Inner product checksum mr5 = 2CAB2065 -Inner product checksum mr6 = 2C736833 +Inner product checksum theta = 4C47E05D +Inner product checksum u = 62E3D56F +Inner product checksum mr1 = 3A3848A6 +Inner product checksum mr2 = 3113A865 +Inner product checksum mr3 = 24ADAE37 +Inner product checksum mr4 = 33704F0C +Inner product checksum mr5 = 2979B334 +Inner product checksum mr6 = 2CA7A623 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 85001a4c0..66aaa0e25 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,7 +1,7 @@ Inner product checksum rho = 433107DD Inner product checksum theta = 4C096ADE -Inner product checksum u = 6074FC4D -Inner product checksum mr1 = 3A6F4514 +Inner product checksum u = 6074FC4E +Inner product checksum mr1 = 3A6F4517 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index c1b496301..1215be0a9 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,7 +1,7 @@ Inner product checksum rho = 433107DD Inner product checksum theta = 4C08B095 Inner product checksum u = 6075B79D -Inner product checksum mr1 = 3A5C1B39 +Inner product checksum mr1 = 3A5C1B37 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 527303117..484657b59 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,7 +1,7 @@ Inner product checksum rho = 433107DD Inner product checksum theta = 4C08DF8D Inner product checksum u = 606FB52B -Inner product checksum mr1 = 3B1C9205 +Inner product checksum mr1 = 3B1C91FF Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt index 298a5fac6..98cd0e5e1 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50044 -Inner product checksum theta = 4E15E00C -Inner product checksum u = 5F897E88 -Inner product checksum mr1 = 3C99A2BC -Inner product checksum mr2 = 0 -Inner product checksum mr3 = 2A83F034 -Inner product checksum mr4 = 31E14097 +Inner product checksum theta = 4E15E0E2 +Inner product checksum u = 5F8AA0FB +Inner product checksum mr1 = 3C977AAA +Inner product checksum mr2 = 2FD69352 +Inner product checksum mr3 = 2BA8AFE5 +Inner product checksum mr4 = 2F8F03CC 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 0d6784f42..2f7c18cbd 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 = 46D6652A -Inner product checksum theta = 518E93EC -Inner product checksum u = 6AF54A1D -Inner product checksum mr1 = 3FD199FC -Inner product checksum mr2 = 373A4F06 -Inner product checksum mr3 = 35526759 -Inner product checksum mr4 = 36CD3F45 +Inner product checksum rho = 46D6637B +Inner product checksum theta = 518E9332 +Inner product checksum u = 6AF51480 +Inner product checksum mr1 = 3FD197BA +Inner product checksum mr2 = 3737D1F4 +Inner product checksum mr3 = 3548903A +Inner product checksum mr4 = 36D4084D 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 cdce4e3cb..2fb37d743 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 = 46D65056 -Inner product checksum theta = 51925277 -Inner product checksum u = 6B2213D6 -Inner product checksum mr1 = 3FCF401D -Inner product checksum mr2 = 3723DA1E -Inner product checksum mr3 = 353FBE95 -Inner product checksum mr4 = 369202EA +Inner product checksum rho = 46D6509A +Inner product checksum theta = 51925266 +Inner product checksum u = 6B222819 +Inner product checksum mr1 = 3FCF4548 +Inner product checksum mr2 = 3726B644 +Inner product checksum mr3 = 3534128A +Inner product checksum mr4 = 3696B4F9 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 ef7de3186..5ae8ca58f 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 = 48D65CA4 -Inner product checksum theta = 5399FF37 -Inner product checksum u = 6B12F9D3 -Inner product checksum mr1 = 41CC35F8 -Inner product checksum mr2 = 3964700B -Inner product checksum mr3 = 37C885DA -Inner product checksum mr4 = 393CC0EB +Inner product checksum rho = 48D65C9A +Inner product checksum theta = 5399FF34 +Inner product checksum u = 6B12FBAC +Inner product checksum mr1 = 41CC33F2 +Inner product checksum mr2 = 3964F8D4 +Inner product checksum mr3 = 37C88AC9 +Inner product checksum mr4 = 393D08BB 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 fc5094f02..ba5035f73 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 = 46D65029 -Inner product checksum theta = 51925282 -Inner product checksum u = 6B222646 -Inner product checksum mr1 = 3FCF441A -Inner product checksum mr2 = 373420D6 -Inner product checksum mr3 = 353B5108 -Inner product checksum mr4 = 369534B7 +Inner product checksum rho = 46D650A0 +Inner product checksum theta = 51925234 +Inner product checksum u = 6B2218A4 +Inner product checksum mr1 = 3FCF39F8 +Inner product checksum mr2 = 373A988B +Inner product checksum mr3 = 35425BC5 +Inner product checksum mr4 = 36A04C9E 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 9985fc72a..35317e1e0 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 = 48D65C9E -Inner product checksum theta = 5399FF36 -Inner product checksum u = 6B12F9E6 -Inner product checksum mr1 = 41CC34F5 -Inner product checksum mr2 = 39628562 -Inner product checksum mr3 = 37CADBE8 -Inner product checksum mr4 = 393CFC10 +Inner product checksum rho = 48D65C9D +Inner product checksum theta = 5399FF3A +Inner product checksum u = 6B12F9C2 +Inner product checksum mr1 = 41CC3699 +Inner product checksum mr2 = 39680ED2 +Inner product checksum mr3 = 37C94C62 +Inner product checksum mr4 = 393CE93B 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 f9b384e6a..c71583354 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 = 48D65C98 -Inner product checksum theta = 5399FF37 -Inner product checksum u = 6B12FA76 -Inner product checksum mr1 = 41CC32D9 -Inner product checksum mr2 = 396638BD -Inner product checksum mr3 = 37CAADA4 -Inner product checksum mr4 = 393EB70D +Inner product checksum rho = 48D65CA2 +Inner product checksum theta = 5399FF3A +Inner product checksum u = 6B12F878 +Inner product checksum mr1 = 41CC36F9 +Inner product checksum mr2 = 396596BA +Inner product checksum mr3 = 37C8C4CF +Inner product checksum mr4 = 393DF543 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 9508e0ab5..dc8c57b43 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 = 46D66780 -Inner product checksum theta = 518E9690 -Inner product checksum u = 6AF50DE9 -Inner product checksum mr1 = 3FD15B81 -Inner product checksum mr2 = 37581AA6 -Inner product checksum mr3 = 355FE797 -Inner product checksum mr4 = 36D86CA0 +Inner product checksum rho = 46D6648B +Inner product checksum theta = 518E9673 +Inner product checksum u = 6AF52002 +Inner product checksum mr1 = 3FD1507B +Inner product checksum mr2 = 3735B15B +Inner product checksum mr3 = 354DC5F9 +Inner product checksum mr4 = 36D7AA90 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 3a5681d4e..ad76a4a52 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 = 46D6516E -Inner product checksum theta = 519250DF -Inner product checksum u = 6B22BA14 -Inner product checksum mr1 = 3FCF2C92 -Inner product checksum mr2 = 3737929A -Inner product checksum mr3 = 35357886 -Inner product checksum mr4 = 36A9CD80 +Inner product checksum rho = 46D65030 +Inner product checksum theta = 5192503E +Inner product checksum u = 6B22CC33 +Inner product checksum mr1 = 3FCF290D +Inner product checksum mr2 = 3722B852 +Inner product checksum mr3 = 3532B03F +Inner product checksum mr4 = 36A58AC7 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 da48a4bed..c325bb92f 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 = 46D65134 -Inner product checksum theta = 5192506E -Inner product checksum u = 6B22D6CD -Inner product checksum mr1 = 3FCF4DA0 -Inner product checksum mr2 = 3736B1D8 -Inner product checksum mr3 = 353E60FE -Inner product checksum mr4 = 36A0052E +Inner product checksum rho = 46D65012 +Inner product checksum theta = 51925078 +Inner product checksum u = 6B22D85C +Inner product checksum mr1 = 3FCF35CA +Inner product checksum mr2 = 3727021A +Inner product checksum mr3 = 353D901C +Inner product checksum mr4 = 3691AAB0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt index 91bb01bc5..ca6fdef3a 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 489A8317 -Inner product checksum theta = 51BA5074 -Inner product checksum u = 5F1192E8 -Inner product checksum mr1 = 4187BC72 -Inner product checksum mr2 = 3AF9734F -Inner product checksum mr3 = 34BC1253 +Inner product checksum rho = 489A82B1 +Inner product checksum theta = 51BA507B +Inner product checksum u = 5F119286 +Inner product checksum mr1 = 4187BCE4 +Inner product checksum mr2 = 3B024837 +Inner product checksum mr3 = 35078138 Inner product checksum mr4 = 0 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 662dc2b95..da7776147 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 = 46D85840 -Inner product checksum theta = 518BD4F3 -Inner product checksum u = 6A8AA24E -Inner product checksum mr1 = 3FCD72EF -Inner product checksum mr2 = 3831BCA2 -Inner product checksum mr3 = 3568BB56 -Inner product checksum mr4 = 36B357D6 -Inner product checksum mr5 = 2EA4F771 -Inner product checksum mr6 = 35562C6C +Inner product checksum rho = 46D8597B +Inner product checksum theta = 518BD779 +Inner product checksum u = 6A8B0F09 +Inner product checksum mr1 = 3FCD0341 +Inner product checksum mr2 = 382CB1AD +Inner product checksum mr3 = 3540596D +Inner product checksum mr4 = 369EA602 +Inner product checksum mr5 = 2F1B7C14 +Inner product checksum mr6 = 35291980 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 26acfbf09..33c96afa0 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 = 46D8458C -Inner product checksum theta = 518BD62A -Inner product checksum u = 6A87FCF8 -Inner product checksum mr1 = 3FCF951F -Inner product checksum mr2 = 37E6BD02 -Inner product checksum mr3 = 378A7D17 -Inner product checksum mr4 = 3797816D -Inner product checksum mr5 = 36A1EFBC +Inner product checksum rho = 46D84445 +Inner product checksum theta = 518BD564 +Inner product checksum u = 6A878A96 +Inner product checksum mr1 = 3FCF8242 +Inner product checksum mr2 = 37FD898E +Inner product checksum mr3 = 37A5288E +Inner product checksum mr4 = 37A561B6 +Inner product checksum mr5 = 36CF61AE 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 86f1a8990..a43e66ce5 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 = 46D832FB -Inner product checksum theta = 518BE422 -Inner product checksum u = 6A85F6E0 -Inner product checksum mr1 = 3FD14346 -Inner product checksum mr2 = 37F2F57E -Inner product checksum mr3 = 3782C0C7 -Inner product checksum mr4 = 37BAC82C -Inner product checksum mr5 = 368F067F +Inner product checksum rho = 46D8338F +Inner product checksum theta = 518BE22B +Inner product checksum u = 6A8636DA +Inner product checksum mr1 = 3FD130CF +Inner product checksum mr2 = 37FAF5AF +Inner product checksum mr3 = 377795BB +Inner product checksum mr4 = 37C2543B +Inner product checksum mr5 = 3698E85D 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 f94eb38a4..3dcf813b0 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 = 46D85410 -Inner product checksum theta = 518BE004 -Inner product checksum u = 6A85218C -Inner product checksum mr1 = 3FCE9E1F -Inner product checksum mr2 = 37E4C939 -Inner product checksum mr3 = 3788C888 -Inner product checksum mr4 = 3742DF88 -Inner product checksum mr5 = 35FA4066 +Inner product checksum rho = 46D85576 +Inner product checksum theta = 518BE016 +Inner product checksum u = 6A85E5EE +Inner product checksum mr1 = 3FCE6A34 +Inner product checksum mr2 = 37F091E4 +Inner product checksum mr3 = 377E6732 +Inner product checksum mr4 = 3752EA4E +Inner product checksum mr5 = 35F610B2 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 fc8830b55..9ec1bab73 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 = 46D83A35 -Inner product checksum theta = 518BD5F4 -Inner product checksum u = 6A88CB4D -Inner product checksum mr1 = 3FD02BB9 -Inner product checksum mr2 = 37C9A7CA -Inner product checksum mr3 = 35983707 -Inner product checksum mr4 = 37015E80 +Inner product checksum rho = 46D83A9F +Inner product checksum theta = 518BD6C2 +Inner product checksum u = 6A88726F +Inner product checksum mr1 = 3FD0571A +Inner product checksum mr2 = 37D404B4 +Inner product checksum mr3 = 35AFD998 +Inner product checksum mr4 = 370FAB4F 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-64bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-64bit.txt index 5442f5230..d3043f866 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9-C12_ex1a_cce_fast-debug-64bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 40DB07BDB335E70F -Inner product checksum theta = 42317B009699D8CA -Inner product checksum u = 45512CE45FA6102C -Inner product checksum mr1 = 3FF9F65BF11FF695 -Inner product checksum mr2 = 3EFA02DB0ABB2DB2 -Inner product checksum mr3 = 3EB4D691E8F904A6 -Inner product checksum mr4 = 3EE1C81A8EF17282 +Inner product checksum rho = 40DB0778830816BE +Inner product checksum theta = 42317AFE31FCE798 +Inner product checksum u = 45511F71C48E2D8B +Inner product checksum mr1 = 3FF9FFE7ABF01EB9 +Inner product checksum mr2 = 3EF9E621EC9C35E2 +Inner product checksum mr3 = 3EB61E2F54948782 +Inner product checksum mr4 = 3EE131F45493BA7A 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 145f29b4c..d68f87ae6 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 = 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 rho = 48D7FDE5 +Inner product checksum theta = 5392A6BB +Inner product checksum u = 6A97BF0C +Inner product checksum mr1 = 41CD05A1 +Inner product checksum mr2 = 39CC5114 +Inner product checksum mr3 = 37B38E9D +Inner product checksum mr4 = 39616A33 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 964ce3a8a..9cd9ea9e5 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 = 46D81330 -Inner product checksum theta = 51944574 -Inner product checksum u = 6B464448 -Inner product checksum mr1 = 3FC884F9 -Inner product checksum mr2 = 379E0A83 -Inner product checksum mr3 = 35A557AC -Inner product checksum mr4 = 378669C2 +Inner product checksum rho = 46D8131D +Inner product checksum theta = 5194456D +Inner product checksum u = 6B46463D +Inner product checksum mr1 = 3FC87E20 +Inner product checksum mr2 = 379D007D +Inner product checksum mr3 = 35A418DB +Inner product checksum mr4 = 3787E545 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 8ba358720..41c2ed071 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 = 48D7FE7E -Inner product checksum theta = 5392A6C1 -Inner product checksum u = 6A97C698 -Inner product checksum mr1 = 41CD06AC -Inner product checksum mr2 = 39CFBD73 -Inner product checksum mr3 = 37B289D4 -Inner product checksum mr4 = 39620DAE +Inner product checksum rho = 48D7FE73 +Inner product checksum theta = 5392A6D6 +Inner product checksum u = 6A97BBA3 +Inner product checksum mr1 = 41CD0A7C +Inner product checksum mr2 = 39CDDEF9 +Inner product checksum mr3 = 37AF89BD +Inner product checksum mr4 = 39601FB8 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 ca8c0b007..cd60ad2dc 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 = 48D7FC3E -Inner product checksum theta = 5392A694 -Inner product checksum u = 6A97C224 -Inner product checksum mr1 = 41CCE753 -Inner product checksum mr2 = 39CB0912 -Inner product checksum mr3 = 37AB8D81 -Inner product checksum mr4 = 3972959E +Inner product checksum rho = 48D7FC49 +Inner product checksum theta = 5392A6DA +Inner product checksum u = 6A97C226 +Inner product checksum mr1 = 41CCE3EC +Inner product checksum mr2 = 39CD9AD8 +Inner product checksum mr3 = 37B229A5 +Inner product checksum mr4 = 3972E627 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 3c702f837..3c976b26c 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 = 48D7FB4D -Inner product checksum theta = 5392A6BF -Inner product checksum u = 6A97B4CF -Inner product checksum mr1 = 41CCE4CA -Inner product checksum mr2 = 39D1AFCE -Inner product checksum mr3 = 37B349DC -Inner product checksum mr4 = 3976F722 +Inner product checksum rho = 48D7FB62 +Inner product checksum theta = 5392A6F6 +Inner product checksum u = 6A97B8AA +Inner product checksum mr1 = 41CCE72B +Inner product checksum mr2 = 39CF1410 +Inner product checksum mr3 = 37AC36A6 +Inner product checksum mr4 = 3975C1CC 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 534b57028..d4f2c8599 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 = 46D8145C -Inner product checksum theta = 518BD834 -Inner product checksum u = 6A876B3F -Inner product checksum mr1 = 3FD3B699 -Inner product checksum mr2 = 37DBC694 -Inner product checksum mr3 = 35ACADEE -Inner product checksum mr4 = 36DB4B9D +Inner product checksum rho = 46D81197 +Inner product checksum theta = 518BD4B9 +Inner product checksum u = 6A877520 +Inner product checksum mr1 = 3FD3C762 +Inner product checksum mr2 = 37DDAB25 +Inner product checksum mr3 = 35CE0092 +Inner product checksum mr4 = 370CDFB9 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 72d0bfd81..63b476534 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 = 46D8046E -Inner product checksum theta = 519522B0 -Inner product checksum u = 6AE676F3 -Inner product checksum mr1 = 3FC861D0 -Inner product checksum mr2 = 37CF9691 -Inner product checksum mr3 = 351F51C6 -Inner product checksum mr4 = 36EFCBFC +Inner product checksum theta = 519522AA +Inner product checksum u = 6AE673C2 +Inner product checksum mr1 = 3FC860F2 +Inner product checksum mr2 = 37D0D35E +Inner product checksum mr3 = 351409C2 +Inner product checksum mr4 = 36F0A757 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 52e4cd78a..5b3d12078 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 = 48D81494 -Inner product checksum theta = 53952666 -Inner product checksum u = 6AA4D6C3 -Inner product checksum mr1 = 41C830E0 -Inner product checksum mr2 = 399AC878 -Inner product checksum mr3 = 3778FE37 -Inner product checksum mr4 = 39300070 +Inner product checksum rho = 48D81496 +Inner product checksum theta = 53952668 +Inner product checksum u = 6AA4D6C0 +Inner product checksum mr1 = 41C83132 +Inner product checksum mr2 = 399AF1FD +Inner product checksum mr3 = 377A4BBE +Inner product checksum mr4 = 392F9196 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 0ffd8dce1..72427ec6b 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 = 46D818D1 -Inner product checksum theta = 518BB098 -Inner product checksum u = 6A8C9CAB -Inner product checksum mr1 = 3FD11FBB -Inner product checksum mr2 = 37EB0B66 -Inner product checksum mr3 = 35A515BE -Inner product checksum mr4 = 37211D7E +Inner product checksum rho = 46D8188D +Inner product checksum theta = 518BB058 +Inner product checksum u = 6A8D11B9 +Inner product checksum mr1 = 3FD150D3 +Inner product checksum mr2 = 37E11326 +Inner product checksum mr3 = 35BA64A4 +Inner product checksum mr4 = 37029488 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 fb4ac2cea..452ac4a08 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 = 46D812C6 -Inner product checksum theta = 518BCF5C -Inner product checksum u = 6A87F7C7 -Inner product checksum mr1 = 3FD3C782 -Inner product checksum mr2 = 37DC7122 -Inner product checksum mr3 = 35A1102A -Inner product checksum mr4 = 36E23FC6 +Inner product checksum rho = 46D8141C +Inner product checksum theta = 518BD238 +Inner product checksum u = 6A88977C +Inner product checksum mr1 = 3FD3B022 +Inner product checksum mr2 = 37D13D54 +Inner product checksum mr3 = 359C6C54 +Inner product checksum mr4 = 36EF2C4E 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 c402287b0..721bb720f 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 = 46D85F7F -Inner product checksum theta = 5193AEF6 -Inner product checksum u = 6A863345 -Inner product checksum mr1 = 3FD02DFA -Inner product checksum mr2 = 37B227E9 -Inner product checksum mr3 = 357CB4FC -Inner product checksum mr4 = 3702610A +Inner product checksum rho = 46D85E77 +Inner product checksum theta = 5193AF87 +Inner product checksum u = 6A863796 +Inner product checksum mr1 = 3FD016DC +Inner product checksum mr2 = 37A74967 +Inner product checksum mr3 = 35417660 +Inner product checksum mr4 = 36FDE6D6 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_noukca_1T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_1T-C12_ex1a_cce_fast-debug-32bit.txt index b165dd977..c23a79827 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_1T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_1T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D7F5C0 -Inner product checksum theta = 518E7EC5 -Inner product checksum u = 6B17B016 -Inner product checksum mr1 = 3FCBDA24 -Inner product checksum mr2 = 37AC191C -Inner product checksum mr3 = 34A5112E -Inner product checksum mr4 = 36F76E7F +Inner product checksum rho = 46D7F501 +Inner product checksum theta = 518E7EB8 +Inner product checksum u = 6B179396 +Inner product checksum mr1 = 3FCBC460 +Inner product checksum mr2 = 37BEC56A +Inner product checksum mr3 = 34AE5467 +Inner product checksum mr4 = 36D9B42A 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_noukca_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt index 6332d81a0..c71a73a9c 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_1T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D7FC55 -Inner product checksum theta = 5392A699 -Inner product checksum u = 6A97BCCA -Inner product checksum mr1 = 41CCEB20 -Inner product checksum mr2 = 39CA8C2C -Inner product checksum mr3 = 37AC2EF8 -Inner product checksum mr4 = 3971DABC +Inner product checksum rho = 48D7FC50 +Inner product checksum theta = 5392A68E +Inner product checksum u = 6A97C759 +Inner product checksum mr1 = 41CCEEFD +Inner product checksum mr2 = 39CD4E37 +Inner product checksum mr3 = 37AB18B6 +Inner product checksum mr4 = 39702214 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_noukca_2T-C12_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C12_ex1a_cce_fast-debug-32bit.txt index 0b7dde6c9..9a2af42f5 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C12_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C12_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 46D7F524 -Inner product checksum theta = 518E7ECC -Inner product checksum u = 6B17AEDA -Inner product checksum mr1 = 3FCBD438 -Inner product checksum mr2 = 37AA82D7 -Inner product checksum mr3 = 34AF63B2 -Inner product checksum mr4 = 37081DCB +Inner product checksum rho = 46D7F53E +Inner product checksum theta = 518E7EDD +Inner product checksum u = 6B17726C +Inner product checksum mr1 = 3FCBCCCB +Inner product checksum mr2 = 37B3AADB +Inner product checksum mr3 = 349F423E +Inner product checksum mr4 = 36F3A462 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_noukca_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt index bd5515481..c22efdc65 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D7FC40 -Inner product checksum theta = 5392A678 -Inner product checksum u = 6A97B83A -Inner product checksum mr1 = 41CCED01 -Inner product checksum mr2 = 39C8DCE2 -Inner product checksum mr3 = 37ADC3D4 -Inner product checksum mr4 = 39774AE9 +Inner product checksum rho = 48D7FC55 +Inner product checksum theta = 5392A696 +Inner product checksum u = 6A97BFFA +Inner product checksum mr1 = 41CCF518 +Inner product checksum mr2 = 39CBC31C +Inner product checksum mr3 = 37AF53F6 +Inner product checksum mr4 = 397429AE 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_noukca_2T-C48_MG_ex1a_cce_full-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_full-debug-32bit.txt index 77e5ba5ff..098810756 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_full-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_2T-C48_MG_ex1a_cce_full-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D7FB4E -Inner product checksum theta = 5392A6ED -Inner product checksum u = 6A97B55D -Inner product checksum mr1 = 41CCF369 -Inner product checksum mr2 = 39CDEEBC -Inner product checksum mr3 = 37AF72F2 -Inner product checksum mr4 = 3971EA0E +Inner product checksum rho = 48D7FB4A +Inner product checksum theta = 5392A6B2 +Inner product checksum u = 6A97BD40 +Inner product checksum mr1 = 41CCE92E +Inner product checksum mr2 = 39CC4D5C +Inner product checksum mr3 = 37ABE6AA +Inner product checksum mr4 = 397724F0 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_noukca_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt index 503edf68a..d8126acff 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_nwp_gal9_noukca_4T-C48_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48D7FC1D -Inner product checksum theta = 5392A6B6 -Inner product checksum u = 6A97C299 -Inner product checksum mr1 = 41CCE778 -Inner product checksum mr2 = 39CA2CF8 -Inner product checksum mr3 = 37A8570C -Inner product checksum mr4 = 397292EC +Inner product checksum rho = 48D7FC42 +Inner product checksum theta = 5392A682 +Inner product checksum u = 6A97C35F +Inner product checksum mr1 = 41CCE4DA +Inner product checksum mr2 = 39CB8E21 +Inner product checksum mr3 = 37A848B4 +Inner product checksum mr4 = 39711475 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 fc875d1dd..50a8e992b 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 = 46D7FC00 Inner product checksum theta = 5195576C -Inner product checksum u = 6B246EA5 -Inner product checksum mr1 = 3FC852FF -Inner product checksum mr2 = 381E302C -Inner product checksum mr3 = 35639D20 -Inner product checksum mr4 = 36F6E186 +Inner product checksum u = 6B246DA1 +Inner product checksum mr1 = 3FC852E6 +Inner product checksum mr2 = 381E73C4 +Inner product checksum mr3 = 35631427 +Inner product checksum mr4 = 36F69DEE 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 1e9885931..10501fd0c 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 = 483997DA -Inner product checksum theta = 5135490A -Inner product checksum u = 612F5E0C -Inner product checksum mr1 = 4090F5EC -Inner product checksum mr2 = 3599E934 -Inner product checksum mr3 = 2FA5315A -Inner product checksum mr4 = 33F4FD4E -Inner product checksum mr5 = BE85FCC +Inner product checksum rho = 483997DD +Inner product checksum theta = 5135490B +Inner product checksum u = 612F5E12 +Inner product checksum mr1 = 4090F5AF +Inner product checksum mr2 = 35A095E3 +Inner product checksum mr3 = 2FA5108E +Inner product checksum mr4 = 33F4FD57 +Inner product checksum mr5 = BE85F73 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 9f0b2b052..32a81fb07 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 = 483997EC -Inner product checksum theta = 513548FD -Inner product checksum u = 612F5EB9 -Inner product checksum mr1 = 40910DEE -Inner product checksum mr2 = 35DE4A2C -Inner product checksum mr3 = 2FA75F15 -Inner product checksum mr4 = 33F4FFD3 -Inner product checksum mr5 = BE04B38 +Inner product checksum rho = 483997E0 +Inner product checksum theta = 51354900 +Inner product checksum u = 612F5EC4 +Inner product checksum mr1 = 40910E6E +Inner product checksum mr2 = 35EA60B9 +Inner product checksum mr3 = 2FA72D30 +Inner product checksum mr4 = 33F4FFE0 +Inner product checksum mr5 = BE04B94 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 b3bf80080..b2b8297dd 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 = 48398C69 Inner product checksum theta = 51354302 -Inner product checksum u = 612EDCBA -Inner product checksum mr1 = 4091034B -Inner product checksum mr2 = 3592F0C2 -Inner product checksum mr3 = 300105E3 -Inner product checksum mr4 = 3404AC1D -Inner product checksum mr5 = C14A22D +Inner product checksum u = 612EDCBD +Inner product checksum mr1 = 40910366 +Inner product checksum mr2 = 3585F2F1 +Inner product checksum mr3 = 3001091C +Inner product checksum mr4 = 3404AC21 +Inner product checksum mr5 = C14A225 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt index 9006b2022..e0c8cd962 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 4830B646 -Inner product checksum theta = 513FD832 -Inner product checksum u = 5F74BAEC -Inner product checksum mr1 = 4155B86C -Inner product checksum mr2 = 3A48BCB8 -Inner product checksum mr3 = 30A6CEC1 +Inner product checksum rho = 4830B614 +Inner product checksum theta = 513FD853 +Inner product checksum u = 5F74B5AB +Inner product checksum mr1 = 41559DEF +Inner product checksum mr2 = 3A4666FC +Inner product checksum mr3 = 3097BE10 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index d073714bb..efe78f80e 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F8B1D6 -Inner product checksum theta = 4D84D800 -Inner product checksum u = 601AD0BE -Inner product checksum mr1 = 3C871072 -Inner product checksum mr2 = 3552C937 -Inner product checksum mr3 = 31D3C728 +Inner product checksum theta = 4D84D80C +Inner product checksum u = 601AD0B5 +Inner product checksum mr1 = 3C870B28 +Inner product checksum mr2 = 354B1A78 +Inner product checksum mr3 = 31C1A516 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index d5bf03e15..086b4ab48 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_coma9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50046 -Inner product checksum theta = 4E044C03 -Inner product checksum u = 5FBFF00A -Inner product checksum mr1 = 3CE0BFD7 -Inner product checksum mr2 = 348932BD -Inner product checksum mr3 = 31279BBD -Inner product checksum mr4 = 2EEB9616 +Inner product checksum theta = 4E044768 +Inner product checksum u = 5FC8167A +Inner product checksum mr1 = 3CE0CB82 +Inner product checksum mr2 = 347061A4 +Inner product checksum mr3 = 2F3F59D0 +Inner product checksum mr4 = 2F4547F2 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 0adc19059..66c35c098 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F8B1D6 -Inner product checksum theta = 4D84DAEF -Inner product checksum u = 601AD41A -Inner product checksum mr1 = 3C829C2B -Inner product checksum mr2 = 3407BDD6 -Inner product checksum mr3 = 314F5B36 +Inner product checksum theta = 4D84DAE8 +Inner product checksum u = 601AD409 +Inner product checksum mr1 = 3C827A44 +Inner product checksum mr2 = 340BF010 +Inner product checksum mr3 = 3178498E Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 528031ecb..9e27cec46 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_comorph_dev_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50046 -Inner product checksum theta = 4E044E4C -Inner product checksum u = 5FDD4323 -Inner product checksum mr1 = 3CC7B2CE -Inner product checksum mr2 = 331179D2 -Inner product checksum mr3 = 2FF24AD6 -Inner product checksum mr4 = 2F26E792 +Inner product checksum theta = 4E044E8C +Inner product checksum u = 5FD31642 +Inner product checksum mr1 = 3CC945E2 +Inner product checksum mr2 = 33AC195D +Inner product checksum mr3 = 2FD5BA50 +Inner product checksum mr4 = 2F0097B8 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index b7e3fefec..bda3af15d 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_bomex-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F8B1D6 Inner product checksum theta = 4D84D83D Inner product checksum u = 601AD7F0 -Inner product checksum mr1 = 3C80A939 -Inner product checksum mr2 = 2EE9A7C0 -Inner product checksum mr3 = 2DBC7FCA +Inner product checksum mr1 = 3C80A93C +Inner product checksum mr2 = 2EE9A8E2 +Inner product checksum mr3 = 2DBC7951 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 69005270d..3e7d36f73 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_comp_tran_ref-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 433541EC -Inner product checksum theta = 4C3661CC -Inner product checksum u = 5FC5C131 -Inner product checksum mr1 = 3C66C42C -Inner product checksum mr2 = 3420C58F -Inner product checksum mr3 = 2E10D4E8 +Inner product checksum theta = 4C366011 +Inner product checksum u = 5FC5C13C +Inner product checksum mr1 = 3C64D4E1 +Inner product checksum mr2 = 33848CD8 +Inner product checksum mr3 = 2DB7BB6A Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 7a22da287..9415ac787 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_dice2-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 433107DB -Inner product checksum theta = 4C084544 +Inner product checksum theta = 4C084545 Inner product checksum u = 606FB50D -Inner product checksum mr1 = 3B3FF380 -Inner product checksum mr2 = 3014247C -Inner product checksum mr3 = 295BCC5D +Inner product checksum mr1 = 3B3FF384 +Inner product checksum mr2 = 3014236C +Inner product checksum mr3 = 295BCEF2 Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index e93d856e2..bda15e1aa 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_gabls4-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42CD477E -Inner product checksum theta = 4C2F1CC9 -Inner product checksum u = 6064CD36 -Inner product checksum mr1 = 37230F82 +Inner product checksum theta = 4C2F1CAE +Inner product checksum u = 6064CD3C +Inner product checksum mr1 = 37239268 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 -Inner product checksum mr4 = 33EAA257 +Inner product checksum mr4 = 33E8462C Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_seaice-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_seaice-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index c1616b904..76698b9da 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_seaice-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_seaice-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,7 +1,7 @@ Inner product checksum rho = 434FEE7A Inner product checksum theta = 4C46F478 Inner product checksum u = 62E3E1C3 -Inner product checksum mr1 = 3A04E4AA +Inner product checksum mr1 = 3A04E4AC Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index c0102a24f..d77c54ad2 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_snow-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,7 +1,7 @@ Inner product checksum rho = 433107DB -Inner product checksum theta = 4C065E7F -Inner product checksum u = 606FB55D -Inner product checksum mr1 = 3A8C69EF +Inner product checksum theta = 4C065E7E +Inner product checksum u = 606FB55C +Inner product checksum mr1 = 3A8C69F1 Inner product checksum mr2 = 2DDBE6FE Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 3b7c6bf77..67c17bae0 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_gal9_toga-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50046 -Inner product checksum theta = 4E0457CD -Inner product checksum u = 5FB709A2 -Inner product checksum mr1 = 3CE651BE -Inner product checksum mr2 = 331363B2 -Inner product checksum mr3 = 2EEE1887 -Inner product checksum mr4 = 2F58EA72 +Inner product checksum theta = 4E0456EC +Inner product checksum u = 5FB8CC4E +Inner product checksum mr1 = 3CE73F68 +Inner product checksum mr2 = 33DF9E91 +Inner product checksum mr3 = 2FC70C0C +Inner product checksum mr4 = 2F2A6F42 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 8584c5aee..a7bb6ac3f 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_constrain-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 434FEE7A -Inner product checksum theta = 4C47E251 -Inner product checksum u = 62E3D540 -Inner product checksum mr1 = 3A37FEF3 -Inner product checksum mr2 = 31AEACAC -Inner product checksum mr3 = 2602EE25 -Inner product checksum mr4 = 33BE4E1A -Inner product checksum mr5 = 2A4D1790 -Inner product checksum mr6 = 2C90ABAB +Inner product checksum theta = 4C47E25E +Inner product checksum u = 62E3D50B +Inner product checksum mr1 = 3A35EC88 +Inner product checksum mr2 = 3197B349 +Inner product checksum mr3 = 26BBAD56 +Inner product checksum mr4 = 33C2631D +Inner product checksum mr5 = 2B36EF12 +Inner product checksum mr6 = 2C07D5D8 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 0698002ee..fdbb5e4ee 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_moruses-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,5 +1,5 @@ Inner product checksum rho = 433107DB -Inner product checksum theta = 4C096ADD +Inner product checksum theta = 4C096ADE Inner product checksum u = 6074FC44 Inner product checksum mr1 = 3A6F450A Inner product checksum mr2 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 671920b15..b547e8a1b 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ral3_urban2t-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,7 +1,7 @@ Inner product checksum rho = 433107DB Inner product checksum theta = 4C08B091 Inner product checksum u = 6075B791 -Inner product checksum mr1 = 3A5C1B46 +Inner product checksum mr1 = 3A5C1B40 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index f1b9dc86b..348ff6952 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_land-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,7 +1,7 @@ Inner product checksum rho = 433107DB Inner product checksum theta = 4C08DF8A Inner product checksum u = 606FB526 -Inner product checksum mr1 = 3B1C91CA +Inner product checksum mr1 = 3B1C91DA Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt index 4c6bdbbfd..c420356da 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_scm_ukca_sea-BiP2x2-50000x50000_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 42F50046 -Inner product checksum theta = 4E15DFDC -Inner product checksum u = 5F89D47F -Inner product checksum mr1 = 3C9BB4DC -Inner product checksum mr2 = 31E1A10A -Inner product checksum mr3 = 2A8F7B6C -Inner product checksum mr4 = 30E46F0B +Inner product checksum theta = 4E15E0F5 +Inner product checksum u = 5F8A8C54 +Inner product checksum mr1 = 3C96A6F5 +Inner product checksum mr2 = 2EF909F0 +Inner product checksum mr3 = 2B83B372 +Inner product checksum mr4 = 2F89D79C Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_coupled/ex1a/checksum_lfric_coupled_nwp_gal9-C48_ex1a_cce_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lfric_coupled/ex1a/checksum_lfric_coupled_nwp_gal9-C48_ex1a_cce_fast-debug-64bit.txt index 0a81215b8..03743c589 100644 --- a/rose-stem/site/meto/kgos/lfric_coupled/ex1a/checksum_lfric_coupled_nwp_gal9-C48_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric_coupled/ex1a/checksum_lfric_coupled_nwp_gal9-C48_ex1a_cce_fast-debug-64bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 411B540C33AE2137 -Inner product checksum theta = 42735B20484A0071 -Inner product checksum u = 456F43594C8887A8 -Inner product checksum mr1 = 40368412E6CE533E -Inner product checksum mr2 = 3F40052B88481958 -Inner product checksum mr3 = 3F025BCA450F15B7 -Inner product checksum mr4 = 3F366AB08264FA88 +Inner product checksum rho = 411B540A2CC95DA2 +Inner product checksum theta = 42735B1C927442FA +Inner product checksum u = 456F43962C307602 +Inner product checksum mr1 = 403683F35BF00AEA +Inner product checksum mr2 = 3F400D948AC7F395 +Inner product checksum mr3 = 3F019F54A2F481D4 +Inner product checksum mr4 = 3F3667B8B520FFEB Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_fast-debug-64bit.txt index 2eb6dfbbf..68618bc8f 100644 --- a/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_fast-debug-64bit.txt @@ -1,8 +1,8 @@ -Inner product checksum rho = 41186A085C7F8865 +Inner product checksum rho = 41186A085C7F8864 Inner product checksum u = 421E51A61F1185A0 -Inner product checksum theta = 411DF65CBD0F5926 +Inner product checksum theta = 411DF65CBD0F5932 Inner product checksum tracer = 411DCA168563EAD2 -Inner product checksum mr1 = 411DF61E66FA65C8 +Inner product checksum mr1 = 411DF61E66FA65D6 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_full-debug-64bit.txt b/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_full-debug-64bit.txt index 2eb6dfbbf..68618bc8f 100644 --- a/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_full-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/transport/azspice/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_azspice_gnu_full-debug-64bit.txt @@ -1,8 +1,8 @@ -Inner product checksum rho = 41186A085C7F8865 +Inner product checksum rho = 41186A085C7F8864 Inner product checksum u = 421E51A61F1185A0 -Inner product checksum theta = 411DF65CBD0F5926 +Inner product checksum theta = 411DF65CBD0F5932 Inner product checksum tracer = 411DCA168563EAD2 -Inner product checksum mr1 = 411DF61E66FA65C8 +Inner product checksum mr1 = 411DF61E66FA65D6 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/transport/ex1a/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_ex1a_cce_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/transport/ex1a/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_ex1a_cce_fast-debug-64bit.txt index c9b0dd166..8502d3d2c 100644 --- a/rose-stem/site/meto/kgos/transport/ex1a/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/transport/ex1a/checksum_transport_cylinder_xz_ffsl-BiP100x10-20x20_ex1a_cce_fast-debug-64bit.txt @@ -1,8 +1,8 @@ -Inner product checksum rho = 41186A085C7F886E +Inner product checksum rho = 41186A085C7F886C Inner product checksum u = 421E51A61F11862E -Inner product checksum theta = 411DF65CBD0F5934 +Inner product checksum theta = 411DF65CBD0F5932 Inner product checksum tracer = 411DCA168563EABC -Inner product checksum mr1 = 411DF61E66FA65C0 +Inner product checksum mr1 = 411DF61E66FA65BF Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/science/gungho/integration-test/cma_test/resources/cma_test_configuration.nml b/science/gungho/integration-test/cma_test/resources/cma_test_configuration.nml index d0821e849..e9897d51e 100644 --- a/science/gungho/integration-test/cma_test/resources/cma_test_configuration.nml +++ b/science/gungho/integration-test/cma_test/resources/cma_test_configuration.nml @@ -25,6 +25,8 @@ element_order_v = 0 rehabilitate = .true. coord_order = 1 + coord_order_multigrid = 1 + coord_space = 'Wchi' coord_system = 'native' vorticity_in_w1 = .false. / diff --git a/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 b/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 index 103e24cfe..c87f577ba 100644 --- a/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 +++ b/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 @@ -12,6 +12,7 @@ module limited_area_masks_alg_mod use field_mod, only: field_type + use fs_continuity_mod, only: Wchi use constants_mod, only: i_def, r_def, l_def, PI, & degrees_to_radians, & radians_to_degrees @@ -351,6 +352,14 @@ contains mesh => function_space%get_mesh() domain = mesh%get_domain() + ! The kernels require chi to be in Wchi + if (chi(1)%which_function_space() /= Wchi) then + call log_event( & + 'Coordinate based LBC method only implemented for coordinates ' // & + 'in the Wchi function space', LOG_LEVEL_ERROR & + ) + end if + if ( rim_width_ns > 0 ) then outer_n = boundary_n - outer_width_ns outer_s = boundary_s - outer_width_ns @@ -541,6 +550,14 @@ contains mesh => function_space%get_mesh() domain = mesh%get_domain() + ! The kernels require chi to be in Wchi + if (chi(1)%which_function_space() /= Wchi) then + call log_event( & + 'Coordinate based LBC method only implemented for coordinates ' // & + 'in the Wchi function space', LOG_LEVEL_ERROR & + ) + end if + if ( rim_width_ns > 0 ) then outer_n = boundary_n - outer_width_ns outer_s = boundary_s - outer_width_ns @@ -716,6 +733,14 @@ contains mesh => function_space%get_mesh() domain = mesh%get_domain() + ! The kernels require chi to be in Wchi + if (chi(1)%which_function_space() /= Wchi) then + call log_event( & + 'Coordinate based LBC method only implemented for coordinates ' // & + 'in the Wchi function space', LOG_LEVEL_ERROR & + ) + end if + call calculate_boundary_coordinates( & coord_bound_s, & coord_bound_n, & @@ -809,6 +834,14 @@ contains mesh => function_space%get_mesh() domain = mesh%get_domain() + ! The kernels require chi to be in Wchi + if (chi(1)%which_function_space() /= Wchi) then + call log_event( & + 'Coordinate based LBC method only implemented for coordinates ' // & + 'in the Wchi function space', LOG_LEVEL_ERROR & + ) + end if + call calculate_boundary_coordinates( & coord_bound_s, & coord_bound_n, & @@ -906,6 +939,14 @@ contains mesh => function_space%get_mesh() domain = mesh%get_domain() + ! The kernels require chi to be in Wchi + if (chi(1)%which_function_space() /= Wchi) then + call log_event( & + 'Coordinate based LBC method only implemented for coordinates ' // & + 'in the Wchi function space', LOG_LEVEL_ERROR & + ) + end if + call calculate_boundary_coordinates( & coord_bound_s, & coord_bound_n, & diff --git a/science/gungho/source/kernel/external_forcing/deep_hot_jupiter_kernel_mod.F90 b/science/gungho/source/kernel/external_forcing/deep_hot_jupiter_kernel_mod.F90 index f898cd611..376c727bf 100644 --- a/science/gungho/source/kernel/external_forcing/deep_hot_jupiter_kernel_mod.F90 +++ b/science/gungho/source/kernel/external_forcing/deep_hot_jupiter_kernel_mod.F90 @@ -21,11 +21,12 @@ module deep_hot_jupiter_kernel_mod GH_READ, GH_READWRITE, & GH_SCALAR, & ANY_DISCONTINUOUS_SPACE_3, & + ANY_SPACE_9, & GH_READ, CELL_COLUMN use constants_mod, only: r_def, i_def use sci_chi_transform_mod, only: chi2llr use calc_exner_pointwise_mod, only: calc_exner_pointwise - use fs_continuity_mod, only: Wtheta, Wchi + use fs_continuity_mod, only: Wtheta use deep_hot_jupiter_forcings_mod, only: deep_hot_jupiter_newton_frequency, & deep_hot_jupiter_equilibrium_theta use kernel_mod, only: kernel_type @@ -46,7 +47,7 @@ module deep_hot_jupiter_kernel_mod arg_type(GH_FIELD, GH_REAL, GH_READWRITE, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3), & arg_type(GH_SCALAR, GH_REAL, GH_READ) & /) diff --git a/science/gungho/source/kernel/external_forcing/earth_like_kernel_mod.F90 b/science/gungho/source/kernel/external_forcing/earth_like_kernel_mod.F90 index 3699e7df6..8cd1cdf1c 100644 --- a/science/gungho/source/kernel/external_forcing/earth_like_kernel_mod.F90 +++ b/science/gungho/source/kernel/external_forcing/earth_like_kernel_mod.F90 @@ -21,11 +21,12 @@ module earth_like_kernel_mod GH_READ, GH_READWRITE, & GH_SCALAR, & ANY_DISCONTINUOUS_SPACE_3, & + ANY_SPACE_9, & GH_READ, CELL_COLUMN use constants_mod, only: r_def, i_def use sci_chi_transform_mod, only: chi2llr use calc_exner_pointwise_mod, only: calc_exner_pointwise - use fs_continuity_mod, only: Wtheta, Wchi + use fs_continuity_mod, only: Wtheta use earth_like_forcings_mod, only: earth_like_newton_frequency, & earth_like_equilibrium_theta use kernel_mod, only: kernel_type @@ -47,7 +48,7 @@ module earth_like_kernel_mod arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3), & arg_type(GH_SCALAR, GH_REAL, GH_READ), & arg_type(GH_SCALAR, GH_REAL, GH_READ) & diff --git a/science/gungho/source/kernel/external_forcing/shallow_hot_jupiter_kernel_mod.F90 b/science/gungho/source/kernel/external_forcing/shallow_hot_jupiter_kernel_mod.F90 index 28994c674..6413a4be0 100644 --- a/science/gungho/source/kernel/external_forcing/shallow_hot_jupiter_kernel_mod.F90 +++ b/science/gungho/source/kernel/external_forcing/shallow_hot_jupiter_kernel_mod.F90 @@ -21,11 +21,12 @@ module shallow_hot_jupiter_kernel_mod GH_READ, GH_READWRITE, & GH_SCALAR, & ANY_DISCONTINUOUS_SPACE_3, & + ANY_SPACE_9, & GH_READ, CELL_COLUMN use constants_mod, only: r_def, i_def use sci_chi_transform_mod, only: chi2llr use calc_exner_pointwise_mod, only: calc_exner_pointwise - use fs_continuity_mod, only: Wtheta, Wchi + use fs_continuity_mod, only: Wtheta use shallow_hot_jupiter_forcings_mod, only: shallow_hot_jupiter_newton_frequency, & shallow_hot_jupiter_equilibrium_theta use kernel_mod, only: kernel_type @@ -47,7 +48,7 @@ module shallow_hot_jupiter_kernel_mod arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3), & arg_type(GH_SCALAR, GH_REAL, GH_READ), & arg_type(GH_SCALAR, GH_REAL, GH_READ) & diff --git a/science/gungho/source/kernel/initialisation/initial_rho_sample_kernel_mod.F90 b/science/gungho/source/kernel/initialisation/initial_rho_sample_kernel_mod.F90 index 45fafaf31..4327e91d1 100644 --- a/science/gungho/source/kernel/initialisation/initial_rho_sample_kernel_mod.F90 +++ b/science/gungho/source/kernel/initialisation/initial_rho_sample_kernel_mod.F90 @@ -19,7 +19,6 @@ module initial_rho_sample_kernel_mod ANY_DISCONTINUOUS_SPACE_1, & ANY_DISCONTINUOUS_SPACE_3, & CELL_COLUMN, GH_EVALUATOR - use fs_continuity_mod, only : Wchi use constants_mod, only : r_def, i_def use idealised_config_mod, only : test use kernel_mod, only : kernel_type @@ -35,12 +34,12 @@ module initial_rho_sample_kernel_mod private type(arg_type) :: meta_args(4) = (/ & arg_type(GH_FIELD, GH_REAL, GH_WRITE, ANY_DISCONTINUOUS_SPACE_1), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3), & arg_type(GH_SCALAR, GH_REAL, GH_READ) & /) type(func_type) :: meta_funcs(1) = (/ & - func_type(Wchi, GH_BASIS) & + func_type(ANY_SPACE_9, GH_BASIS) & /) integer :: operates_on = CELL_COLUMN integer :: gh_shape = GH_EVALUATOR diff --git a/science/gungho/source/kernel/initialisation/set_rho_kernel_mod.F90 b/science/gungho/source/kernel/initialisation/set_rho_kernel_mod.F90 index bc6f1bf39..dc243c379 100644 --- a/science/gungho/source/kernel/initialisation/set_rho_kernel_mod.F90 +++ b/science/gungho/source/kernel/initialisation/set_rho_kernel_mod.F90 @@ -34,13 +34,13 @@ module set_rho_kernel_mod private type(arg_type) :: meta_args(4) = (/ & arg_type(GH_FIELD, GH_REAL, GH_WRITE, ANY_DISCONTINUOUS_SPACE_1), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3), & arg_type(GH_SCALAR, GH_REAL, GH_READ) & /) type(func_type) :: meta_funcs(2) = (/ & func_type(ANY_DISCONTINUOUS_SPACE_1, GH_BASIS), & - func_type(Wchi, GH_BASIS, GH_DIFF_BASIS) & + func_type(ANY_SPACE_9, GH_BASIS, GH_DIFF_BASIS) & /) integer :: operates_on = CELL_COLUMN integer :: gh_shape = GH_QUADRATURE_XYoZ diff --git a/science/gungho/source/kernel/solver/eliminated_theta_q22_kernel_mod.F90 b/science/gungho/source/kernel/solver/eliminated_theta_q22_kernel_mod.F90 index acabd2c24..ec2e9f530 100644 --- a/science/gungho/source/kernel/solver/eliminated_theta_q22_kernel_mod.F90 +++ b/science/gungho/source/kernel/solver/eliminated_theta_q22_kernel_mod.F90 @@ -16,18 +16,19 @@ !! https://code.metoffice.gov.uk/trac/lfric/wiki/GhaspSupport/Documentation module eliminated_theta_q22_kernel_mod - use argument_mod, only: arg_type, func_type, & - GH_OPERATOR, GH_FIELD, & - GH_REAL, GH_SCALAR, & - GH_READ, GH_WRITE, & - GH_BASIS, GH_DIFF_BASIS, & - CELL_COLUMN, & - GH_QUADRATURE_XYoZ, & - ANY_DISCONTINUOUS_SPACE_3 + use argument_mod, only: arg_type, func_type, & + GH_OPERATOR, GH_FIELD, & + GH_REAL, GH_SCALAR, & + GH_READ, GH_WRITE, & + GH_BASIS, GH_DIFF_BASIS, & + CELL_COLUMN, & + GH_QUADRATURE_XYoZ, & + ANY_DISCONTINUOUS_SPACE_3, & + ANY_SPACE_9 use constants_mod, only: i_def, r_def, r_solver use sci_coordinate_jacobian_mod, only: coordinate_jacobian - use fs_continuity_mod, only: W2, Wtheta, Wchi + use fs_continuity_mod, only: W2, Wtheta use kernel_mod, only: kernel_type implicit none @@ -45,14 +46,14 @@ module eliminated_theta_q22_kernel_mod arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & arg_type(GH_FIELD, GH_REAL, GH_READ, W2), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3), & arg_type(GH_SCALAR, GH_REAL, GH_READ) & /) type(func_type) :: meta_funcs(3) = (/ & - func_type(W2, GH_BASIS), & - func_type(Wtheta, GH_DIFF_BASIS), & - func_type(Wchi, GH_BASIS, GH_DIFF_BASIS) & + func_type(W2, GH_BASIS), & + func_type(Wtheta, GH_DIFF_BASIS), & + func_type(ANY_SPACE_9, GH_BASIS, GH_DIFF_BASIS) & /) integer :: operates_on = CELL_COLUMN integer :: gh_shape = GH_QUADRATURE_XYoZ diff --git a/science/gungho/source/kernel/solver/w2_normalisation_kernel_mod.F90 b/science/gungho/source/kernel/solver/w2_normalisation_kernel_mod.F90 index 7116bbdb7..06ef2a9d4 100644 --- a/science/gungho/source/kernel/solver/w2_normalisation_kernel_mod.F90 +++ b/science/gungho/source/kernel/solver/w2_normalisation_kernel_mod.F90 @@ -22,7 +22,7 @@ module w2_normalisation_kernel_mod GH_BASIS, GH_DIFF_BASIS, & CELL_COLUMN, GH_EVALUATOR use constants_mod, only : r_def, r_solver, i_def - use fs_continuity_mod, only : W2, Wchi + use fs_continuity_mod, only : W2 use kernel_mod, only : kernel_type implicit none @@ -39,14 +39,14 @@ module w2_normalisation_kernel_mod private type(arg_type) :: meta_args(4) = (/ & arg_type(GH_FIELD, GH_REAL, GH_INC, W2), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3), & arg_type(GH_FIELD, GH_REAL, GH_READ, W2) & /) - type(func_type) :: meta_funcs(2) = (/ & - func_type(W2, GH_BASIS), & - func_type(Wchi, GH_BASIS, GH_DIFF_BASIS) & + type(func_type) :: meta_funcs(2) = (/ & + func_type(W2, GH_BASIS), & + func_type(ANY_SPACE_9, GH_BASIS, GH_DIFF_BASIS) & /) integer :: operates_on = CELL_COLUMN integer :: gh_shape = GH_EVALUATOR diff --git a/science/gungho/source/kernel/transport/common/init_remap_on_extended_mesh_kernel_mod.F90 b/science/gungho/source/kernel/transport/common/init_remap_on_extended_mesh_kernel_mod.F90 index 7f88ff248..1fc8dc3d3 100644 --- a/science/gungho/source/kernel/transport/common/init_remap_on_extended_mesh_kernel_mod.F90 +++ b/science/gungho/source/kernel/transport/common/init_remap_on_extended_mesh_kernel_mod.F90 @@ -19,12 +19,12 @@ module init_remap_on_extended_mesh_kernel_mod GH_READ, GH_WRITE, & ANY_DISCONTINUOUS_SPACE_1, & ANY_DISCONTINUOUS_SPACE_3, & + ANY_SPACE_9, & GH_BASIS, & HALO_CELL_COLUMN, & STENCIL, CROSS2D, & GH_EVALUATOR use constants_mod, only: r_tran, r_def, i_def, l_def, LARGE_REAL_POSITIVE -use fs_continuity_mod, only: Wchi implicit none @@ -39,14 +39,14 @@ module init_remap_on_extended_mesh_kernel_mod type(arg_type) :: meta_args(7) = (/ & arg_type(GH_FIELD, GH_REAL, GH_WRITE, ANY_DISCONTINUOUS_SPACE_1), & arg_type(GH_FIELD, GH_INTEGER, GH_WRITE, ANY_DISCONTINUOUS_SPACE_1), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi, STENCIL(CROSS2D)), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9, STENCIL(CROSS2D)), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3, STENCIL(CROSS2D)), & arg_type(GH_SCALAR, GH_LOGICAL, GH_READ), & arg_type(GH_SCALAR, GH_INTEGER, GH_READ) & /) type(func_type) :: meta_funcs(1) = (/ & - func_type(Wchi, GH_BASIS) & + func_type(ANY_SPACE_9, GH_BASIS) & /) integer :: operates_on = HALO_CELL_COLUMN integer :: gh_shape = GH_EVALUATOR diff --git a/science/gungho/source/kernel/transport/common/panel_edge_weights_kernel_mod.F90 b/science/gungho/source/kernel/transport/common/panel_edge_weights_kernel_mod.F90 index 2d51a6417..2a4e40b85 100644 --- a/science/gungho/source/kernel/transport/common/panel_edge_weights_kernel_mod.F90 +++ b/science/gungho/source/kernel/transport/common/panel_edge_weights_kernel_mod.F90 @@ -16,10 +16,10 @@ module panel_edge_weights_kernel_mod ANY_DISCONTINUOUS_SPACE_3, & ANY_DISCONTINUOUS_SPACE_5, & ANY_DISCONTINUOUS_SPACE_9, & + ANY_SPACE_9, & GH_BASIS, GH_EVALUATOR, & CELL_COLUMN, STENCIL, CROSS2D use constants_mod, only: r_tran, r_def, i_def, l_def, LARGE_REAL_POSITIVE -use fs_continuity_mod, only: Wchi use reference_element_mod, only: W, S, N, E implicit none @@ -37,7 +37,8 @@ module panel_edge_weights_kernel_mod arg_type(GH_FIELD, GH_REAL, GH_WRITE, ANY_DISCONTINUOUS_SPACE_5), & arg_type(GH_FIELD, GH_INTEGER, GH_WRITE, ANY_DISCONTINUOUS_SPACE_5), & arg_type(GH_FIELD, GH_INTEGER, GH_WRITE, ANY_DISCONTINUOUS_SPACE_5), & - arg_type(GH_FIELD*3, GH_REAL, GH_READ, Wchi, STENCIL(CROSS2D)), & + arg_type(GH_FIELD*3, GH_REAL, GH_READ, ANY_SPACE_9, & + STENCIL(CROSS2D)), & arg_type(GH_FIELD*2, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_9), & arg_type(GH_FIELD*2, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_9), & arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_DISCONTINUOUS_SPACE_3, & @@ -47,7 +48,7 @@ module panel_edge_weights_kernel_mod arg_type(GH_SCALAR, GH_INTEGER, GH_READ) & /) type(func_type) :: meta_funcs(2) = (/ & - func_type(Wchi, GH_BASIS), & + func_type(ANY_SPACE_9, GH_BASIS), & func_type(ANY_DISCONTINUOUS_SPACE_9, GH_BASIS) & /) integer :: operates_on = CELL_COLUMN diff --git a/science/gungho/source/kernel/transport/mol/consistent_wind_kernel_mod.F90 b/science/gungho/source/kernel/transport/mol/consistent_wind_kernel_mod.F90 index fed6b05c8..d986123af 100644 --- a/science/gungho/source/kernel/transport/mol/consistent_wind_kernel_mod.F90 +++ b/science/gungho/source/kernel/transport/mol/consistent_wind_kernel_mod.F90 @@ -13,13 +13,14 @@ module consistent_wind_kernel_mod -use argument_mod, only : arg_type, func_type, & - GH_FIELD, GH_REAL, & - GH_READWRITE, GH_READ, & - GH_BASIS, GH_DIFF_BASIS, & - CELL_COLUMN, GH_EVALUATOR +use argument_mod, only : arg_type, func_type, & + GH_FIELD, GH_REAL, & + GH_READWRITE, GH_READ, & + GH_BASIS, GH_DIFF_BASIS, & + CELL_COLUMN, GH_EVALUATOR, & + ANY_SPACE_9 use constants_mod, only : r_def, i_def, r_tran -use fs_continuity_mod, only : Wtheta, W2, W2v, Wchi +use fs_continuity_mod, only : Wtheta, W2, W2v use kernel_mod, only : kernel_type implicit none @@ -31,15 +32,15 @@ module consistent_wind_kernel_mod !> The type declaration for the kernel. Contains the metadata needed by the PSy layer type, public, extends(kernel_type) :: consistent_wind_kernel_type private - type(arg_type) :: meta_args(4) = (/ & - arg_type(GH_FIELD, GH_REAL, GH_READWRITE, W2v), & - arg_type(GH_FIELD, GH_REAL, GH_READ, W2), & - arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & - arg_type(GH_FIELD, GH_REAL, GH_READ, Wchi) & + type(arg_type) :: meta_args(4) = (/ & + arg_type(GH_FIELD, GH_REAL, GH_READWRITE, W2v), & + arg_type(GH_FIELD, GH_REAL, GH_READ, W2), & + arg_type(GH_FIELD, GH_REAL, GH_READ, Wtheta), & + arg_type(GH_FIELD, GH_REAL, GH_READ, ANY_SPACE_9) & /) - type(func_type) :: meta_funcs(2) = (/ & - func_type(W2, GH_BASIS), & - func_type(Wchi, GH_DIFF_BASIS) & + type(func_type) :: meta_funcs(2) = (/ & + func_type(W2, GH_BASIS), & + func_type(ANY_SPACE_9, GH_DIFF_BASIS) & /) integer :: operates_on = CELL_COLUMN integer :: gh_shape = GH_EVALUATOR diff --git a/science/gungho/source/orography/assign_orography_field_mod.F90 b/science/gungho/source/orography/assign_orography_field_mod.F90 index 7b08cf38a..9c8a02c0e 100644 --- a/science/gungho/source/orography/assign_orography_field_mod.F90 +++ b/science/gungho/source/orography/assign_orography_field_mod.F90 @@ -1,32 +1,34 @@ -!----------------------------------------------------------------------------- +!------------------------------------------------------------------------------- ! (C) Crown copyright 2017 Met Office. All rights reserved. ! The file LICENCE, distributed with this code, contains details of the terms ! under which the code may be used. -!----------------------------------------------------------------------------- - -!----------------------------------------------------------------------- -!> @brief Module to assign the values of the surface height to model -!> coordinates using either an analytic orography function or from -!> a surface_altitude field. -!> Note that unlike other algorithms, this is breaks encapsulation in order to -!> write to the chi field. This is an exception and only allowed in the set up -!> phase of the model. Generally, the chi field is read only (and this is -!> enforced through PSyClone). +!------------------------------------------------------------------------------- + +!------------------------------------------------------------------------------- +!> @brief Updates the model's coordinates to include orography. +!> @details Module to assign the values of the surface height to model +!! coordinates using either an analytic orography function or from a +!! surface_altitude field. +!! Note that unlike other algorithms, this is breaks encapsulation in +!! order to write to the chi field. This is an exception and only +!! allowed in the set up phase of the model. Generally, the chi field +!! is read only (and this is enforced through PSyClone). !------------------------------------------------------------------------------- module assign_orography_field_mod use constants_mod, only : r_def, i_def, l_def - use orography_config_mod, only : orog_init_option, & - orog_init_option_analytic, & - orog_init_option_ancil, & - orog_init_option_none, & + use orography_config_mod, only : orog_init_option, & + orog_init_option_analytic, & + orog_init_option_ancil, & + orog_init_option_none, & orog_init_option_start_dump - use base_mesh_config_mod, only : geometry, & - geometry_spherical, & - topology, & - topology_fully_periodic - use finite_element_config_mod, only : coord_system, & - coord_order, & + use base_mesh_config_mod, only : geometry, & + geometry_spherical, & + topology, & + topology_fully_periodic, & + prime_mesh_name + use finite_element_config_mod, only : coord_system, & + coord_order, & coord_system_xyz use mesh_collection_mod, only : mesh_collection use coord_transform_mod, only : xyz2llr, llr2xyz @@ -43,7 +45,6 @@ module assign_orography_field_mod LOG_LEVEL_ERROR use fs_continuity_mod, only : W0, Wchi use function_space_mod, only : BASIS - use surface_altitude_alg_mod, only : surface_altitude_alg implicit none @@ -60,49 +61,64 @@ module assign_orography_field_mod interface - subroutine analytic_orography_interface(nlayers, & - ndf_chi, undf_chi, map_chi, & - ndf_pid, undf_pid, map_pid, & - domain_surface, domain_height, & + subroutine analytic_orography_interface(nlayers, & + ndf_chi, undf_chi, map_chi, & + ndf_pid, undf_pid, map_pid, & + domain_surface, domain_height, & + chi_1_in, chi_2_in, chi_3_in, & chi_1, chi_2, chi_3, panel_id) - import :: r_def, i_def + + import :: i_def, r_def + implicit none - integer(kind=i_def), intent(in) :: nlayers, undf_chi, undf_pid - integer(kind=i_def), intent(in) :: ndf_chi, ndf_pid - integer(kind=i_def), intent(in) :: map_chi(ndf_chi), map_pid(ndf_pid) - real(kind=r_def), intent(in) :: domain_surface, domain_height - real(kind=r_def), intent(inout) :: chi_1(undf_chi), chi_2(undf_chi), chi_3(undf_chi) - real(kind=r_def), intent(in) :: panel_id(undf_pid) + + integer(kind=i_def), intent(in) :: nlayers, undf_chi, undf_pid + integer(kind=i_def), intent(in) :: ndf_chi, ndf_pid + integer(kind=i_def), intent(in) :: map_chi(ndf_chi), map_pid(ndf_pid) + real(kind=r_def), intent(in) :: domain_surface, domain_height + real(kind=r_def), intent(in) :: chi_1_in(undf_chi) + real(kind=r_def), intent(in) :: chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi) + real(kind=r_def), intent(inout) :: chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) + real(kind=r_def), intent(in) :: panel_id(undf_pid) + end subroutine analytic_orography_interface end interface interface - subroutine ancil_orography_interface(nlayers, & - chi_1, chi_2, chi_3, & - panel_id, & - surface_altitude, & - domain_surface, domain_height, & - ndf_chi, undf_chi, & - map_chi, & - ndf_pid, undf_pid, & - map_pid, & - ndf, undf, & - map, basis & - ) - import :: r_def, i_def + subroutine ancil_orography_interface(nlayers, & + chi_1, chi_2, chi_3, & + chi_1_in, chi_2_in, chi_3_in, & + panel_id, & + surface_altitude, & + domain_surface, domain_height, & + ndf_chi, undf_chi, map_chi, & + ndf_pid, undf_pid, map_pid, & + ndf, undf, map, basis) + + import :: i_def, r_def + implicit none - integer(kind=i_def), intent(in) :: nlayers, ndf, ndf_chi, ndf_pid - integer(kind=i_def), intent(in) :: undf, undf_chi, undf_pid - integer(kind=i_def), dimension(ndf), intent(in) :: map - integer(kind=i_def), dimension(ndf_chi), intent(in) :: map_chi - integer(kind=i_def), dimension(ndf_pid), intent(in) :: map_pid - real(kind=r_def), intent(in), dimension(ndf, ndf_chi) :: basis - real(kind=r_def), dimension(undf_chi), intent(inout) :: chi_1, chi_2, chi_3 - real(kind=r_def), dimension(undf_pid), intent(in) :: panel_id - real(kind=r_def), dimension(undf), intent(in) :: surface_altitude - real(kind=r_def), intent(in) :: domain_surface, domain_height + + integer(kind=i_def), intent(in) :: nlayers, undf_chi, undf_pid, undf + integer(kind=i_def), intent(in) :: ndf_chi, ndf_pid, ndf + integer(kind=i_def), intent(in) :: map_chi(ndf_chi), map_pid(ndf_pid) + integer(kind=i_def), intent(in) :: map(ndf) + real(kind=r_def), intent(in) :: basis(ndf,ndf_chi) + real(kind=r_def), intent(in) :: domain_surface, domain_height + real(kind=r_def), intent(in) :: surface_altitude(undf) + real(kind=r_def), intent(in) :: chi_1_in(undf_chi) + real(kind=r_def), intent(in) :: chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi) + real(kind=r_def), intent(inout) :: chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) + real(kind=r_def), intent(in) :: panel_id(undf_pid) + end subroutine ancil_orography_interface end interface @@ -120,73 +136,65 @@ end subroutine ancil_orography_interface !> routines calculate analytic orography from horizontal coordinates or else !> use the surface_altitude field and then update the vertical coordinate. !> - !> @param[in,out] chi_inventory Contains all of the model's coordinate - !! fields, itemised by mesh - !> @param[in] panel_id_inventory Contains all of the model's panel ID - !! fields, itemised by mesh - !> @param[in] mesh Mesh to apply orography to - !> @param[in] surface_altitude Field containing the surface altitude + !> @param[in,out] chi_inventory Contains all of the model's coordinate + !! fields, itemised by mesh + !> @param[in] panel_id_inventory Contains all of the model's panel ID + !! fields, itemised by mesh + !> @param[in] mesh Mesh to apply orography to + !> @param[in] surface_altitude_w0 Field containing the surface altitude !============================================================================= - subroutine assign_orography_field(chi_inventory, panel_id_inventory, & - mesh, surface_altitude) + subroutine assign_orography_field(chi_inventory, panel_id_inventory, & + mesh, surface_altitude_w0) use inventory_by_mesh_mod, only : inventory_by_mesh_type use field_mod, only : field_type, field_proxy_type use mesh_mod, only : mesh_type use domain_mod, only : domain_type use orography_helper_functions_mod, only : set_horizontal_domain_size - use function_space_collection_mod, only : function_space_collection - use orography_config_mod, only : orog_init_option, & - orog_init_option_ancil, & + use orography_config_mod, only : orog_init_option, & + orog_init_option_ancil, & orog_init_option_start_dump use sci_field_minmax_alg_mod, only : log_field_minmax implicit none ! Arguments - type( inventory_by_mesh_type ), intent( inout ) :: chi_inventory - type( inventory_by_mesh_type ), intent( in ) :: panel_id_inventory - type( mesh_type ), intent( in ), pointer :: mesh + type(inventory_by_mesh_type), intent(inout) :: chi_inventory + type(inventory_by_mesh_type), intent(in) :: panel_id_inventory + type(mesh_type), pointer, intent(in) :: mesh ! We keep the surface_altitude as an optional argument since it is ! not needed for miniapps that only want analytic orography - type( field_type ), intent( in ), optional :: surface_altitude + type(field_type), optional, intent(in) :: surface_altitude_w0 ! Local variables - type( field_type ), pointer :: chi(:) => null() - type( field_type ), pointer :: panel_id => null() - type( field_proxy_type ) :: chi_proxy(3) - type( field_proxy_type ) :: panel_id_proxy - type( domain_type ) :: domain + type(field_type), pointer :: chi(:) + type(field_type), pointer :: panel_id + type(field_type) :: chi_in(3) + type(field_proxy_type) :: chi_proxy(3) + type(field_proxy_type) :: chi_in_proxy(3) + type(field_proxy_type) :: panel_id_proxy + type(domain_type) :: domain real(kind=r_def) :: domain_height, domain_surface integer(kind=i_def) :: cell integer(kind=i_def) :: undf_chi, ndf_chi, nlayers integer(kind=i_def) :: undf_pid, ndf_pid integer(kind=i_def) :: undf_sf, ndf_sf - integer(kind=i_def), pointer :: map_chi(:,:) => null() - integer(kind=i_def), pointer :: map_pid(:,:) => null() - integer(kind=i_def), pointer :: map_sf(:,:) => null() + integer(kind=i_def), pointer :: map_chi(:,:) + integer(kind=i_def), pointer :: map_pid(:,:) + integer(kind=i_def), pointer :: map_sf(:,:) - integer(kind=i_def) :: surface_order_h, surface_order_v - type( mesh_type ), pointer :: sf_mesh - type( field_type ) :: surface_altitude_w0 - type( field_proxy_type ) :: sfc_alt_proxy + type(field_proxy_type) :: sfc_alt_proxy - real(kind=r_def), pointer :: nodes(:,:) => null() - integer(kind=i_def) :: dim_sf, df, df_sf + real(kind=r_def), pointer :: nodes(:,:) + integer(kind=i_def) :: dim_sf, df, df_sf, depth ! Procedure pointer procedure(analytic_orography_interface), pointer :: analytic_orography => null() - procedure(ancil_orography_interface), pointer :: ancil_orography => null() + procedure(ancil_orography_interface), pointer :: ancil_orography => null() real(kind=r_def), allocatable :: basis_sf_on_chi(:,:,:) - if (coord_order == 0 .and. orog_init_option/=orog_init_option_none) then - call log_event( "assign_orography_field: "// & - "Orography assignment is currently only available with coord_order > 0.", & - LOG_LEVEL_ERROR ) - end if - call chi_inventory%get_field_array(mesh, chi) call panel_id_inventory%get_field(mesh, panel_id) @@ -200,19 +208,21 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & ! Get domain top from the mesh object and domain_surface domain_height = mesh%get_domain_top() + domain_surface - if (orog_init_option==orog_init_option_none) then + select case (orog_init_option) + case (orog_init_option_none) - call log_event( "assign_orography_field: "// & - "Flat surface requested.", LOG_LEVEL_INFO ) + call log_event( & + "assign_orography_field: Flat surface requested.", LOG_LEVEL_INFO & + ) - else if (orog_init_option==orog_init_option_analytic) then + case (orog_init_option_analytic) call log_event( "assign_orography_field: "// & "Assigning analytic orography.", LOG_LEVEL_INFO ) ! Point to appropriate procedure to assign orography - if ( geometry == geometry_spherical ) then - if ( coord_system == coord_system_xyz ) then + if (geometry == geometry_spherical) then + if (coord_system == coord_system_xyz) then analytic_orography => analytic_orography_spherical_xyz else analytic_orography => analytic_orography_spherical_native @@ -221,12 +231,20 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & analytic_orography => analytic_orography_cartesian end if + ! Copy chi to chi_in, to allow adjustment of continuous chi fields + call chi(1)%copy_field_serial(chi_in(1)) + call chi(2)%copy_field_serial(chi_in(2)) + call chi(3)%copy_field_serial(chi_in(3)) + ! Break encapsulation and get the proxy - chi_proxy(1) = chi(1)%get_proxy() - chi_proxy(2) = chi(2)%get_proxy() - chi_proxy(3) = chi(3)%get_proxy() - undf_chi = chi_proxy(1)%vspace%get_undf() - ndf_chi = chi_proxy(1)%vspace%get_ndf() + chi_proxy(1) = chi(1)%get_proxy() + chi_proxy(2) = chi(2)%get_proxy() + chi_proxy(3) = chi(3)%get_proxy() + chi_in_proxy(1) = chi_in(1)%get_proxy() + chi_in_proxy(2) = chi_in(2)%get_proxy() + chi_in_proxy(3) = chi_in(3)%get_proxy() + undf_chi = chi_proxy(1)%vspace%get_undf() + ndf_chi = chi_proxy(1)%vspace%get_ndf() panel_id_proxy = panel_id%get_proxy() undf_pid = panel_id_proxy%vspace%get_undf() ndf_pid = panel_id_proxy%vspace%get_ndf() @@ -236,33 +254,26 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & map_pid => panel_id_proxy%vspace%get_whole_dofmap() ! Call column procedure - do cell = 1,chi_proxy(1)%vspace%get_ncell() - - call analytic_orography(nlayers, & - ndf_chi, & - undf_chi, & - map_chi(:,cell), & - ndf_pid, & - undf_pid, & - map_pid(:,cell), & - domain_surface, & - domain_height, & - chi_proxy(1)%data, & - chi_proxy(2)%data, & - chi_proxy(3)%data, & - panel_id_proxy%data ) + do cell = 1, chi_proxy(1)%vspace%get_ncell() + call analytic_orography( & + nlayers, ndf_chi, undf_chi, map_chi(:,cell), & + ndf_pid, undf_pid, map_pid(:,cell), & + domain_surface, domain_height, & + chi_in_proxy(1)%data, chi_in_proxy(2)%data, & + chi_in_proxy(3)%data, & + chi_proxy(1)%data, chi_proxy(2)%data, chi_proxy(3)%data, & + panel_id_proxy%data & + ) end do - - else if (orog_init_option==orog_init_option_ancil .or. & - orog_init_option==orog_init_option_start_dump) then + case (orog_init_option_ancil, orog_init_option_start_dump) call log_event( "assign_orography_field: "// & "Assigning orography from surface_altitude field.", LOG_LEVEL_INFO ) ! Point to appropriate procedure to assign orography - if ( geometry == geometry_spherical ) then - if ( coord_system == coord_system_xyz ) then + if (geometry == geometry_spherical) then + if (coord_system == coord_system_xyz) then ancil_orography => ancil_orography_spherical_xyz else ancil_orography => ancil_orography_spherical_sph @@ -271,34 +282,18 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & ancil_orography => ancil_orography_cartesian end if - if ( present(surface_altitude) ) then - - ! Set up the surface altitude field on W0 points - sf_mesh => surface_altitude%get_mesh() - surface_order_h = surface_altitude%get_element_order_h() - surface_order_v = surface_altitude%get_element_order_v() - call surface_altitude_w0%initialise( vector_space = & - function_space_collection%get_fs(sf_mesh, surface_order_h, & - surface_order_v, W0), & - halo_depth = sf_mesh%get_halo_depth() ) - - if (surface_altitude%which_function_space()==W0) then - call surface_altitude%copy_field_serial(surface_altitude_w0) - else - call surface_altitude_alg( surface_altitude_w0, surface_altitude ) - end if - - call log_field_minmax( LOG_LEVEL_INFO, 'srf_alt', surface_altitude ) - call log_field_minmax( LOG_LEVEL_INFO, 'srf_alt_w0', & - surface_altitude_w0 ) - - nullify ( sf_mesh ) - end if + ! Copy chi to chi_in, to allow adjustment of continuous chi fields + call chi(1)%copy_field_serial(chi_in(1)) + call chi(2)%copy_field_serial(chi_in(2)) + call chi(3)%copy_field_serial(chi_in(3)) ! Break encapsulation and get the proxy chi_proxy(1) = chi(1)%get_proxy() chi_proxy(2) = chi(2)%get_proxy() chi_proxy(3) = chi(3)%get_proxy() + chi_in_proxy(1) = chi_in(1)%get_proxy() + chi_in_proxy(2) = chi_in(2)%get_proxy() + chi_in_proxy(3) = chi_in(3)%get_proxy() panel_id_proxy = panel_id%get_proxy() sfc_alt_proxy = surface_altitude_w0%get_proxy() @@ -328,33 +323,27 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & end do ! Ensure halo is clean - call sfc_alt_proxy%halo_exchange( & - depth=sfc_alt_proxy%get_field_proxy_halo_depth()) + depth = sfc_alt_proxy%get_field_proxy_halo_depth() + if (sfc_alt_proxy%is_dirty(depth=depth)) then + call sfc_alt_proxy%halo_exchange(depth=depth) + end if ! Call column procedure - do cell = 1,chi_proxy(1)%vspace%get_ncell() - - call ancil_orography(nlayers, & - chi_proxy(1)%data, & - chi_proxy(2)%data, & - chi_proxy(3)%data, & - panel_id_proxy%data, & - sfc_alt_proxy%data, & - domain_surface, domain_height, & - ndf_chi, undf_chi, & - map_chi(:,cell), & - ndf_pid, undf_pid, & - map_pid(:,cell), & - ndf_sf, undf_sf, & - map_sf(:,cell), & - basis_sf_on_chi) + do cell = 1, chi_proxy(1)%vspace%get_ncell() + call ancil_orography( & + nlayers, chi_proxy(1)%data, chi_proxy(2)%data, chi_proxy(3)%data, & + chi_in_proxy(1)%data, chi_in_proxy(2)%data, chi_in_proxy(3)%data, & + panel_id_proxy%data, sfc_alt_proxy%data, & + domain_surface, domain_height, & + ndf_chi, undf_chi, map_chi(:,cell), & + ndf_pid, undf_pid, map_pid(:,cell), & + ndf_sf, undf_sf, map_sf(:,cell), basis_sf_on_chi & + ) end do deallocate(basis_sf_on_chi) - end if - - nullify(chi, panel_id) + end select end subroutine assign_orography_field @@ -371,22 +360,27 @@ end subroutine assign_orography_field !> (x,y,z) form. !> !> @param[in] nlayers Number of vertical layers - !> @param[in] ndf_chi Array size and loop bound for map_chi - !> @param[in] undf_chi Column coordinates' array size and loop bound + !> @param[in] ndf_chi Num DoFs per cell for map_chi + !> @param[in] undf_chi Column coordinates' num DoFs this partition !> @param[in] map_chi Indirection map for coordinate field - !> @param[in] ndf_pid Array size and loop bound for map_pid - !> @param[in] undf_pid Panel ID array size and loop bound + !> @param[in] ndf_pid Num DoFs per cell for map_pid + !> @param[in] undf_pid Panel ID num DoFs this partition !> @param[in] map_pid Indirection map for panel_id !> @param[in] domain_surface Physical height of flat domain surface (m) - !> @param[in] domain_height Physical height of domain top (m) - !> @param[in,out] chi_1 1st coordinate field in Wchi - !> @param[in,out] chi_2 2nd coordinate field in Wchi - !> @param[in,out] chi_3 3rd coordinate field in Wchi + !> @param[in] domain_height Physical height of domain top (m) + !> @param[in] chi_1_in 1st coordinate field in Wchi (input) + !> @param[in] chi_2_in 2nd coordinate field in Wchi (input) + !> @param[in] chi_3_in 3rd coordinate field in Wchi (input) + !> @param[in,out] chi_1 1st coordinate field in Wchi (output) + !> @param[in,out] chi_2 2nd coordinate field in Wchi (output) + !> @param[in,out] chi_3 3rd coordinate field in Wchi (output) !> @param[in] panel_id Field giving the ID for mesh panels !============================================================================= - subroutine analytic_orography_spherical_xyz(nlayers, ndf_chi, undf_chi, map_chi, & - ndf_pid, undf_pid, map_pid, & - domain_surface, domain_height, & + subroutine analytic_orography_spherical_xyz(nlayers, & + ndf_chi, undf_chi, map_chi, & + ndf_pid, undf_pid, map_pid, & + domain_surface, domain_height, & + chi_1_in, chi_2_in, chi_3_in, & chi_1, chi_2, chi_3, panel_id) implicit none @@ -397,7 +391,10 @@ subroutine analytic_orography_spherical_xyz(nlayers, ndf_chi, undf_chi, map_chi, integer(kind=i_def), intent(in) :: map_chi(ndf_chi) integer(kind=i_def), intent(in) :: map_pid(ndf_pid) real(kind=r_def), intent(in) :: domain_surface, domain_height - real(kind=r_def), intent(inout) :: chi_1(undf_chi), chi_2(undf_chi), chi_3(undf_chi) + real(kind=r_def), intent(in) :: chi_1_in(undf_chi), chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi), chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) real(kind=r_def), intent(in) :: panel_id(undf_pid) ! Internal variables integer(kind=i_def) :: k, df, dfk @@ -413,9 +410,12 @@ subroutine analytic_orography_spherical_xyz(nlayers, ndf_chi, undf_chi, map_chi, do k = 0, nlayers-1 dfk = map_chi(df)+k - ! Model coordinates for spherical domain are in (x,y,z) form so they need - ! to be converted to (long,lat,r) first - call xyz2llr(chi_1(dfk), chi_2(dfk), chi_3(dfk), longitude, latitude, r) + ! Model coordinates for spherical domain are in (x,y,z) form so they + ! need to be converted to (long,lat,r) first + call xyz2llr( & + chi_1_in(dfk), chi_2_in(dfk), chi_3_in(dfk), & + longitude, latitude, r & + ) ! Calculate surface height for each DoF using selected analytic orography surface_height = orography_profile%analytic_orography(longitude, latitude) @@ -426,16 +426,21 @@ subroutine analytic_orography_spherical_xyz(nlayers, ndf_chi, undf_chi, map_chi, select case(stretching_method) case(stretching_method_linear) - chi_3_r = eta2z_linear(eta, domain_surface + surface_height, domain_height) + chi_3_r = eta2z_linear( & + eta, domain_surface + surface_height, domain_height & + ) case default - chi_3_r = domain_surface + & - eta2z_smooth(eta, surface_height, domain_depth, stretching_height) + chi_3_r = ( & + domain_surface + eta2z_smooth( & + eta, surface_height, domain_depth, stretching_height & + ) & + ) end select ! Convert spherical coordinates back to model (x,y,z) form - call llr2xyz(longitude, latitude, chi_3_r, & - chi_1(dfk), chi_2(dfk), chi_3(dfk)) - + call llr2xyz( & + longitude, latitude, chi_3_r, chi_1(dfk), chi_2(dfk), chi_3(dfk) & + ) end do end do @@ -450,31 +455,29 @@ end subroutine analytic_orography_spherical_xyz !> cubed sphere (alpha,beta,r) or (lon,lat,r) coordinates. !> !> @param[in] nlayers Number of vertical layers - !> @param[in] ndf_chi Array size and loop bound for map_chi - !> @param[in] undf_chi Column coordinates' array size and loop bound + !> @param[in] ndf_chi Num DoFs per cell for map_chi + !> @param[in] undf_chi Column coordinates' num DoFs this partition !> @param[in] map_chi Indirection map for coordinate field - !> @param[in] ndf_pid Array size and loop bound for map_pid - !> @param[in] undf_pid Panel ID array size and loop bound - !> @param[in] map_pid Indirection map for panel_id + !> @param[in] ndf_pid Num DoFs per cell for map_pid + !> @param[in] undf_pid Panel ID num DoFs this partition + !> @param[in] map_pid Indirection map for panel_id !> @param[in] domain_surface Physical height of flat domain surface (m) - !> @param[in] domain_height Physical height of domain top (m) - !> @param[in,out] chi_1 1st coordinate field in Wchi - !> @param[in,out] chi_2 2nd coordinate field in Wchi - !> @param[in,out] chi_3 3rd coordinate field in Wchi + !> @param[in] domain_height Physical height of domain top (m) + !> @param[in] chi_1_in 1st coordinate field in Wchi (input) + !> @param[in] chi_2_in 2nd coordinate field in Wchi (input) + !> @param[in] chi_3_in 3rd coordinate field in Wchi (input) + !> @param[in,out] chi_1 1st coordinate field in Wchi (output) + !> @param[in,out] chi_2 2nd coordinate field in Wchi (output) + !> @param[in,out] chi_3 3rd coordinate field in Wchi (output) !> @param[in] panel_id Field giving the ID for mesh panels !============================================================================= - subroutine analytic_orography_spherical_native(nlayers, & - ndf_chi, & - undf_chi, & - map_chi, & - ndf_pid, & - undf_pid, & - map_pid, & - domain_surface, & - domain_height, & - chi_1, & - chi_2, & - chi_3, & + subroutine analytic_orography_spherical_native(nlayers, & + ndf_chi, undf_chi, map_chi, & + ndf_pid, undf_pid, map_pid, & + domain_surface, & + domain_height, & + chi_1_in, chi_2_in, chi_3_in, & + chi_1, chi_2, chi_3, & panel_id) implicit none @@ -485,7 +488,10 @@ subroutine analytic_orography_spherical_native(nlayers, & integer(kind=i_def), intent(in) :: map_chi(ndf_chi) integer(kind=i_def), intent(in) :: map_pid(ndf_pid) real(kind=r_def), intent(in) :: domain_surface, domain_height - real(kind=r_def), intent(inout) :: chi_1(undf_chi), chi_2(undf_chi), chi_3(undf_chi) + real(kind=r_def), intent(in) :: chi_1_in(undf_chi), chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi), chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) real(kind=r_def), intent(in) :: panel_id(undf_pid) ! Internal variables integer(kind=i_def) :: k, df, dfk, ipanel @@ -504,22 +510,26 @@ subroutine analytic_orography_spherical_native(nlayers, & ! Model coordinates need to be converted to (long,lat,r) for reading ! analytic orography - radius = chi_3(dfk) + domain_surface - call chi2llr(chi_1(dfk), chi_2(dfk), radius, & - ipanel, longitude, latitude, dummy_radius) + radius = chi_3_in(dfk) + domain_surface + call chi2llr( & + chi_1_in(dfk), chi_2_in(dfk), radius, ipanel, & + longitude, latitude, dummy_radius & + ) ! Calculate surface height for each DoF using selected analytic orography surface_height = orography_profile%analytic_orography(longitude, latitude) ! Calculate nondimensional coordinate from current height coordinate ! (chi_3) with flat domain_surface - eta = z2eta_linear(chi_3(dfk), 0.0_r_def, domain_depth) + eta = z2eta_linear(chi_3_in(dfk), 0.0_r_def, domain_depth) select case(stretching_method) case(stretching_method_linear) chi_3(dfk) = eta2z_linear(eta, surface_height, domain_depth) case default - chi_3(dfk) = eta2z_smooth(eta, surface_height, domain_depth, stretching_height) + chi_3(dfk) = eta2z_smooth( & + eta, surface_height, domain_depth, stretching_height & + ) end select end do @@ -537,23 +547,30 @@ end subroutine analytic_orography_spherical_native !> coordinate. !> !> @param[in] nlayers Number of vertical layers - !> @param[in] ndf_chi Array size and loop bound for map_chi - !> @param[in] undf_chi Column coordinates' array size and loop bound + !> @param[in] ndf_chi Num DoFs per cell for map_chi + !> @param[in] undf_chi Column coordinates' num DoFs this partition !> @param[in] map_chi Indirection map for coordinate field - !> @param[in] ndf_pid Array size and loop bound for map_pid - !> @param[in] undf_pid Panel ID array size and loop bound + !> @param[in] ndf_pid Num DoFs per cell for map_pid + !> @param[in] undf_pid Panel ID num DoFs this partition !> @param[in] map_pid Indirection map for panel_id !> @param[in] domain_surface Physical height of flat domain surface (m) - !> @param[in] domain_height Physical height of domain top (m) - !> @param[in,out] chi_1 1st coordinate field in Wchi - !> @param[in,out] chi_2 2nd coordinate field in Wchi - !> @param[in,out] chi_3 3rd coordinate field in Wchi + !> @param[in] domain_height Physical height of domain top (m) + !> @param[in] chi_1_in 1st coordinate field in Wchi (input) + !> @param[in] chi_2_in 2nd coordinate field in Wchi (input) + !> @param[in] chi_3_in 3rd coordinate field in Wchi (input) + !> @param[in,out] chi_1 1st coordinate field in Wchi (output) + !> @param[in,out] chi_2 2nd coordinate field in Wchi (output) + !> @param[in,out] chi_3 3rd coordinate field in Wchi (output) !> @param[in] panel_id Field giving the ID for mesh panels !============================================================================= - subroutine analytic_orography_cartesian(nlayers, ndf_chi, undf_chi, map_chi, & + subroutine analytic_orography_cartesian(nlayers, & + ndf_chi, undf_chi, map_chi, & ndf_pid, undf_pid, map_pid, & - domain_surface, domain_height, & - chi_1, chi_2, chi_3, panel_id) + domain_surface, & + domain_height, & + chi_1_in, chi_2_in, chi_3_in, & + chi_1, chi_2, chi_3, & + panel_id) implicit none @@ -563,7 +580,10 @@ subroutine analytic_orography_cartesian(nlayers, ndf_chi, undf_chi, map_chi, & integer(kind=i_def), intent(in) :: map_chi(ndf_chi) integer(kind=i_def), intent(in) :: map_pid(ndf_pid) real(kind=r_def), intent(in) :: domain_surface, domain_height - real(kind=r_def), intent(inout) :: chi_1(undf_chi), chi_2(undf_chi), chi_3(undf_chi) + real(kind=r_def), intent(in) :: chi_1_in(undf_chi), chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi), chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) real(kind=r_def), intent(in) :: panel_id(undf_pid) ! Internal variables @@ -578,19 +598,24 @@ subroutine analytic_orography_cartesian(nlayers, ndf_chi, undf_chi, map_chi, & do k = 0, nlayers-1 dfk = map_chi(df)+k - ! Calculate surface height for each DoF using selected analytic orography - surface_height = orography_profile%analytic_orography(chi_1(dfk), chi_2(dfk)) + ! Calculate surf height for each DoF using selected analytic orography + surface_height = orography_profile%analytic_orography( & + chi_1_in(dfk), chi_2_in(dfk) & + ) ! Calculate nondimensional coordinate from current height coordinate ! (chi_3) with flat domain_surface - eta = z2eta_linear(chi_3(dfk), domain_surface, domain_height) + eta = z2eta_linear(chi_3_in(dfk), domain_surface, domain_height) select case(stretching_method) case(stretching_method_linear) - chi_3(dfk) = eta2z_linear(eta, domain_surface + surface_height, domain_height) + chi_3(dfk) = eta2z_linear( & + eta, domain_surface + surface_height, domain_height & + ) case default - chi_3(dfk) = domain_surface + & - eta2z_smooth(eta, surface_height, domain_depth, stretching_height) + chi_3(dfk) = domain_surface + eta2z_smooth( & + eta, surface_height, domain_depth, stretching_height & + ) end select end do end do @@ -599,61 +624,62 @@ subroutine analytic_orography_cartesian(nlayers, ndf_chi, undf_chi, map_chi, & end subroutine analytic_orography_cartesian !============================================================================= - !> @brief Modify vertical coordinate based on the input surface_altitude field. - !> For spherical geometries with a Cartesian coordinate system. - !> Note that this routine assumes the chi coordinates in a column are - !> associated with a flat domain on input and then modified on output. - !> Therefore it will not operate correctly with a horizontally continuous chi - !> field. - !> - !> @param[in] nlayers Number of vertical layers - !> @param[in,out] chi_1 1st coordinate field in Wchi - !> @param[in,out] chi_2 2nd coordinate field in Wchi - !> @param[in,out] chi_3 3rd coordinate field in Wchi - !> @param[in] panel_id Field giving the ID for mesh panels + !> @brief Modify vertical coordinate based on input surface_altitude field. + !! For spherical geometries with a Cartesian coordinate system. + !> @param[in] nlayers Number of vertical layers + !> @param[in,out] chi_1 1st coordinate field in Wchi (output) + !> @param[in,out] chi_2 2nd coordinate field in Wchi (output) + !> @param[in,out] chi_3 3rd coordinate field in Wchi (output)# + !> @param[in] chi_1_in 1st coordinate field in Wchi (input) + !> @param[in] chi_2_in 2nd coordinate field in Wchi (input) + !> @param[in] chi_3_in 3rd coordinate field in Wchi (input) + !> @param[in] panel_id Field giving the ID for mesh panels !> @param[in] surface_altitude Surface altitude field data - !> @param[in] domain_surface Physical height of flat domain surface (m) - !> @param[in] domain_height Physical height of domain top (m) - !> @param[in] ndf_chi Array size and loop bound for map_chi - !> @param[in] undf_chi Column coordinates' array size and loop bound - !> @param[in] map_chi Indirection map for coordinate field - !> @param[in] ndf_pid Array size and loop bound for map_pid - !> @param[in] undf_pid Panel ID array size and loop bound - !> @param[in] map_pid Indirection map for pid - !> @param[in] ndf Array size and loop bound for surface altitude field - !> @param[in] undf Total number of dofs for surface altitude field - !> @param[in] map Indirection map for surface altitude field - !> @param[in] basis Basis functions for surface altitude field + !> @param[in] domain_surface Physical height of flat domain surface (m) + !> @param[in] domain_height Physical height of domain top (m) + !> @param[in] ndf_chi Num DoFs per cell for map_chi + !> @param[in] undf_chi Column coords' num DoFs this partition + !> @param[in] map_chi Indirection map for coordinate field + !> @param[in] ndf_pid Num DoFs per cell for map_pid + !> @param[in] undf_pid Panel ID num DoFs this partition + !> @param[in] map_pid Indirection map for pid + !> @param[in] ndf Num DoFs per cell for surface altitude + !> @param[in] undf Num DoFs this partition for surf altitude + !> @param[in] map Indirection map for surface altitude + !> @param[in] basis Basis functions for surface altitude !============================================================================= - subroutine ancil_orography_spherical_xyz(nlayers, & - chi_1, chi_2, chi_3, & - panel_id, & - surface_altitude, & - domain_surface, domain_height, & - ndf_chi, undf_chi, & - map_chi, & - ndf_pid, undf_pid, & - map_pid, & - ndf, undf, & - map, basis & + subroutine ancil_orography_spherical_xyz(nlayers, & + chi_1, chi_2, chi_3, & + chi_1_in, chi_2_in, chi_3_in, & + panel_id, & + surface_altitude, & + domain_surface, domain_height, & + ndf_chi, undf_chi, & + map_chi, & + ndf_pid, undf_pid, & + map_pid, & + ndf, undf, & + map, basis & ) implicit none ! Arguments - integer(kind=i_def), intent(in) :: nlayers, ndf, ndf_chi, ndf_pid - integer(kind=i_def), intent(in) :: undf, undf_chi, undf_pid - - integer(kind=i_def), dimension(ndf), intent(in) :: map - integer(kind=i_def), dimension(ndf_chi), intent(in) :: map_chi - integer(kind=i_def), dimension(ndf_pid), intent(in) :: map_pid - - real(kind=r_def), intent(in), dimension(ndf, ndf_chi) :: basis - - real(kind=r_def), dimension(undf_chi), intent(inout) :: chi_1, chi_2, chi_3 - real(kind=r_def), dimension(undf_pid), intent(in) :: panel_id - real(kind=r_def), dimension(undf), intent(in) :: surface_altitude - real(kind=r_def), intent(in) :: domain_surface, domain_height + integer(kind=i_def), intent(in) :: nlayers, ndf, ndf_chi, ndf_pid + integer(kind=i_def), intent(in) :: undf, undf_chi, undf_pid + integer(kind=i_def), intent(in) :: map(ndf) + integer(kind=i_def), intent(in) :: map_chi(ndf_chi) + integer(kind=i_def), intent(in) :: map_pid(ndf_pid) + real(kind=r_def), intent(in) :: basis(ndf, ndf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi) + real(kind=r_def), intent(inout) :: chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) + real(kind=r_def), intent(in) :: chi_1_in(undf_chi) + real(kind=r_def), intent(in) :: chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(in) :: panel_id(undf_pid) + real(kind=r_def), intent(in) :: surface_altitude(undf) + real(kind=r_def), intent(in) :: domain_surface, domain_height ! Internal variables integer(kind=i_def) :: k, df, dfchi, dfk @@ -667,7 +693,8 @@ subroutine ancil_orography_spherical_xyz(nlayers, & surface_height(:) = 0.0_r_def do dfchi = 1, ndf_chi do df = 1, ndf - surface_height(dfchi) = surface_height(dfchi) + surface_altitude(map(df))*basis(df,dfchi) + surface_height(dfchi) = surface_height(dfchi) & + + surface_altitude(map(df))*basis(df, dfchi) end do end do @@ -678,7 +705,9 @@ subroutine ancil_orography_spherical_xyz(nlayers, & ! Model coordinates for spherical domain are in (x,y,z) form so they need ! to be converted to (long,lat,r) first - call xyz2llr(chi_1(dfk), chi_2(dfk), chi_3(dfk), longitude, latitude, r) + call xyz2llr( & + chi_1_in(dfk), chi_2_in(dfk), chi_3_in(dfk), longitude, latitude, r & + ) ! Calculate nondimensional coordinate from current flat height coordinate ! (chi_3) with flat domain_surface @@ -688,77 +717,82 @@ subroutine ancil_orography_spherical_xyz(nlayers, & ! nondimensional coordinate eta and surface_height select case(stretching_method) case(stretching_method_linear) - chi_3_r = eta2z_linear(eta, domain_surface+surface_height(df), domain_height) + chi_3_r = eta2z_linear( & + eta, domain_surface+surface_height(df), domain_height & + ) case default - chi_3_r = domain_surface + & - eta2z_smooth(eta, surface_height(df), domain_depth, stretching_height) + chi_3_r = domain_surface + eta2z_smooth( & + eta, surface_height(df), domain_depth, stretching_height & + ) end select ! Convert spherical coordinates back to model (x,y,z) form - call llr2xyz(longitude, latitude, chi_3_r, & - chi_1(dfk), chi_2(dfk), chi_3(dfk)) + call llr2xyz( & + longitude, latitude, chi_3_r, chi_1(dfk), chi_2(dfk), chi_3(dfk) & + ) end do end do end subroutine ancil_orography_spherical_xyz !============================================================================= - !> @brief Modify vertical coordinate based on the input surface_altitude field. - !> For spherical geometries with (alpha,beta,r) or (lon,lat,r) - !> coordinate systems. - !> Note that this routine assumes the chi coordinates in a column are - !> associated with a flat domain on input and then modified on output. - !> Therefore it will not operate correctly with a horizontally continuous chi - !> field. - !> - !> @param[in] nlayers Number of vertical layers - !> @param[in,out] chi_1 1st coordinate field in Wchi - !> @param[in,out] chi_2 2nd coordinate field in Wchi - !> @param[in,out] chi_3 3rd coordinate field in Wchi - !> @param[in] panel_id Field giving the ID for mesh panels + !> @brief Modify vertical coordinate based on input surface_altitude field. + !! For spherical geometries with (alpha,beta,r) or (lon,lat,r) + !! coordinate systems. + !> @param[in] nlayers Number of vertical layers + !> @param[in,out] chi_1 1st coordinate field in Wchi (output) + !> @param[in,out] chi_2 2nd coordinate field in Wchi (output) + !> @param[in,out] chi_3 3rd coordinate field in Wchi (output)# + !> @param[in] chi_1_in 1st coordinate field in Wchi (input) + !> @param[in] chi_2_in 2nd coordinate field in Wchi (input) + !> @param[in] chi_3_in 3rd coordinate field in Wchi (input) + !> @param[in] panel_id Field giving the ID for mesh panels !> @param[in] surface_altitude Surface altitude field data - !> @param[in] domain_surface Physical height of flat domain surface (m) - !> @param[in] domain_height Physical height of domain top (m) - !> @param[in] ndf_chi Array size and loop bound for map_chi - !> @param[in] undf_chi Column coordinates' array size and loop bound - !> @param[in] map_chi Indirection map for coordinate field - !> @param[in] ndf_pid Array size and loop bound for map_pid - !> @param[in] undf_pid Panel ID array size and loop bound - !> @param[in] map_pid Indirection map for panel ID - !> @param[in] ndf Array size and loop bound for surface altitude field - !> @param[in] undf Total number of dofs for surface altitude field - !> @param[in] map Indirection map for surface altitude field - !> @param[in] basis Basis functions for surface altitude field + !> @param[in] domain_surface Physical height of flat domain surface (m) + !> @param[in] domain_height Physical height of domain top (m) + !> @param[in] ndf_chi Num DoFs per cell for map_chi + !> @param[in] undf_chi Column coords' num DoFs this partition + !> @param[in] map_chi Indirection map for coordinate field + !> @param[in] ndf_pid Num DoFs per cell for map_pid + !> @param[in] undf_pid Panel ID num DoFs this partition + !> @param[in] map_pid Indirection map for pid + !> @param[in] ndf Num DoFs per cell for surface altitude + !> @param[in] undf Num DoFs this partition for surf altitude + !> @param[in] map Indirection map for surface altitude + !> @param[in] basis Basis functions for surface altitude !============================================================================= - subroutine ancil_orography_spherical_sph(nlayers, & - chi_1, chi_2, chi_3, & - panel_id, & - surface_altitude, & - domain_surface, domain_height, & - ndf_chi, undf_chi, & - map_chi, & - ndf_pid, undf_pid, & - map_pid, & - ndf, undf, & - map, basis & + subroutine ancil_orography_spherical_sph(nlayers, & + chi_1, chi_2, chi_3, & + chi_1_in, chi_2_in, chi_3_in, & + panel_id, & + surface_altitude, & + domain_surface, domain_height, & + ndf_chi, undf_chi, & + map_chi, & + ndf_pid, undf_pid, & + map_pid, & + ndf, undf, & + map, basis & ) implicit none ! Arguments - integer(kind=i_def), intent(in) :: nlayers, ndf, ndf_chi, ndf_pid - integer(kind=i_def), intent(in) :: undf, undf_chi, undf_pid - - integer(kind=i_def), dimension(ndf), intent(in) :: map - integer(kind=i_def), dimension(ndf_chi), intent(in) :: map_chi - integer(kind=i_def), dimension(ndf_pid), intent(in) :: map_pid - - real(kind=r_def), intent(in), dimension(ndf, ndf_chi) :: basis - - real(kind=r_def), dimension(undf_chi), intent(inout) :: chi_1, chi_2, chi_3 - real(kind=r_def), dimension(undf_pid), intent(in) :: panel_id - real(kind=r_def), dimension(undf), intent(in) :: surface_altitude - real(kind=r_def), intent(in) :: domain_surface, domain_height + integer(kind=i_def), intent(in) :: nlayers, ndf, ndf_chi, ndf_pid + integer(kind=i_def), intent(in) :: undf, undf_chi, undf_pid + integer(kind=i_def), intent(in) :: map(ndf) + integer(kind=i_def), intent(in) :: map_chi(ndf_chi) + integer(kind=i_def), intent(in) :: map_pid(ndf_pid) + real(kind=r_def), intent(in) :: basis(ndf, ndf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi) + real(kind=r_def), intent(inout) :: chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) + real(kind=r_def), intent(in) :: chi_1_in(undf_chi) + real(kind=r_def), intent(in) :: chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(in) :: panel_id(undf_pid) + real(kind=r_def), intent(in) :: surface_altitude(undf) + real(kind=r_def), intent(in) :: domain_surface, domain_height ! Internal variables integer(kind=i_def) :: k, df, dfchi, dfk @@ -771,7 +805,8 @@ subroutine ancil_orography_spherical_sph(nlayers, & surface_height(:) = 0.0_r_def do dfchi = 1, ndf_chi do df = 1, ndf - surface_height(dfchi) = surface_height(dfchi) + surface_altitude(map(df))*basis(df,dfchi) + surface_height(dfchi) = surface_height(dfchi) & + + surface_altitude(map(df))*basis(df,dfchi) end do end do @@ -782,7 +817,7 @@ subroutine ancil_orography_spherical_sph(nlayers, & ! Calculate nondimensional coordinate from current flat height coordinate ! (chi_3) with flat domain_surface - eta = z2eta_linear(chi_3(dfk), 0.0_r_def, domain_depth) + eta = z2eta_linear(chi_3_in(dfk), 0.0_r_def, domain_depth) ! Calculate new height coordinate from its nondimensional coordinate ! eta and surface_height @@ -790,7 +825,9 @@ subroutine ancil_orography_spherical_sph(nlayers, & case(stretching_method_linear) chi_3(dfk) = eta2z_linear(eta, surface_height(df), domain_depth) case default - chi_3(dfk) = eta2z_smooth(eta, surface_height(df), domain_depth, stretching_height) + chi_3(dfk) = eta2z_smooth( & + eta, surface_height(df), domain_depth, stretching_height & + ) end select end do end do @@ -798,61 +835,62 @@ subroutine ancil_orography_spherical_sph(nlayers, & end subroutine ancil_orography_spherical_sph !============================================================================= - !> @brief Modify vertical coordinate based on the input surface_altitude field. - !> For Cartesian geometries. - !> Note that this routine assumes the chi coordinates in a column are - !> associated with a flat domain on input and then modified on output. - !> Therefore it will not operate correctly with a horizontally continuous chi - !> field. - !> - !> @param[in] nlayers Number of vertical layers - !> @param[in,out] chi_1 1st coordinate field in Wchi - !> @param[in,out] chi_2 2nd coordinate field in Wchi - !> @param[in,out] chi_3 3rd coordinate field in Wchi - !> @param[in] panel_id Field giving the ID for mesh panels + !> @brief Modify vertical coordinate based on input surface_altitude field. + !! For Cartesian geometries. + !> @param[in] nlayers Number of vertical layers + !> @param[in,out] chi_1 1st coordinate field in Wchi (output) + !> @param[in,out] chi_2 2nd coordinate field in Wchi (output) + !> @param[in,out] chi_3 3rd coordinate field in Wchi (output) + !> @param[in] chi_1_in 1st coordinate field in Wchi (input) + !> @param[in] chi_2_in 2nd coordinate field in Wchi (input) + !> @param[in] chi_3_in 3rd coordinate field in Wchi (input) + !> @param[in] panel_id Field giving the ID for mesh panels !> @param[in] surface_altitude Surface altitude field data - !> @param[in] domain_surface Physical height of flat domain surface (m) - !> @param[in] domain_height Physical height of domain top (m) - !> @param[in] ndf_chi Array size and loop bound for map_chi - !> @param[in] undf_chi Column coordinates' array size and loop bound - !> @param[in] map_chi Indirection map for coordinate field - !> @param[in] ndf_pid Array size and loop bound for map_pid - !> @param[in] undf_pid Panel ID array size and loop bound - !> @param[in] map_pid Indirection map for panel_id - !> @param[in] ndf Array size and loop bound for surface altitude field - !> @param[in] undf Total number of dofs for surface altitude field - !> @param[in] map Indirection map for surface altitude field - !> @param[in] basis Basis functions for surface altitude field + !> @param[in] domain_surface Physical height of flat domain surface (m) + !> @param[in] domain_height Physical height of domain top (m) + !> @param[in] ndf_chi Num DoFs per cell for map_chi + !> @param[in] undf_chi Column coords' num DoFs this partition + !> @param[in] map_chi Indirection map for coordinate field + !> @param[in] ndf_pid Num DoFs per cell for map_pid + !> @param[in] undf_pid Panel ID num DoFs this partition + !> @param[in] map_pid Indirection map for pid + !> @param[in] ndf Num DoFs per cell for surface altitude + !> @param[in] undf Num DoFs this partition for surf altitude + !> @param[in] map Indirection map for surface altitude + !> @param[in] basis Basis functions for surface altitude !============================================================================= - subroutine ancil_orography_cartesian(nlayers, & - chi_1, chi_2, chi_3, & - panel_id, & - surface_altitude, & - domain_surface, domain_height, & - ndf_chi, undf_chi, & - map_chi, & - ndf_pid, undf_pid, & - map_pid, & - ndf, undf, & - map, basis & + subroutine ancil_orography_cartesian(nlayers, & + chi_1, chi_2, chi_3, & + chi_1_in, chi_2_in, chi_3_in, & + panel_id, & + surface_altitude, & + domain_surface, domain_height, & + ndf_chi, undf_chi, & + map_chi, & + ndf_pid, undf_pid, & + map_pid, & + ndf, undf, & + map, basis & ) implicit none ! Arguments - integer(kind=i_def), intent(in) :: nlayers, ndf, ndf_chi, ndf_pid - integer(kind=i_def), intent(in) :: undf, undf_chi, undf_pid - - integer(kind=i_def), dimension(ndf), intent(in) :: map - integer(kind=i_def), dimension(ndf_chi), intent(in) :: map_chi - integer(kind=i_def), dimension(ndf_pid), intent(in) :: map_pid - - real(kind=r_def), intent(in), dimension(ndf, ndf_chi) :: basis - - real(kind=r_def), dimension(undf_chi), intent(inout) :: chi_1, chi_2, chi_3 - real(kind=r_def), dimension(undf_pid), intent(in) :: panel_id - real(kind=r_def), dimension(undf), intent(in) :: surface_altitude - real(kind=r_def), intent(in) :: domain_surface, domain_height + integer(kind=i_def), intent(in) :: nlayers, ndf, ndf_chi, ndf_pid + integer(kind=i_def), intent(in) :: undf, undf_chi, undf_pid + integer(kind=i_def), intent(in) :: map(ndf) + integer(kind=i_def), intent(in) :: map_chi(ndf_chi) + integer(kind=i_def), intent(in) :: map_pid(ndf_pid) + real(kind=r_def), intent(in) :: basis(ndf, ndf_chi) + real(kind=r_def), intent(inout) :: chi_1(undf_chi) + real(kind=r_def), intent(inout) :: chi_2(undf_chi) + real(kind=r_def), intent(inout) :: chi_3(undf_chi) + real(kind=r_def), intent(in) :: chi_1_in(undf_chi) + real(kind=r_def), intent(in) :: chi_2_in(undf_chi) + real(kind=r_def), intent(in) :: chi_3_in(undf_chi) + real(kind=r_def), intent(in) :: panel_id(undf_pid) + real(kind=r_def), intent(in) :: surface_altitude(undf) + real(kind=r_def), intent(in) :: domain_surface, domain_height ! Internal variables integer(kind=i_def) :: k, df, dfchi, dfk @@ -865,7 +903,8 @@ subroutine ancil_orography_cartesian(nlayers, & surface_height(:) = 0.0_r_def do dfchi = 1, ndf_chi do df = 1, ndf - surface_height(dfchi) = surface_height(dfchi) + surface_altitude(map(df))*basis(df,dfchi) + surface_height(dfchi) = surface_height(dfchi) & + + surface_altitude(map(df))*basis(df,dfchi) end do end do @@ -876,16 +915,18 @@ subroutine ancil_orography_cartesian(nlayers, & ! Calculate nondimensional coordinate from current height coordinate ! (chi_3) with flat domain_surface - eta = z2eta_linear(chi_3(dfk), domain_surface, domain_height) + eta = z2eta_linear(chi_3_in(dfk), domain_surface, domain_height) ! Calculate new height coordinate from its nondimensional coordinate ! eta and surface_height select case(stretching_method) case(stretching_method_linear) - chi_3(dfk) = eta2z_linear(eta, domain_surface+surface_height(df), domain_height) + chi_3(dfk) = eta2z_linear( & + eta, domain_surface+surface_height(df), domain_height & + ) case default - chi_3(dfk) = domain_surface + & - eta2z_smooth(eta, surface_height(df), domain_depth, stretching_height) + chi_3(dfk) = domain_surface + eta2z_smooth( & + eta, surface_height(df), domain_depth, stretching_height) end select end do end do diff --git a/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf index 658e676fd..1d8a4cea2 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf @@ -43,7 +43,7 @@ contains use base_mesh_config_mod, only : geometry_planar, & topology_fully_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use formulation_config_mod, only : eos_method_sampled, & moisture_formulation_dry use feign_config_mod, only : feign_base_mesh_config, & @@ -70,6 +70,8 @@ contains element_order_v=0_i_def, & rehabilitate=.true., & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & vorticity_in_w1=.false. ) diff --git a/science/gungho/unit-test/kernel/core_dynamics/compute_dl_matrix_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/compute_dl_matrix_kernel_mod_test.pf index 348fb1efa..ad2da74af 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/compute_dl_matrix_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/compute_dl_matrix_kernel_mod_test.pf @@ -45,7 +45,7 @@ contains runge_kutta_method_ssp3 use extrusion_config_mod, only: method_uniform, stretching_method_linear use finite_element_config_mod, only: cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only: init_chi_transforms implicit none @@ -61,6 +61,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf index dc3e55e0d..802fa0bdd 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf @@ -48,7 +48,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_native + coord_system_native, coord_space_wchi use formulation_config_mod, only : eos_method_sampled, & moisture_formulation_dry use feign_config_mod, only : feign_base_mesh_config, & @@ -86,6 +86,8 @@ contains element_order_v=0_i_def, & rehabilitate=.true., & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_native, & vorticity_in_w1=.false. & ) diff --git a/science/gungho/unit-test/kernel/core_dynamics/kinetic_energy_gradient_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/kinetic_energy_gradient_kernel_mod_test.pf index aa9b4b51b..722dd7814 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/kinetic_energy_gradient_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/kinetic_energy_gradient_kernel_mod_test.pf @@ -50,7 +50,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use formulation_config_mod, only : eos_method_sampled, & moisture_formulation_dry use feign_config_mod, only : feign_finite_element_config, & @@ -64,6 +64,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/core_dynamics/lagged_orog_operator_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/lagged_orog_operator_kernel_mod_test.pf index 8e4e36223..ccf6f45c6 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/lagged_orog_operator_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/lagged_orog_operator_kernel_mod_test.pf @@ -33,7 +33,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config implicit none @@ -43,6 +43,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=1_i_def, & element_order_v=1_i_def, & diff --git a/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf index 7dbe255e1..60153cc5b 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf @@ -47,7 +47,7 @@ contains feign_planet_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use initial_temperature_config_mod, & only : perturb_none use sci_chi_transform_mod, only : init_chi_transforms @@ -69,6 +69,8 @@ contains eta_values=(/0.5_r_def/) ) call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=0_i_def, & element_order_v=0_i_def, & rehabilitate=.true., & diff --git a/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf index f08a05fd7..46eef8ca7 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf @@ -58,7 +58,7 @@ contains use base_mesh_config_mod, only : geometry_planar, & topology_fully_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_initial_temperature_config, & feign_finite_element_config @@ -78,6 +78,8 @@ contains fplane=.false., f_lat_deg=0.0_r_def ) call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf index 47193101b..66ae3a874 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf @@ -57,7 +57,7 @@ contains use base_mesh_config_mod, only : geometry_planar, & topology_fully_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_initial_temperature_config, & feign_planet_config, & @@ -78,6 +78,8 @@ contains fplane=.false., f_lat_deg=0.0_r_def ) call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=0_i_def, & element_order_v=0_i_def, & rehabilitate=.true., & diff --git a/science/gungho/unit-test/kernel/core_dynamics/vorticity_rhs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/vorticity_rhs_kernel_mod_test.pf index f5751b76d..0317f811f 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/vorticity_rhs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/vorticity_rhs_kernel_mod_test.pf @@ -31,7 +31,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -42,6 +42,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/diagnostics/compute_energetics_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/compute_energetics_kernel_mod_test.pf index e9e92bf81..29a50f04f 100644 --- a/science/gungho/unit-test/kernel/diagnostics/compute_energetics_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/compute_energetics_kernel_mod_test.pf @@ -57,7 +57,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -68,6 +68,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/diagnostics/compute_entropy_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/compute_entropy_kernel_mod_test.pf index 6e4dd39b0..e45c95794 100644 --- a/science/gungho/unit-test/kernel/diagnostics/compute_entropy_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/compute_entropy_kernel_mod_test.pf @@ -46,7 +46,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/diagnostics/compute_moist_mass_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/compute_moist_mass_kernel_mod_test.pf index 63133246b..a1c76a750 100644 --- a/science/gungho/unit-test/kernel/diagnostics/compute_moist_mass_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/compute_moist_mass_kernel_mod_test.pf @@ -50,7 +50,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -61,6 +61,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf index 851d06ebc..38206a930 100644 --- a/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf @@ -46,7 +46,7 @@ contains stretching_method_linear use sci_chi_transform_mod, only : init_chi_transforms use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_extrusion_config, & feign_finite_element_config, & feign_base_mesh_config, & @@ -71,6 +71,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf index 4eae5a9be..0002972ed 100644 --- a/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf @@ -49,7 +49,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_extrusion_config, & feign_finite_element_config, & feign_planet_config, & @@ -76,6 +76,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf index b31ac6b98..07223a7f0 100644 --- a/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf @@ -48,7 +48,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_initial_temperature_config, & @@ -97,6 +97,8 @@ contains call feign_finite_element_config( & cellshape = cellshape_quadrilateral, & coord_order = 0_i_def, & + coord_order_multigrid = 1_i_def, & + coord_space = coord_space_wchi, & coord_system = coord_system_xyz, & element_order_h = 0_i_def, & element_order_v = 0_i_def, & diff --git a/science/gungho/unit-test/kernel/diffusion/leonard_term_kl_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diffusion/leonard_term_kl_kernel_mod_test.pf index b11b8e28a..265b4f69e 100644 --- a/science/gungho/unit-test/kernel/diffusion/leonard_term_kl_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diffusion/leonard_term_kl_kernel_mod_test.pf @@ -37,7 +37,7 @@ contains use feign_config_mod, only : feign_finite_element_config, & feign_mixing_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use mixing_config_mod, only : method_3d_smag, & smag_l_calc, smag_l_calc_UseDx @@ -59,6 +59,8 @@ contains element_order_h=0_i_def, & element_order_v=0_i_def, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & rehabilitate=.true., & vorticity_in_w1=.false. ) diff --git a/science/gungho/unit-test/kernel/diffusion/leonard_term_th_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diffusion/leonard_term_th_kernel_mod_test.pf index 0d63fc078..6ee076ef7 100644 --- a/science/gungho/unit-test/kernel/diffusion/leonard_term_th_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diffusion/leonard_term_th_kernel_mod_test.pf @@ -36,7 +36,7 @@ contains use feign_config_mod, only : feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -47,6 +47,8 @@ contains element_order_h=0_i_def, & element_order_v=0_i_def, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & rehabilitate=.true., & vorticity_in_w1=.false. ) diff --git a/science/gungho/unit-test/kernel/diffusion/momentum_viscosity_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diffusion/momentum_viscosity_kernel_mod_test.pf index 31f0bb9cf..18ff9ac4a 100644 --- a/science/gungho/unit-test/kernel/diffusion/momentum_viscosity_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diffusion/momentum_viscosity_kernel_mod_test.pf @@ -36,7 +36,7 @@ contains use feign_config_mod, only : feign_finite_element_config use mixing_config_mod, only : method_3d_smag use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -46,6 +46,8 @@ contains cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & coord_system=coord_system_xyz, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=0_i_def, & element_order_v=0_i_def, & rehabilitate=.true., & diff --git a/science/gungho/unit-test/kernel/diffusion/tracer_smagorinsky_diff_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diffusion/tracer_smagorinsky_diff_kernel_mod_test.pf index 604ca9319..a1c550dc3 100644 --- a/science/gungho/unit-test/kernel/diffusion/tracer_smagorinsky_diff_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diffusion/tracer_smagorinsky_diff_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use mixing_config_mod, only : method_3d_smag, smag_l_calc, & smag_l_calc_UseDx use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -59,6 +59,8 @@ contains cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & coord_system=coord_system_xyz, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=0_i_def, & element_order_v=0_i_def, & rehabilitate=.true., & diff --git a/science/gungho/unit-test/kernel/diffusion/tracer_viscosity_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diffusion/tracer_viscosity_kernel_mod_test.pf index 495c48dff..a09149e64 100644 --- a/science/gungho/unit-test/kernel/diffusion/tracer_viscosity_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diffusion/tracer_viscosity_kernel_mod_test.pf @@ -32,7 +32,7 @@ contains use feign_config_mod, only : feign_finite_element_config use mixing_config_mod, only : method_3d_smag use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -41,6 +41,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/external_forcing/deep_hot_jupiter_kernel_mod_test.pf b/science/gungho/unit-test/kernel/external_forcing/deep_hot_jupiter_kernel_mod_test.pf index 00640b1af..b2388fe1a 100644 --- a/science/gungho/unit-test/kernel/external_forcing/deep_hot_jupiter_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/external_forcing/deep_hot_jupiter_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains feign_planet_config, & feign_timestepping_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use timestepping_config_mod, only : method_semi_implicit, & runge_kutta_method_ssp3 @@ -52,6 +52,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/external_forcing/earth_like_kernel_mod_test.pf b/science/gungho/unit-test/kernel/external_forcing/earth_like_kernel_mod_test.pf index 17e485b6b..85984d458 100644 --- a/science/gungho/unit-test/kernel/external_forcing/earth_like_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/external_forcing/earth_like_kernel_mod_test.pf @@ -39,7 +39,7 @@ contains feign_planet_config, & feign_timestepping_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use timestepping_config_mod, only : method_semi_implicit, & runge_kutta_method_ssp3 @@ -56,6 +56,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/external_forcing/held_suarez_kernel_mod_test.pf b/science/gungho/unit-test/kernel/external_forcing/held_suarez_kernel_mod_test.pf index d1e1f11e9..c468b27e6 100644 --- a/science/gungho/unit-test/kernel/external_forcing/held_suarez_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/external_forcing/held_suarez_kernel_mod_test.pf @@ -37,7 +37,7 @@ contains feign_planet_config, & feign_timestepping_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use timestepping_config_mod, only : method_semi_implicit, & runge_kutta_method_ssp3 @@ -55,6 +55,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/external_forcing/shallow_hot_jupiter_kernel_mod_test.pf b/science/gungho/unit-test/kernel/external_forcing/shallow_hot_jupiter_kernel_mod_test.pf index 854255e9c..a588c7bf3 100644 --- a/science/gungho/unit-test/kernel/external_forcing/shallow_hot_jupiter_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/external_forcing/shallow_hot_jupiter_kernel_mod_test.pf @@ -37,7 +37,7 @@ contains feign_planet_config, & feign_timestepping_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use timestepping_config_mod, only : method_semi_implicit, & runge_kutta_method_ssp3 @@ -54,6 +54,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/external_forcing/tidally_locked_earth_kernel_mod_test.pf b/science/gungho/unit-test/kernel/external_forcing/tidally_locked_earth_kernel_mod_test.pf index 5971150fe..a88b7a57a 100644 --- a/science/gungho/unit-test/kernel/external_forcing/tidally_locked_earth_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/external_forcing/tidally_locked_earth_kernel_mod_test.pf @@ -36,7 +36,7 @@ contains feign_planet_config, & feign_timestepping_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use sci_chi_transform_mod, only : init_chi_transforms use timestepping_config_mod, only : method_semi_implicit, & runge_kutta_method_ssp3 @@ -53,6 +53,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf index e91b2770c..6aaa75118 100644 --- a/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf @@ -73,7 +73,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_finite_element_config, & @@ -118,6 +118,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf index 4c2b182e8..363d73f3c 100644 --- a/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf @@ -43,7 +43,7 @@ contains feign_idealised_config, & feign_initial_density_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use idealised_config_mod, only : test_constant_field use initial_density_config_mod, only : density_background @@ -66,6 +66,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf index 4ff877458..9731ebd3e 100644 --- a/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf @@ -70,7 +70,7 @@ contains topology_fully_periodic use sci_chi_transform_mod, only : init_chi_transforms use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config, & feign_base_mesh_config, & feign_initial_wind_config @@ -90,6 +90,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf index dac91d1a6..dddbd21fe 100644 --- a/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf @@ -63,7 +63,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_finite_element_config, & @@ -99,6 +99,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf index 403f908bc..30206c3e6 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf index 9da369349..2423f12fb 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf index 959ddb390..70dbb6903 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf index b7c4aa269..3dcb3b93e 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf index 42069242d..d14af6437 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf index 63963b6ff..2c49a8208 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf index 41ab8a7ec..cdd97b420 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf index bc1b4a244..62f8ff04b 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf index d30a6ba29..2bff2bf3b 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf @@ -41,7 +41,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none class(create_wthetamask_blend_test_type), intent(inout) :: this @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf index 827948041..7604e9576 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf index 76c587d60..888878277 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf @@ -40,7 +40,7 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -57,6 +57,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/solver/eliminated_theta_q22_kernel_mod_test.pf b/science/gungho/unit-test/kernel/solver/eliminated_theta_q22_kernel_mod_test.pf index 96a0b0d16..caa797d84 100644 --- a/science/gungho/unit-test/kernel/solver/eliminated_theta_q22_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/solver/eliminated_theta_q22_kernel_mod_test.pf @@ -31,7 +31,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -42,6 +42,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=0_i_def, & element_order_v=0_i_def, & rehabilitate=.true., & diff --git a/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf b/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf index 4537740b9..912324654 100644 --- a/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf @@ -48,7 +48,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_initial_temperature_config, & @@ -77,6 +77,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & element_order_h=0_i_def, & element_order_v=0_i_def, & rehabilitate=.true., & diff --git a/science/gungho/unit-test/kernel/solver/weighted_div_kernel_mod_test.pf b/science/gungho/unit-test/kernel/solver/weighted_div_kernel_mod_test.pf index f2698dc97..fc28b3268 100644 --- a/science/gungho/unit-test/kernel/solver/weighted_div_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/solver/weighted_div_kernel_mod_test.pf @@ -42,7 +42,7 @@ contains use feign_config_mod, only : feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi implicit none @@ -51,6 +51,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=1_i_def, & element_order_v=1_i_def, & diff --git a/science/gungho/unit-test/kernel/solver/weighted_m3_kernel_mod_test.pf b/science/gungho/unit-test/kernel/solver/weighted_m3_kernel_mod_test.pf index e23ec3575..e009d5858 100644 --- a/science/gungho/unit-test/kernel/solver/weighted_m3_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/solver/weighted_m3_kernel_mod_test.pf @@ -31,7 +31,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -42,6 +42,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/transport/common/calc_upwind_detj_at_w2_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/common/calc_upwind_detj_at_w2_kernel_mod_test.pf index 4687a3be6..13c2fbe2a 100644 --- a/science/gungho/unit-test/kernel/transport/common/calc_upwind_detj_at_w2_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/common/calc_upwind_detj_at_w2_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use formulation_config_mod, only : eos_method_sampled, & moisture_formulation_dry use feign_config_mod, only : feign_finite_element_config, & @@ -48,6 +48,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf index e85a0bc8a..aaf138b33 100644 --- a/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_native + coord_system_native, coord_space_wchi use feign_config_mod, only : feign_finite_element_config, & feign_base_mesh_config, & feign_extrusion_config, & @@ -73,6 +73,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_native, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf index bd34c90e1..a33294632 100644 --- a/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_native + coord_system_native, coord_space_wchi use feign_config_mod, only : feign_finite_element_config, & feign_base_mesh_config, & feign_extrusion_config, & @@ -73,6 +73,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_native, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/transport/common/vorticity_advection_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/common/vorticity_advection_kernel_mod_test.pf index fd1051185..492e378d4 100644 --- a/science/gungho/unit-test/kernel/transport/common/vorticity_advection_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/common/vorticity_advection_kernel_mod_test.pf @@ -31,7 +31,8 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, & + coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -42,6 +43,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/transport/common/w2_vorticity_advection_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/common/w2_vorticity_advection_kernel_mod_test.pf index 071d03792..17ee1adc4 100644 --- a/science/gungho/unit-test/kernel/transport/common/w2_vorticity_advection_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/common/w2_vorticity_advection_kernel_mod_test.pf @@ -31,7 +31,8 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, & + coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms @@ -42,6 +43,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf index d2e8ae4ee..23f29b2ce 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf @@ -31,7 +31,8 @@ contains use base_mesh_config_mod, only: geometry_planar, & topology_fully_periodic use finite_element_config_mod, only: coord_system_xyz, & - cellshape_quadrilateral + cellshape_quadrilateral, & + coord_space_wchi use sci_chi_transform_mod, only: init_chi_transforms implicit none @@ -46,6 +47,8 @@ contains call feign_finite_element_config( cellshape = cellshape_quadrilateral, & coord_order = 1, & + coord_order_multigrid = 1, & + coord_space = coord_space_wchi, & coord_system = coord_system_xyz, & element_order_h = 0, & element_order_v = 0, & diff --git a/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf index 26c6a3be1..11672a13f 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf @@ -31,7 +31,8 @@ contains use base_mesh_config_mod, only: geometry_planar, & topology_fully_periodic use finite_element_config_mod, only: coord_system_xyz, & - cellshape_quadrilateral + cellshape_quadrilateral, & + coord_space_wchi use sci_chi_transform_mod, only: init_chi_transforms implicit none @@ -46,6 +47,8 @@ contains call feign_finite_element_config( cellshape = cellshape_quadrilateral, & coord_order = 1, & + coord_order_multigrid = 1, & + coord_space = coord_space_wchi, & coord_system = coord_system_xyz, & element_order_h = 0, & element_order_v = 0, & diff --git a/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf index eec36089b..6a1dadc15 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf @@ -31,7 +31,8 @@ contains use base_mesh_config_mod, only: geometry_planar, & topology_fully_periodic use finite_element_config_mod, only: coord_system_xyz, & - cellshape_quadrilateral + cellshape_quadrilateral, & + coord_space_wchi use sci_chi_transform_mod, only: init_chi_transforms implicit none @@ -46,6 +47,8 @@ contains call feign_finite_element_config( cellshape = cellshape_quadrilateral, & coord_order = 1, & + coord_order_multigrid = 1, & + coord_space = coord_space_wchi, & coord_system = coord_system_xyz, & element_order_h = 0, & element_order_v = 0, & diff --git a/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf index bc2105654..217811006 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf @@ -31,7 +31,8 @@ contains use base_mesh_config_mod, only: geometry_planar, & topology_fully_periodic use finite_element_config_mod, only: coord_system_xyz, & - cellshape_quadrilateral + cellshape_quadrilateral, & + coord_space_wchi use sci_chi_transform_mod, only: init_chi_transforms implicit none @@ -45,6 +46,8 @@ contains fplane=.false., f_lat_deg=0.0_r_def ) call feign_finite_element_config( cellshape = cellshape_quadrilateral, & coord_order = 1, & + coord_order_multigrid = 1, & + coord_space = coord_space_wchi, & coord_system = coord_system_xyz, & element_order_h = 0, & element_order_v = 0, & diff --git a/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf b/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf index 2ea45a953..043518895 100644 --- a/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf +++ b/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf @@ -58,7 +58,7 @@ contains use base_mesh_config_mod, only : geometry_planar, & topology_fully_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config, & feign_base_mesh_config, & feign_extrusion_config, & @@ -94,6 +94,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & @@ -183,6 +185,7 @@ contains real(r_def), parameter :: tol = 1.0e-3_r_def real(r_def) :: height_flat_surface, height_domain_top real(r_def) :: chi_1(undf), chi_2(undf), chi_3(undf) + real(r_def) :: chi_1_in(undf), chi_2_in(undf), chi_3_in(undf) real(r_def) :: panel_id(undf) real(r_def) :: eta(0:nlayers) real(r_def) :: vertex_coords_2d(3,1), chi_surf, chi_test @@ -235,13 +238,17 @@ contains do i = 1, undf chi_3(i) = eta2z_linear(eta(i-1), height_flat_surface, height_domain_top) end do + chi_1_in(:) = chi_1(:) + chi_2_in(:) = chi_2(:) + chi_3_in(:) = chi_3(:) panel_id(:) = 1.0_r_def ! Test Cartesian orography assignment - call analytic_orography_cartesian( nlayers, ndf, undf, map, & - ndf, undf, map, & - height_flat_surface, & - height_domain_top, & - chi_1, chi_2, chi_3, & + call analytic_orography_cartesian( nlayers, ndf, undf, map, & + ndf, undf, map, & + height_flat_surface, & + height_domain_top, & + chi_1_in, chi_2_in, chi_3_in, & + chi_1, chi_2, chi_3, & panel_id ) ! Test selected chi_3 diff --git a/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf b/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf index e45d1fd81..223d51af3 100644 --- a/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf +++ b/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf @@ -59,7 +59,8 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, & + coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_finite_element_config, & @@ -119,6 +120,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & @@ -194,6 +197,7 @@ contains real(r_def) :: use_tol real(r_def) :: height_flat_surface, height_domain_top real(r_def) :: chi_1(undf), chi_2(undf), chi_3(undf) + real(r_def) :: chi_1_in(undf), chi_2_in(undf), chi_3_in(undf) real(r_def) :: chi_1_cart(undf), chi_2_cart(undf), chi_3_cart(undf) real(r_def) :: panel_id(undf) real(r_def) :: eta(0:nlayers) @@ -251,11 +255,17 @@ contains call llr2xyz(chi_1(i), chi_2(i), chi_3(i), & chi_1_cart(i), chi_2_cart(i), chi_3_cart(i)) end do + + chi_1_in(:) = chi_1_cart(:) + chi_2_in(:) = chi_2_cart(:) + chi_3_in(:) = chi_3_cart(:) + ! Test spherical orography assignment - call analytic_orography_spherical_xyz( nlayers, ndf, undf, map, & - ndf, undf, map, & - height_flat_surface, & - height_domain_top, & + call analytic_orography_spherical_xyz( nlayers, ndf, undf, map, & + ndf, undf, map, & + height_flat_surface, & + height_domain_top, & + chi_1_in, chi_2_in, chi_3_in, & chi_1_cart, chi_2_cart, chi_3_cart, & panel_id ) ! Transform coordinate field back to (long, lat, r) for comparison diff --git a/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf b/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf index bdb77e02b..2562d7e26 100644 --- a/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf +++ b/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf @@ -33,7 +33,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config, & feign_base_mesh_config, & feign_extrusion_config @@ -61,6 +61,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & @@ -108,6 +110,7 @@ contains real(r_def), allocatable :: srf_alt_w0(:) real(r_def), allocatable :: multipl_w0_sl(:) real(r_def), allocatable :: chi1(:), chi2(:), chi3(:), panel_id(:) + real(r_def), allocatable :: chi1_in(:), chi2_in(:), chi3_in(:) real(r_def) :: answer @@ -155,6 +158,9 @@ contains allocate( chi1(undf_wchi) ) allocate( chi2(undf_wchi) ) allocate( chi3(undf_wchi) ) + allocate( chi1_in(undf_wchi) ) + allocate( chi2_in(undf_wchi) ) + allocate( chi3_in(undf_wchi) ) allocate( srf_alt_w3(undf_w3_sl) ) allocate( srf_alt_w0(undf_w0_sl) ) allocate( multipl_w0_sl(undf_w0_sl) ) @@ -172,6 +178,11 @@ contains ! This generates the w0 surface_altitude srf_alt_w3(:)=0.0_r_def srf_alt_w3(5)=400.0_r_def + + chi1_in(:) = chi1(:) + chi2_in(:) = chi2(:) + chi3_in(:) = chi3(:) + do cell = 1, ncells call average_w3_to_w0_code(1, & @@ -195,6 +206,9 @@ contains chi1, & chi2, & chi3, & + chi1_in, & + chi2_in, & + chi3_in, & panel_id, & srf_alt_w0, & domain_surface, & @@ -237,6 +251,9 @@ contains deallocate( chi1 ) deallocate( chi2 ) deallocate( chi3 ) + deallocate( chi1_in ) + deallocate( chi2_in ) + deallocate( chi3_in ) deallocate( panel_id ) deallocate( basis_w0_on_wchi ) diff --git a/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf b/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf index 8ca918b03..261f110e0 100644 --- a/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf +++ b/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf @@ -34,7 +34,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config, & feign_base_mesh_config, & feign_extrusion_config @@ -61,6 +61,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & @@ -111,6 +113,7 @@ contains real(r_def), allocatable :: srf_alt_w0(:) real(r_def), allocatable :: multipl_w0_sl(:) real(r_def), allocatable :: chi1(:), chi2(:), chi3(:), panel_id(:) + real(r_def), allocatable :: chi1_in(:), chi2_in(:), chi3_in(:) real(r_def) :: answer, lat, lon, r real(r_def) :: use_tol @@ -159,6 +162,9 @@ contains allocate( chi1(undf_wchi) ) allocate( chi2(undf_wchi) ) allocate( chi3(undf_wchi) ) + allocate( chi1_in(undf_wchi) ) + allocate( chi2_in(undf_wchi) ) + allocate( chi3_in(undf_wchi) ) allocate( srf_alt_w3(undf_w3_sl) ) allocate( srf_alt_w0(undf_w0_sl) ) allocate( multipl_w0_sl(undf_w0_sl) ) @@ -176,6 +182,11 @@ contains ! This generates the w0 surface_altitude srf_alt_w3(:)=0.0_r_def srf_alt_w3(5)=400.0_r_def + + chi1_in(:) = chi1(:) + chi2_in(:) = chi2(:) + chi3_in(:) = chi3(:) + do cell = 1, ncells call average_w3_to_w0_code(1, & @@ -199,6 +210,9 @@ contains chi1, & chi2, & chi3, & + chi1_in, & + chi2_in, & + chi3_in, & panel_id, & srf_alt_w0, & domain_surface, & @@ -266,6 +280,9 @@ contains deallocate( chi1 ) deallocate( chi2 ) deallocate( chi3 ) + deallocate( chi1_in ) + deallocate( chi2_in ) + deallocate( chi3_in ) deallocate( panel_id ) deallocate( basis_w0_on_wchi ) diff --git a/science/linear/integration-test/runge_kutta/resources/runge_kutta_configuration.nml b/science/linear/integration-test/runge_kutta/resources/runge_kutta_configuration.nml index 9298f96f7..f3321092c 100644 --- a/science/linear/integration-test/runge_kutta/resources/runge_kutta_configuration.nml +++ b/science/linear/integration-test/runge_kutta/resources/runge_kutta_configuration.nml @@ -47,6 +47,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='xyz', element_order_h=0, element_order_v=0, diff --git a/science/linear/integration-test/semi_implicit/resources/semi_implicit_configuration.nml b/science/linear/integration-test/semi_implicit/resources/semi_implicit_configuration.nml index 2b208a451..999b6e772 100644 --- a/science/linear/integration-test/semi_implicit/resources/semi_implicit_configuration.nml +++ b/science/linear/integration-test/semi_implicit/resources/semi_implicit_configuration.nml @@ -47,6 +47,8 @@ start_dump_filename='', &finite_element cellshape='quadrilateral', coord_order=1, +coord_order_multigrid=1, +coord_space='Wchi', coord_system='xyz', element_order_h=0, element_order_v=0, diff --git a/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf index c3b98a7b0..d44aa2138 100644 --- a/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf @@ -52,7 +52,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use initial_pressure_config_mod, only : method_balanced use initial_temperature_config_mod, & only : perturb_none @@ -86,6 +86,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_kinetic_energy_gradient_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_kinetic_energy_gradient_kernel_mod_test.pf index 9a44a87ab..acc390de6 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_kinetic_energy_gradient_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_kinetic_energy_gradient_kernel_mod_test.pf @@ -49,7 +49,7 @@ contains subroutine setUp( this ) use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use formulation_config_mod, only : eos_method_sampled, & moisture_formulation_dry use feign_config_mod, only : feign_finite_element_config, & @@ -63,6 +63,8 @@ contains call feign_finite_element_config( & cellshape = cellshape_quadrilateral, & coord_order = 0_i_def, & + coord_order_multigrid = 1_i_def, & + coord_space = coord_space_wchi, & coord_system = coord_system_xyz, & element_order_h = 0_i_def, & element_order_v = 0_i_def, & diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf index e739d0615..008db1568 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf @@ -42,7 +42,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_initial_temperature_config, & @@ -71,6 +71,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf index c80f072b3..7be6a9fde 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf @@ -57,7 +57,7 @@ contains use base_mesh_config_mod, only : geometry_planar, & topology_fully_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_initial_temperature_config, & feign_finite_element_config @@ -77,6 +77,8 @@ contains fplane=.false., f_lat_deg=0.0_r_def ) call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf index e347b4128..3b8cf2c4a 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf @@ -57,7 +57,7 @@ contains use base_mesh_config_mod, only : geometry_planar, & topology_fully_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_initial_temperature_config, & feign_finite_element_config @@ -76,6 +76,8 @@ contains fplane=.false., f_lat_deg=0.0_r_def ) call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf index e1dc1c860..79d885730 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf @@ -42,7 +42,7 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & feign_extrusion_config, & feign_initial_temperature_config, & @@ -71,6 +71,8 @@ contains call feign_finite_element_config( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, & diff --git a/science/linear/unit-test/kernel/transport/common/tl_vorticity_advection_kernel_mod_test.pf b/science/linear/unit-test/kernel/transport/common/tl_vorticity_advection_kernel_mod_test.pf index 9dea4bf34..a6e8624fb 100644 --- a/science/linear/unit-test/kernel/transport/common/tl_vorticity_advection_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/transport/common/tl_vorticity_advection_kernel_mod_test.pf @@ -12,7 +12,7 @@ module tl_vorticity_advection_kernel_mod_test use finite_element_config_mod, & only : cellshape_quadrilateral, & - coord_system_xyz + coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config use sci_chi_transform_mod, only : init_chi_transforms, & final_chi_transforms @@ -128,6 +128,8 @@ contains call feign_finite_element_config( & cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & + coord_order_multigrid=1_i_def, & + coord_space=coord_space_wchi, & coord_system=coord_system_xyz, & element_order_h=0_i_def, & element_order_v=0_i_def, &