Merge pull request #340 from ESMCI/douglasjacobsen/fix_test_template

Add white space after batch directives in script templates
E3SM-Project · Aug 4, 2016 · e7b334e · e7b334e
2 parents e061505 + 43807a5
commit e7b334e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/cime_config/acme/machines/template.case.test b/cime_config/acme/machines/template.case.test
@@ -1,10 +1,14 @@
 #!/usr/bin/env python
+
+# Batch system directives
 {{ batchdirectives }}
+
 """
 This is the system test submit script for CIME. This should only ever be called
 by case.submit when on batch system. This script only exists as a way of providing
 batch directives. Use case.submit from the command line to run your case.
 """
+
 import os, sys
 os.chdir( '{{ caseroot }}')
 

diff --git a/cime_config/acme/machines/template.ocn_diagnostics b/cime_config/acme/machines/template.ocn_diagnostics
@@ -8,6 +8,7 @@
 #
 
 {{ batchdirectives }}
+
 mpirun={{ mpirun }}
 
 # xmlquery to get POSTPROCESS_VIRTUALENV, BATCHSUBMIT variable settings

diff --git a/cime_config/acme/machines/template.timeseries b/cime_config/acme/machines/template.timeseries
@@ -8,6 +8,7 @@
 #
 
 {_batchdirectives_}
+
 mpirun={_mpirun_}
 
 # xmlquery to get POSTPROCESS_VIRTUALENV, BATCHSUBMIT variable settings

diff --git a/cime_config/acme/machines/template.tseries_generate.pl b/cime_config/acme/machines/template.tseries_generate.pl
@@ -1,4 +1,11 @@
 #! /usr/bin/env perl
+
+#------------------------------------------------------------------------------
+# Batch system directives
+#------------------------------------------------------------------------------
+
+{{ batchdirectives }}
+
 use POSIX qw(strftime);
 use File::Path;
 use File::Copy;
@@ -14,10 +21,6 @@
 require ModuleLoader;
 
 
-#------------------------------------------------------------------------------
-# Batch system directives
-#------------------------------------------------------------------------------
-{{ batchdirectives }}
 #------------------------------------------------------------------------------
 # PE Layout Documentation:
 #------------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     #
     {{ batchdirectives }}
     mpirun={{ mpirun }}
     # xmlquery to get POSTPROCESS_VIRTUALENV, BATCHSUBMIT variable settings
@@ Expand Down @@