From 52edf2a1c6517d83dec70b10736e1fe180b85506 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 20 May 2024 15:58:16 +0000 Subject: [PATCH] Update SCM RTs for CCPP v7 release --- test/rt_test_cases.py | 96 ++++++++++++++++++++---------------- test/rt_test_cases_nvidia.py | 10 ++-- 2 files changed, 58 insertions(+), 48 deletions(-) diff --git a/test/rt_test_cases.py b/test/rt_test_cases.py index d9145a1b3..7c52f88b5 100644 --- a/test/rt_test_cases.py +++ b/test/rt_test_cases.py @@ -1,47 +1,57 @@ run_list = [\ #---------------------------------------------------------------------------------------------------------------------------------------------- - # CCPP-SCM v6 supported suites + # Supported suites for CCPP Version 7 release + #---------------------------------------------------------------------------------------------------------------------------------------------- + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_HR3"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_HR3_RRTMGP"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v16"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_WoFS_v0"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RRFS_v1"}, \ + {"case": "twpice", "suite": "SCM_GFS_v17_HR3"}, \ + {"case": "twpice", "suite": "SCM_GFS_v17_HR3_RRTMGP"}, \ + {"case": "twpice", "suite": "SCM_GFS_v16"}, \ + {"case": "twpice", "suite": "SCM_WoFS_v0"}, \ + {"case": "twpice", "suite": "SCM_RRFS_v1"}, \ + {"case": "bomex", "suite": "SCM_GFS_v17_HR3"}, \ + {"case": "bomex", "suite": "SCM_GFS_v17_HR3_RRTMGP"}, \ + {"case": "bomex", "suite": "SCM_GFS_v16"}, \ + {"case": "bomex", "suite": "SCM_WoFS_v0"}, \ + {"case": "bomex", "suite": "SCM_RRFS_v1"}, \ + {"case": "astex", "suite": "SCM_GFS_v17_HR3"}, \ + {"case": "astex", "suite": "SCM_GFS_v17_HR3_RRTMGP"}, \ + {"case": "astex", "suite": "SCM_GFS_v16"}, \ + {"case": "astex", "suite": "SCM_WoFS_v0"}, \ + {"case": "astex", "suite": "SCM_RRFS_v1"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_GFS_v17_HR3"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_GFS_v17_HR3_RRTMGP"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_GFS_v16"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_WoFS_v0"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_RRFS_v1"}, \ #---------------------------------------------------------------------------------------------------------------------------------------------- - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v16"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_HRRR"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RAP"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_WoFS_v0"}, \ - {"case": "twpice", "suite": "SCM_GFS_v16"}, \ - {"case": "twpice", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "twpice", "suite": "SCM_HRRR"}, \ - {"case": "twpice", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "twpice", "suite": "SCM_RAP"}, \ - {"case": "twpice", "suite": "SCM_WoFS_v0"}, \ - {"case": "bomex", "suite": "SCM_GFS_v16"}, \ - {"case": "bomex", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "bomex", "suite": "SCM_HRRR"}, \ - {"case": "bomex", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "bomex", "suite": "SCM_RAP"}, \ - {"case": "bomex", "suite": "SCM_WoFS_v0"}, \ - {"case": "astex", "suite": "SCM_GFS_v16"}, \ - {"case": "astex", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "astex", "suite": "SCM_HRRR"}, \ - {"case": "astex", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "astex", "suite": "SCM_RAP"}, \ - {"case": "astex", "suite": "SCM_WoFS_v0"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_GFS_v16"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_HRRR"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_RAP"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_WoFS_v0"}, \ - #--------------------------------------------------------------------------------------------------------------------------------------------------- # Unsupported suites (w/ supported cases) - #--------------------------------------------------------------------------------------------------------------------------------------------------- - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v15p2"}, \ - {"case": "twpice", "suite": "SCM_GFS_v15p2"}, \ - {"case": "bomex", "suite": "SCM_GFS_v15p2"}, \ - {"case": "astex", "suite": "SCM_GFS_v15p2"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_GFS_v15p2"}]#, \ -# {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"},\ -# {"case": "twpice", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"},\ -# {"case": "bomex", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"},\ -# {"case": "astex", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"},\ -# {"case": "LASSO_2016051812", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"}] + #---------------------------------------------------------------------------------------------------------------------------------------------- + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_p8"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_HRRR"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RRFS_v1beta"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RAP"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v15p2"}, \ + {"case": "twpice", "suite": "SCM_GFS_v17_p8"}, \ + {"case": "twpice", "suite": "SCM_HRRR"}, \ + {"case": "twpice", "suite": "SCM_RRFS_v1beta"}, \ + {"case": "twpice", "suite": "SCM_RAP"}, \ + {"case": "twpice", "suite": "SCM_GFS_v15p2"}, \ + {"case": "bomex", "suite": "SCM_GFS_v17_p8"}, \ + {"case": "bomex", "suite": "SCM_HRRR"}, \ + {"case": "bomex", "suite": "SCM_RRFS_v1beta"}, \ + {"case": "bomex", "suite": "SCM_RAP"}, \ + {"case": "bomex", "suite": "SCM_GFS_v15p2"}, \ + {"case": "astex", "suite": "SCM_GFS_v17_p8"}, \ + {"case": "astex", "suite": "SCM_HRRR"}, \ + {"case": "astex", "suite": "SCM_RRFS_v1beta"}, \ + {"case": "astex", "suite": "SCM_RAP"}, \ + {"case": "astex", "suite": "SCM_GFS_v15p2"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_GFS_v17_p8"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_HRRR"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_RRFS_v1beta"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_RAP"}, \ + {"case": "LASSO_2016051812", "suite": "SCM_GFS_v15p2"}] diff --git a/test/rt_test_cases_nvidia.py b/test/rt_test_cases_nvidia.py index a19c81ba9..14473306c 100644 --- a/test/rt_test_cases_nvidia.py +++ b/test/rt_test_cases_nvidia.py @@ -1,9 +1,9 @@ run_list = [\ #---------------------------------------------------------------------------------------------------------------------------------------------- - # CCPP-SCM v6 supported suites + # CCPP-SCM suites for use with Nvidia compilers #---------------------------------------------------------------------------------------------------------------------------------------------- - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RAP"}, \ - {"case": "twpice", "suite": "SCM_RAP"}, \ - {"case": "bomex", "suite": "SCM_RAP"}, \ - {"case": "astex", "suite": "SCM_RAP"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RAP"}, \ + {"case": "twpice", "suite": "SCM_RAP"}, \ + {"case": "bomex", "suite": "SCM_RAP"}, \ + {"case": "astex", "suite": "SCM_RAP"}, \ {"case": "LASSO_2016051812", "suite": "SCM_RAP"}]