From 33ce83b33f9cb95409659c7e60c46def874bdf6f Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Fri, 5 May 2023 16:56:29 -0500 Subject: [PATCH 1/3] Add initial superBFB tests for ELM --- cime_config/tests.py | 42 +++++++++++++++++++ .../elm/cime_config/config_compsets.xml | 5 +++ 2 files changed, 47 insertions(+) diff --git a/cime_config/tests.py b/cime_config/tests.py index c67abdfba761..72e4ecb02596 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -724,5 +724,47 @@ "inherit" : ("e3sm_superbfb_ocn_dbg", "e3sm_superbfb_ocn_opt", "e3sm_superbfb_ocn_dbg_thrd", "e3sm_superbfb_ocn_opt_thrd"), }, + + # super-BFB LND + "e3sm_superbfb_lnd_opt" : { # opt + pureMPI + #"share" : True, + "time" : "00:15:00", + "tests" : ( + "ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", + "PEM_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", + ) + }, + + "e3sm_superbfb_lnd_dbg" : { # dbg + pureMPI + #"share" : True, + "time" : "00:30:00", + "tests" : ( + "ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", + "PEM_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", + ) + }, + + "e3sm_superbfb_lnd_opt_thrd" : { # opt + threads + #"share" : True, + "time" : "00:15:00", + "tests" : ( + "PET_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull", + "ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp2", + ) + }, + + "e3sm_superbfb_lnd_dbg_thrd" : { # dbg + threads + #"share" : True, + "time" : "00:30:00", + "tests" : ( + "PET_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull", + "ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp2", + ) + }, + + "e3sm_superbfb_lnd" : { + "inherit" : ("e3sm_superbfb_lnd_dbg", "e3sm_superbfb_lnd_opt", + "e3sm_superbfb_lnd_dbg_thrd", "e3sm_superbfb_lnd_opt_thrd"), + }, } diff --git a/components/elm/cime_config/config_compsets.xml b/components/elm/cime_config/config_compsets.xml index b9da027e62e3..17e69d3cc753 100644 --- a/components/elm/cime_config/config_compsets.xml +++ b/components/elm/cime_config/config_compsets.xml @@ -29,6 +29,11 @@ 2000_DATM%QIA_ELM%SP_SICE_SOCN_MOSART_SGLC_SWAV + + IELMTEST + 2000_DATM%QIA_ELM%SP_SICE_SOCN_SROF_SGLC_SWAV_TEST + + IELMBC 2000_DATM%QIA_ELM%SPBC_SICE_SOCN_MOSART_SGLC_SWAV From 43b3e5c73706c7454d25c93b68d1934ed698d720 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Tue, 23 May 2023 22:40:54 -0500 Subject: [PATCH 2/3] Add initial superBFB tests for ROF --- cime_config/tests.py | 62 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/cime_config/tests.py b/cime_config/tests.py index 72e4ecb02596..471e113e9fde 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -728,7 +728,7 @@ # super-BFB LND "e3sm_superbfb_lnd_opt" : { # opt + pureMPI #"share" : True, - "time" : "00:15:00", + "time" : "00:30:00", "tests" : ( "ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", "PEM_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", @@ -737,7 +737,7 @@ "e3sm_superbfb_lnd_dbg" : { # dbg + pureMPI #"share" : True, - "time" : "00:30:00", + "time" : "01:00:00", "tests" : ( "ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", "PEM_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1", @@ -746,19 +746,19 @@ "e3sm_superbfb_lnd_opt_thrd" : { # opt + threads #"share" : True, - "time" : "00:15:00", + "time" : "00:30:00", "tests" : ( - "PET_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull", - "ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp2", + "PET_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp2", + "ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull", ) }, "e3sm_superbfb_lnd_dbg_thrd" : { # dbg + threads #"share" : True, - "time" : "00:30:00", + "time" : "01:00:00", "tests" : ( - "PET_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull", - "ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp2", + "PET_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp2", + "ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull", ) }, @@ -766,5 +766,51 @@ "inherit" : ("e3sm_superbfb_lnd_dbg", "e3sm_superbfb_lnd_opt", "e3sm_superbfb_lnd_dbg_thrd", "e3sm_superbfb_lnd_opt_thrd"), }, + + # super-BFB ROF + "e3sm_superbfb_rof_opt" : { # opt + pureMPI + #"share" : True, + "time" : "00:30:00", + "tests" : ( + "ERS_Ld3.r05_r05.RMOSGPCC.pemod-omp1", + "PEM_Ld3.r05_r05.RMOSGPCC.pemod-omp1", + ) + }, + + "e3sm_superbfb_rof_dbg" : { # dbg + pureMPI + #"share" : True, + "time" : "01:00:00", + "tests" : ( + "ERS_Ld3_D.r05_r05.RMOSGPCC.pemod-omp1", + "PEM_Ld3_D.r05_r05.RMOSGPCC.pemod-omp1", + ) + }, + + "e3sm_superbfb_rof_opt_thrd" : { # opt + threads + #"share" : True, + "time" : "00:30:00", + "tests" : ( + "PET_Ld3.r05_r05.RMOSGPCC.pemod-omp2", + "ERS_Ld3.r05_r05.RMOSGPCC.pemod-ompfull", + ) + }, + + "e3sm_superbfb_rof_dbg_thrd" : { # dbg + threads + #"share" : True, + "time" : "01:00:00", + "tests" : ( + "PET_Ld3_D.r05_r05.RMOSGPCC.pemod-omp2", + "ERS_Ld3_D.r05_r05.RMOSGPCC.pemod-ompfull", + ) + }, + + "e3sm_superbfb_rof" : { + "inherit" : ("e3sm_superbfb_rof_dbg", "e3sm_superbfb_rof_opt", + "e3sm_superbfb_rof_dbg_thrd", "e3sm_superbfb_rof_opt_thrd"), + }, + + "e3sm_superbfb" : { + "inherit" : ("e3sm_superbfb_lnd", "e3sm_superbfb_rof"), + }, } From a5561dfdbe57eea23cc5fab7682ae2f5e136dcd8 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Tue, 27 Jun 2023 09:21:52 -0500 Subject: [PATCH 3/3] Update IELMTEST compset to ELM%SPBC used by WCYCL --- components/elm/cime_config/config_compsets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/elm/cime_config/config_compsets.xml b/components/elm/cime_config/config_compsets.xml index 17e69d3cc753..01366aa71dd9 100644 --- a/components/elm/cime_config/config_compsets.xml +++ b/components/elm/cime_config/config_compsets.xml @@ -31,7 +31,7 @@ IELMTEST - 2000_DATM%QIA_ELM%SP_SICE_SOCN_SROF_SGLC_SWAV_TEST + 2000_DATM%QIA_ELM%SPBC_SICE_SOCN_SROF_SGLC_SWAV_TEST