Skip to content

Commit

Permalink
Merge branch 'izumi'
Browse files Browse the repository at this point in the history
Move hobart tests to izumi
  • Loading branch information
billsacks committed Sep 4, 2019
2 parents 1239f17 + e9b7d2b commit c152cc1
Show file tree
Hide file tree
Showing 10 changed files with 185 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Testing performed, if any:
(List what testing you did to show your changes worked as expected)
(This can be manual testing or running of the different test suites)
(Documentation on system testing is here: https://github.com/ESCOMP/ctsm/wiki/System-Testing-Guide)
(aux_clm on cheyenne for gnu/pgi and hobart for gnu/pgi/nag is the standard for tags on master)
(aux_clm on cheyenne for intel/gnu and izumi for intel/gnu/nag/pgi is the standard for tags on master)

**NOTE: Be sure to check your Coding style against the standard:**
https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ required = True
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime
tag = branch_tags/cime5.8.3_chint17-04
tag = branch_tags/cime5.8.3_chint17-05
required = True

[externals_description]
Expand Down
2 changes: 1 addition & 1 deletion cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@
</mach>
</grid>
<grid name="l%10x15">
<mach name="hobart">
<mach name="hobart|izumi">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
Expand Down
14 changes: 0 additions & 14 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,6 @@
</phase>
</test>

<test name="SMS.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop">
<phase name="RUN">
<status>FAIL</status>
<issue>#442</issue>
</phase>
</test>

<test name="SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop">
<phase name="RUN">
<status>FAIL</status>
<issue>#442</issue>
</phase>
</test>

<test name="ERS_D_Ln9_P480x3.f19_g16.I2000Clm50SpGs.cheyenne_intel.clm-waccmx_offline">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
Expand Down
Loading

0 comments on commit c152cc1

Please sign in to comment.