Skip to content

Commit

Permalink
Merge branch 'wilke/template/directives' (PR #324)
Browse files Browse the repository at this point in the history
This merge updates the ACME template files to put the batch directives in
the proper location for other batch systems that haven't been added to
the ACME machines yet (such as moab).

Test suite:
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

User interface changes?:

Code review: douglasjacobsen

* wilke/template/directives:
  moved batchdirectives to top of the template
  • Loading branch information
douglasjacobsen committed Aug 2, 2016
2 parents 5eea798 + d8f331c commit 0aceb94
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
5 changes: 3 additions & 2 deletions cime_config/acme/machines/template.case.run
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python

# Batch system directives
{{ batchdirectives }}

"""
template to create a case run script. This should only ever be called
by case.submit when on batch system. This script only exists as a way of providing
Expand All @@ -21,8 +24,6 @@ logger = logging.getLogger(__name__)

import argparse, doctest

# Batch system directives
{{ batchdirectives }}

# PE Layout Documentation:
{{ pedocumentation }}
Expand Down
5 changes: 3 additions & 2 deletions cime_config/acme/machines/template.lt_archive
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python

# Batch system directives
{{ batchdirectives }}

"""
template to create a case longterm term archiving script. This should only ever be called
by case.submit when on batch system. This script only exists as a way of providing
Expand All @@ -19,8 +22,6 @@ from CIME.case_lt_archive import case_lt_archive

logger = logging.getLogger(__name__)

# Batch system directives
{{ batchdirectives }}

###############################################################################
def parse_command_line(args, description):
Expand Down
5 changes: 3 additions & 2 deletions cime_config/acme/machines/template.st_archive
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python

# Batch system directives
{{ batchdirectives }}

"""
template to create a case short term archiving script. This should only ever be called
by case.submit when on batch system. This script only exists as a way of providing
Expand All @@ -18,8 +21,6 @@ from CIME.case_st_archive import case_st_archive

logger = logging.getLogger(__name__)

# Batch system directives
{{ batchdirectives }}

###############################################################################
def parse_command_line(args, description):
Expand Down

0 comments on commit 0aceb94

Please sign in to comment.