Skip to content

Commit

Permalink
Merge branch 'singhbalwinder/atm/atm-tests-1' (PR #1602)
Browse files Browse the repository at this point in the history 
Revamps atm tests in acme developer and integration testing suites

This PR replaces all the atm tests with new tests which use a very
coarse (ne4) grid. This should make these tests to run much faster.
I am still working on some more tests which will be included when they
work stably on multiple machines.

More on timings and tests can be found on the following confluence page:

https://acme-climate.atlassian.net/wiki/display/SE/
Atmospheric+Tests+-++Testing+Suites

Following changes are also added to this PR:

    Added a missing ne4 with 30 level NCDATA file was added for the
    FC5 compset.
    Modified build-namelist script so that it print error messages
    from the perl scripts (thanks Jim Foucar!)

[BFB] - Bit-For-Bit

* origin/singhbalwinder/atm/atm-tests-1:
  Remove duplicated test
  Adds new SCM test and modifies ERS_Lm1 to ERS_Ld31
  Adds a test to acme developer which writes history files
  Adds atm suites and reorganized acme developer and integration suites
  Modified atm and lnd namelist defaults to run FC5 with ne4
  • Loading branch information
@jgfouca
jgfouca committed Jul 13, 2017
2 parents 3712ed5 + bc29b6e commit 1f7265a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 58 deletions.
2 changes: 1 addition & 1 deletion scripts/lib/CIME/preview_namelists.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
82 changes: 25 additions & 57 deletions scripts/lib/update_acme_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,30 @@
),

"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",
("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_developer" : ("acme_land_developer", "0:45:00",
"acme_atm_integration" : (None, None,
(("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",
("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_Ld31.ne4_ne4.FC5AV1C-L",
"ERP_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",
Expand All @@ -104,65 +111,26 @@
"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_R_Ld5.T42_T42.FSCM5A97")
"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",
"PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S",
"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")
),
}

Expand Down

0 comments on commit 1f7265a

Please sign in to comment.