Skip to content

Commit

Permalink
Add two extra I-Cases into acme test suite
Browse files Browse the repository at this point in the history 
Add an I1850CLM45CN case on f09_g16 grid and
    an I1850CRUCLM45CN case on hcru_hcru grid

more information can be found on "Add two extra I_Cases
into acem test suite" on confluence

We also changed the default machine size to 64 for testing purpose

   modified:   scripts/acme/update_acme_tests.py
   modified:   scripts/ccsm_utils/Machines/config_pes.xml
   modified:   scripts/ccsm_utils/Testlistxml/testlist.xml

[Non-BFB]

LG-9 and SEG-67
  • Loading branch information
@daliwang
daliwang committed Aug 19, 2015
1 parent e230467 commit 39d0616
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 4 deletions.
8 changes: 6 additions & 2 deletions scripts/acme/update_acme_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
'NCK.f19_g16_rx1.A',
'PEA_P1_M.f45_g37_rx1.A',
'SMS.ne30_f19_g16_rx1.A',
'SMS.f19_f19.I1850CLM45CN']
'SMS.f19_f19.I1850CLM45CN',
'SMS.f09_g16.I1850CLM45CN',
'SMS.hcru_hcru.I1850CRUCLM45CN']
),
"acme_integration" : ("acme_developer",
["ERB.f19_g16.B1850C5",
Expand All @@ -47,7 +49,9 @@
"SEQ_PFC.f45_g37.B1850C5",
"SMS.ne16_ne16.FC5AQUAP",
"SMS_D.f19_g16.B20TRC5",
"SMS_D_Ld3.f19_f19.FC5"]
"SMS_D_Ld3.f19_f19.FC5",
"SMS.f09_g16.I1850CLM45CN",
"SMS.hcru_hcru.I1850CRUCLM45CN"]
),
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/ccsm_utils/Machines/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
</pes>

<pes GRID="a%0.9x1.25">
<NTASKS_ATM>128</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
<NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
<PES_LEVEL>1r</PES_LEVEL>
</pes>

Expand All @@ -439,7 +439,7 @@
</pes>

<pes GRID="a%360x720cru" >
<NTASKS_ATM>384</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM> <NINST_ATM>1</NINST_ATM>
<NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM> <NINST_ATM>1</NINST_ATM>
<PES_LEVEL>1r</PES_LEVEL>
</pes>

