From 4e6dd1d9a47c6e0a913f12a94bbebe24d9c3979a Mon Sep 17 00:00:00 2001 From: Balwinder Date: Tue, 27 Jun 2017 10:48:34 -0400 Subject: [PATCH 1/4] Adds atm suites and reorganized acme developer and integration suites This commit adds atm test suites. Modifies preview_namelists.py so that it outputs error and output streams to standard out. [BFB] - Bit-For-Bit See confluence for a more detailed description about these tags. --- scripts/lib/CIME/preview_namelists.py | 2 +- scripts/lib/update_acme_tests.py | 82 ++++++++------------------- 2 files changed, 26 insertions(+), 58 deletions(-) diff --git a/scripts/lib/CIME/preview_namelists.py b/scripts/lib/CIME/preview_namelists.py index ce98d2447ad..5d01d65e679 100644 --- a/scripts/lib/CIME/preview_namelists.py +++ b/scripts/lib/CIME/preview_namelists.py @@ -100,7 +100,7 @@ def create_namelists(case, component=None): if do_run_cmd: logger.info(" Running %s buildnml"%compname) case.flush() - output = run_cmd_no_fail("%s %s" % (cmd, caseroot), verbose=False) + output = run_cmd_no_fail("%s %s" % (cmd, caseroot), combine_output=True) logger.info(output) # refresh case xml object from file case.read_xml() diff --git a/scripts/lib/update_acme_tests.py b/scripts/lib/update_acme_tests.py index 477730dc3c2..18655915d7e 100644 --- a/scripts/lib/update_acme_tests.py +++ b/scripts/lib/update_acme_tests.py @@ -76,23 +76,28 @@ ), "acme_atm_developer" : (None, None, - ("ERS.ne16_ne16.FC5MAM4", - "ERS.ne16_ne16.FC5PLMOD", - "ERS.ne16_ne16.FC5CLBMG2", - "ERS.ne16_ne16.FC5CLBMG2MAM4", - "ERS.ne16_ne16.FC5CLBMG2MAM4MOM", - "ERS.ne16_ne16.FC5CLBMG2MAM4RESUS", - "ERS.ne16_ne16.FC5CLBMG2LINMAM4RESUSMOM", - "ERS.f19_g16.FC5CLBMG2MAM4RESUSBC", - "ERS.f19_g16.FC5CLBMG2MAM4RESUSMOMBC", - "ERS.f19_g16.FC5ATMMOD", - "ERS_Ld5.ne16_ne16.FC5ATMMODCOSP", - "SMS.f19_g16.FC5ATMMOD", - "SMS.f19_g16.FC5ATMMODCOSP", - "SMS_D.f19_g16.FC5ATMMODCOSP") + ("SMS_D_Ln5.ne4_ne4.FC5", + ("ERP_Ln9.ne4_ne4.FC5AV1C-L", "cam-rtm_null"), + "SMS_D_Ln5.ne4_ne4.FC5AV1C-L") ), - "acme_developer" : ("acme_land_developer", "0:45:00", + "acme_atm_integration" : (None, None, + (("ERP_Ln9.ne4_ne4.FC5", "cam-rtm_null"), + "ERP_Ln9.ne4_ne4.FC5AQUAP", + "PET_Ln5.ne4_ne4.FC5AV1C-L", + "PEM_Ln5.ne4_ne4.FC5AV1C-L", + ("SMS_D_Ln5.ne4_ne4.FC5AV1C-L", "cam-cosplite_nhtfrq5"), + "REP_Ln5.ne4_ne4.FC5AV1C-L") + ), + + "acme_atm_weekly" : (None, None, + ("SMS_Lm1.ne4_ne4.FC5AV1C-L", + "ERS_Lm1.ne4_ne4.FC5AV1C-L", + "ERS_Lm3.ne4_ne4.FC5AV1C-L", + "SMS_Ly1.ne4_ne4.FC5AV1C-L") + ), + + "acme_developer" : (("acme_land_developer","acme_atm_developer"), "0:45:00", ("ERS.f19_g16_rx1.A", "ERS.f45_g37_rx1.DTEST", "ERS.ne30_g16_rx1.A", @@ -103,41 +108,19 @@ "ERS_IOP4c.ne30_g16_rx1.A", "ERS_IOP4p.f19_g16_rx1.A", "ERS_IOP4p.ne30_g16_rx1.A", - ("ERP_Ln9.ne30_ne30.FC5", "cam-outfrq9s"), "HOMME_P24.f19_g16_rx1.A", "NCK.f19_g16_rx1.A", "SMS.ne30_f19_g16_rx1.A", "ERS_Ld5.T62_oQU120.CMPASO-NYF", "ERS.f09_g16_g.MPASLISIA", "SMS.T62_oQU120_ais20.MPAS_LISIO_TEST", - "SMS.f09_g16_a.IGCLM45_MLI", - ("SMS_Ln5.ne4_ne4.FC5AV1C-L", "cam-cosplite_nhtfrq5"), - "SMS_D_Ln5.ne16_ne16.FC5AV1F", - "SMS_D_Ln5.ne16_ne16.FC5AV1C", - "SMS_D_Ln5.ne16_ne16.FC5AV1C-01", - "SMS_D_Ln5.ne16_ne16.FC5AV1C-02", - "SMS_D_Ln5.ne16_ne16.FC5AV1C-03", - "SMS_D_Ln5.ne16_ne16.FC5AV1C-04", - "SMS_D_Ln1.ne30_ne30.FC5AV1C-04", - "SMS_D_Ln1.ne30_oEC.F1850C5AV1C-02", - "SMS_D_Ln5.ne16_ne16.F1850C5AV1C-04", - "SMS_D_Ln5.ne16_ne16.F20TRC5AV1C-03", - "SMS_D_Ln5.ne16_ne16.FC5AV1C-04P", - "SMS_D_Ln5.ne4_ne4.FC5AV1C-04P2", - "SMS_D_Ld1.ne16_ne16.FC5ATMMOD") + "SMS.f09_g16_a.IGCLM45_MLI") ), - - "acme_integration" : ("acme_developer", "03:00:00", + + + "acme_integration" : (("acme_developer", "acme_atm_integration"),"03:00:00", ("ERS.ne11_oQU240.A_WCYCL1850", - "ERS.f19_f19.FAMIPC5", - "ERS.ne16_ne16.FC5PM", - "ERS.ne16_ne16.FC5PLMOD", - "ERS.ne16_ne16.FC5MAM4", - "ERS_IOP_Ld3.f19_f19.FAMIPC5", - "ERS_Ld3.ne16_g37.FC5", - "ERS_Ld3.ne30_ne30.FC5", #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset - ("PET_Ln9.ne30_ne30.FC5", "cam-outfrq9s"), "PET.f19_g16.X", "PET.f45_g37_rx1.A", "PET_Ln9.ne30_oECv3_ICG.A_WCYCL1850S", @@ -145,22 +128,7 @@ "ERP_Ld3.ne30_oECv3_ICG.A_WCYCL1850S", "SEQ_IOP.f19_g16.X", "SMS.ne30_oECv3_ICG.A_WCYCL1850S", - "SMS.ne16_ne16.FC5AQUAP", - "SMS_D_Ld3.ne16_ne16.FC5", - "SMS.f09_g16_a.MPASLIALB", - "ERS.ne16_ne16.FC5ATMMOD", - "ERS_Ld5.ne16_ne16.FC5AV1F", - "ERS_Ld5.ne16_ne16.FC5AV1C", - "ERS_Ld5.ne16_ne16.FC5AV1C-01", - "ERS_Ld5.ne16_ne16.FC5AV1C-02", - "ERS_Ld5.ne16_ne16.FC5AV1C-03", - "ERS_Ld5.ne16_ne16.FC5AV1C-04", - "ERS_Ld5.ne16_ne16.FC5ATMMODCOSP", - "ERS_Ld5.ne30_oEC.F1850C5AV1C-02", - "ERS_Ld5.ne16_ne16.F1850C5AV1C-04", - "ERS_Ld5.ne16_ne16.F20TRC5AV1C-03", - "ERP_Ld5_P8x4.ne4_ne4.FC5AV1C-04P2", - "SMS_D_Ld1.ne16_ne16.FC5ATMMODCOSP") + "SMS.f09_g16_a.MPASLIALB") ), } From 3eec7c3ca0e30c35932023d5852e42bd581bfbb3 Mon Sep 17 00:00:00 2001 From: Balwinder Date: Tue, 27 Jun 2017 17:06:22 -0400 Subject: [PATCH 2/4] Adds a test to acme developer which writes history files [BFB] - Bit-For-Bit --- scripts/lib/update_acme_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/lib/update_acme_tests.py b/scripts/lib/update_acme_tests.py index 18655915d7e..ceebddf2ddb 100644 --- a/scripts/lib/update_acme_tests.py +++ b/scripts/lib/update_acme_tests.py @@ -78,6 +78,7 @@ "acme_atm_developer" : (None, None, ("SMS_D_Ln5.ne4_ne4.FC5", ("ERP_Ln9.ne4_ne4.FC5AV1C-L", "cam-rtm_null"), + ("SMS_Ln9.ne4_ne4.FC5AV1C-L", "cam-outfrq9s"), "SMS_D_Ln5.ne4_ne4.FC5AV1C-L") ), From 2a4a2abf98120ae02d528c5c1b495f314ebf8c5c Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Wed, 5 Jul 2017 12:04:35 -0700 Subject: [PATCH 3/4] Adds new SCM test and modifies ERS_Lm1 to ERS_Ld31 I also changed some ERS tests to ERP and vice versa. [BFB] - Bit-For-Bit --- scripts/lib/update_acme_tests.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/lib/update_acme_tests.py b/scripts/lib/update_acme_tests.py index ceebddf2ddb..504b7f049c0 100644 --- a/scripts/lib/update_acme_tests.py +++ b/scripts/lib/update_acme_tests.py @@ -77,13 +77,14 @@ "acme_atm_developer" : (None, None, ("SMS_D_Ln5.ne4_ne4.FC5", - ("ERP_Ln9.ne4_ne4.FC5AV1C-L", "cam-rtm_null"), + ("ERS_Ln9.ne4_ne4.FC5AV1C-L", "cam-rtm_null"), ("SMS_Ln9.ne4_ne4.FC5AV1C-L", "cam-outfrq9s"), + "SMS_R_Ld5.T42_T42.FSCM5A97", "SMS_D_Ln5.ne4_ne4.FC5AV1C-L") ), "acme_atm_integration" : (None, None, - (("ERP_Ln9.ne4_ne4.FC5", "cam-rtm_null"), + (("ERS_Ln9.ne4_ne4.FC5", "cam-rtm_null"), "ERP_Ln9.ne4_ne4.FC5AQUAP", "PET_Ln5.ne4_ne4.FC5AV1C-L", "PEM_Ln5.ne4_ne4.FC5AV1C-L", @@ -93,8 +94,8 @@ "acme_atm_weekly" : (None, None, ("SMS_Lm1.ne4_ne4.FC5AV1C-L", - "ERS_Lm1.ne4_ne4.FC5AV1C-L", - "ERS_Lm3.ne4_ne4.FC5AV1C-L", + "ERS_Ld31.ne4_ne4.FC5AV1C-L", + "ERP_Lm3.ne4_ne4.FC5AV1C-L", "SMS_Ly1.ne4_ne4.FC5AV1C-L") ), From bc29b6e45f13946208c7d38a612be8299654549e Mon Sep 17 00:00:00 2001 From: James Foucar Date: Fri, 7 Jul 2017 15:59:42 -0600 Subject: [PATCH 4/4] Remove duplicated test --- scripts/lib/update_acme_tests.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/lib/update_acme_tests.py b/scripts/lib/update_acme_tests.py index 5836aac8c3f..fb357bd0818 100644 --- a/scripts/lib/update_acme_tests.py +++ b/scripts/lib/update_acme_tests.py @@ -116,8 +116,7 @@ "ERS_Ld5.T62_oQU120.CMPASO-NYF", "ERS.f09_g16_g.MPASLISIA", "SMS.T62_oQU120_ais20.MPAS_LISIO_TEST", - "SMS.f09_g16_a.IGCLM45_MLI", - "SMS_R_Ld5.T42_T42.FSCM5A97") + "SMS.f09_g16_a.IGCLM45_MLI") ), "acme_integration" : (("acme_developer", "acme_atm_integration"),"03:00:00",