Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed grids from FV to SE for 6 tests in acme integration test suite #307

Merged
merged 1 commit into from
Aug 29, 2015
+147 −127
Merged

Changed grids from FV to SE for 6 tests in acme integration test suite #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions scripts/acme/update_acme_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@
'SMS.f19_f19.I1850CLM45CN']
),
"acme_integration" : ("acme_developer",
["ERB.f19_g16.B1850C5",
["ERB.ne16_g37.B1850C5",
"ERB.f45_g37.B1850C5",
"ERH.f45_g37.B1850C5",
"ERS.f09_g16.B1850C5",
"ERS.ne30_g16.B1850C5",
"ERS.f19_f19.FAMIPC5",
"ERS.f19_g16.B1850C5",
"ERS.ne16_g37.B1850C5",
"ERS_D.f45_g37.B1850C5",
"ERS_IOP_Ld3.f19_f19.FAMIPC5",
"ERS_Ld3.f19_g16.FC5",
"ERS_Ld3.ne16_g37.FC5",
"ERS_Ld3.ne30_ne30.FC5",
"ERT.f19_g16.B1850C5",
"ERT.ne16_g37.B1850C5",
"PET_PT.f19_g16.X",
"PET_PT.f45_g37_rx1.A",
"PFS.ne30_ne30.FC5",
"SEQ_IOP_PFC.f19_g16.X",
"SEQ_PFC.f45_g37.B1850C5",
"SMS.ne16_ne16.FC5AQUAP",
"SMS_D.f19_g16.B20TRC5",
"SMS_D_Ld3.f19_f19.FC5"]
"SMS_D_Ld3.ne16_ne16.FC5"]
),
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/ccsm_utils/Machines/mkbatch.cascade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ if ( $ntasks % ${MAX_TASKS_PER_NODE} > 0) then
endif
@ taskpernode = ${MAX_TASKS_PER_NODE} / ${maxthrds}
set qname = batch
set tlimit = "00:59:00"
if ($CCSM_ESTCOST > 2) set tlimit = "00:59:00"
set tlimit = "07:59:00"
if ($CCSM_ESTCOST > 2) set tlimit = "07:59:00"

if ($?TESTMODE) then
set file = $CASEROOT/${CASE}.test
Expand Down
Loading