Expand Down
78 changes: 78 additions & 0 deletions scripts/ccsm_utils/Testlistxml/testlist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4471,6 +4471,44 @@
<test name="SBN">
<machine compiler="null" testtype="null">null</machine>
</test>
<test name="SMS">
<machine compiler="gnu" testtype="acme_developer">blues</machine>
<machine compiler="intel" testtype="acme_developer">blues</machine>
<machine compiler="pgi" testtype="acme_developer">blues</machine>
<machine compiler="pgi" testtype="acme_developer">bluewaters</machine>
<machine compiler="intel" testtype="acme_developer">cascade</machine>
<machine compiler="nag" testtype="acme_developer">cascade</machine>
<machine compiler="ibm" testtype="acme_developer">cetus</machine>
<machine compiler="pgi" testtype="acme_developer">eastwind</machine>
<machine compiler="intel" testtype="acme_developer">edison</machine>
<machine compiler="intel" testtype="acme_developer">eos</machine>
<machine compiler="intel" testtype="acme_developer">evergreen</machine>
<machine compiler="intel" testtype="acme_developer">goldbach</machine>
<machine compiler="nag" testtype="acme_developer">goldbach</machine>
<machine compiler="pgi" testtype="acme_developer">goldbach</machine>
<machine compiler="gnu" testtype="acme_developer">hopper</machine>
<machine compiler="intel" testtype="acme_developer">hopper</machine>
<machine compiler="pgi" testtype="acme_developer">hopper</machine>
<machine compiler="intel" testtype="acme_developer">janus</machine>
<machine compiler="intel" testtype="acme_developer">lawrencium-lr2</machine>
<machine compiler="gnu" testtype="acme_developer">linux-generic</machine>
<machine compiler="gnu" testtype="acme_developer">mac</machine>
<machine compiler="gnu" testtype="acme_developer">melvin</machine>
<machine compiler="ibm" testtype="acme_developer">mira</machine>
<machine compiler="gnu" testtype="acme_developer">mustang</machine>
<machine compiler="intel" testtype="acme_developer">mustang</machine>
<machine compiler="pgi" testtype="acme_developer">olympus</machine>
<machine compiler="gnu" testtype="acme_developer">penn</machine>
<machine compiler="intel" testtype="acme_developer">redsky</machine>
<machine compiler="intel" testtype="acme_developer">skybridge</machine>
<machine compiler="intel" testtype="acme_developer">titan</machine>
<machine compiler="pgi" testtype="acme_developer">titan</machine>
<machine compiler="gnu" testtype="acme_developer">wolf</machine>
<machine compiler="intel" testtype="acme_developer">wolf</machine>
<machine compiler="gnu" testtype="acme_developer">yellowstone</machine>
<machine compiler="intel" testtype="acme_developer">yellowstone</machine>
<machine compiler="pgi" testtype="acme_developer">yellowstone</machine>
</test>
</grid>
<grid name="f19_f19">
<test name="SMS">
Expand Down Expand Up @@ -4637,6 +4675,46 @@
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
</test>
</grid>
<grid name="hcru_hcru">
<test name="SMS">
<machine compiler="gnu" testtype="acme_developer">blues</machine>
<machine compiler="intel" testtype="acme_developer">blues</machine>
<machine compiler="pgi" testtype="acme_developer">blues</machine>
<machine compiler="pgi" testtype="acme_developer">bluewaters</machine>
<machine compiler="intel" testtype="acme_developer">cascade</machine>
<machine compiler="nag" testtype="acme_developer">cascade</machine>
<machine compiler="ibm" testtype="acme_developer">cetus</machine>
<machine compiler="pgi" testtype="acme_developer">eastwind</machine>
<machine compiler="intel" testtype="acme_developer">edison</machine>
<machine compiler="intel" testtype="acme_developer">eos</machine>
<machine compiler="intel" testtype="acme_developer">evergreen</machine>
<machine compiler="intel" testtype="acme_developer">goldbach</machine>
<machine compiler="nag" testtype="acme_developer">goldbach</machine>
<machine compiler="pgi" testtype="acme_developer">goldbach</machine>
<machine compiler="gnu" testtype="acme_developer">hopper</machine>
<machine compiler="intel" testtype="acme_developer">hopper</machine>
<machine compiler="pgi" testtype="acme_developer">hopper</machine>
<machine compiler="intel" testtype="acme_developer">janus</machine>
<machine compiler="intel" testtype="acme_developer">lawrencium-lr2</machine>
<machine compiler="gnu" testtype="acme_developer">linux-generic</machine>
<machine compiler="gnu" testtype="acme_developer">mac</machine>
<machine compiler="gnu" testtype="acme_developer">melvin</machine>
<machine compiler="ibm" testtype="acme_developer">mira</machine>
<machine compiler="gnu" testtype="acme_developer">mustang</machine>
<machine compiler="intel" testtype="acme_developer">mustang</machine>
<machine compiler="pgi" testtype="acme_developer">olympus</machine>
<machine compiler="gnu" testtype="acme_developer">penn</machine>
<machine compiler="intel" testtype="acme_developer">redsky</machine>
<machine compiler="intel" testtype="acme_developer">skybridge</machine>
<machine compiler="intel" testtype="acme_developer">titan</machine>
<machine compiler="pgi" testtype="acme_developer">titan</machine>
<machine compiler="gnu" testtype="acme_developer">wolf</machine>
<machine compiler="intel" testtype="acme_developer">wolf</machine>
<machine compiler="gnu" testtype="acme_developer">yellowstone</machine>
<machine compiler="intel" testtype="acme_developer">yellowstone</machine>
<machine compiler="pgi" testtype="acme_developer">yellowstone</machine>
</test>
</grid>
</compset>
<compset name="I1850SPINUPCLM45BGC">
<grid name="hcru_hcru">
Expand Down

0 comments on commit 39d0616

Please sign in to comment.