From 2f96813e8ca09fe0bd805326354462348091c4cc Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Wed, 29 Mar 2017 13:24:08 -0700 Subject: [PATCH 01/10] modify files for support for LC machines --- cime/config/acme/machines/config_batch.xml | 27 ++++- .../config/acme/machines/config_compilers.xml | 46 ++++++++ cime/config/acme/machines/config_machines.xml | 108 ++++++++++++++---- .../scripts/lib/CIME/XML/env_mach_specific.py | 54 ++++++++- .../mct/cime_config/config_component.xml | 2 +- 5 files changed, 207 insertions(+), 30 deletions(-) diff --git a/cime/config/acme/machines/config_batch.xml b/cime/config/acme/machines/config_batch.xml index b6b4f5c53106..8eb2d286d738 100644 --- a/cime/config/acme/machines/config_batch.xml +++ b/cime/config/acme/machines/config_batch.xml @@ -130,11 +130,34 @@ -S {{ shell }} + + + + msub + #MSUB + (\d+)$ + -l depend=jobid + %H:%M:%S + + -V + -q {{ job_queue }} + -N {{ job_id }} + -l nodes={{ num_nodes }}:ppn={{ tasks_per_node }} + -l walltime={{ job_wallclock_time }} + -o {{ output_error_path }}.out + -e {{ output_error_path }}.err + -m be + -A {{ project }} + + + pbatch + + squeue - sbatch - #SBATCH + msub + #MSUB (\d+)$ --dependency=afterok:jobid %H:%M:%S diff --git a/cime/config/acme/machines/config_compilers.xml b/cime/config/acme/machines/config_compilers.xml index 9c9c205be12b..5b2267f7738e 100644 --- a/cime/config/acme/machines/config_compilers.xml +++ b/cime/config/acme/machines/config_compilers.xml @@ -749,6 +749,52 @@ for mct, etc. -D_USE_FLOW_CONTROL + + /usr/local/tools/netcdf-pgi-4.1.3 + /usr/local/tools/mvapich2-pgi-1.7/ + mpich + -DNO_SHR_VMATH -DCNL + $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs) + -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib -llapack -lblas + + + + -O2 + -O2 + /usr/local/tools/netcdf-intel-4.1.3 + /usr/local/tools/parallel-netcdf-intel-1.6.1 + --host=Linux + /usr/local/tools/mvapich2-intel-2.1/ + mpich + -DNO_SHR_VMATH -DCNL + -g -traceback -O0 -fpe0 -check all -check noarg_temp_created -ftrapuv + $(shell /usr/local/tools/netcdf-intel-4.1.3/bin/nc-config --flibs) + -llapack -lblas + + + + /usr/local/tools/netcdf-pgi-4.1.3 + /usr/local/tools/mvapich2-pgi-1.7/ + mpich + -DNO_SHR_VMATH -DCNL + $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs) + -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib -llapack -lblas + + + + -O2 + -O2 + /usr/local/tools/netcdf-intel-4.1.3 + /usr/local/tools/parallel-netcdf-intel-1.6.1 + --host=Linux + /usr/local/tools/mvapich2-intel-2.1/ + mpich + -DNO_SHR_VMATH -DCNL + -g -traceback -O0 -fpe0 -check all -check noarg_temp_created -ftrapuv + $(shell /usr/local/tools/netcdf-intel-4.1.3/bin/nc-config --flibs) + -llapack -lblas + + /projects/cesm/devtools/netcdf-4.1.3-gcc4.8.1-mpich3.0.4/ -L/user/lib64 -llapack -lblas -lnetcdff diff --git a/cime/config/acme/machines/config_machines.xml b/cime/config/acme/machines/config_machines.xml index 8f434727e6a7..a4ff1684f5fe 100644 --- a/cime/config/acme/machines/config_machines.xml +++ b/cime/config/acme/machines/config_machines.xml @@ -1076,44 +1076,102 @@ - - LLNL Linux Cluster, Linux (pgi), 12 pes/node, batch system is Moab + + LLNL Linux Cluster, Linux (pgi), 16 pes/node, batch system is Slurm intel, pgi mpich,mpi-serial /p/lscratche/$CCSMUSER/ACME/$CASE/run /p/lscratche/$CCSMUSER/$CASE/bld /p/lscratche/$USER - /p/lscratchd/ma21/ccsm3data/inputdata - /p/lscratchd/ma21/ccsm3data/inputdata/atm/datm7 + /usr/gdata/climdat/ccsm3data/inputdata + /usr/gdata/climdat/ccsm3data/inputdata/atm/datm7 /p/lscratche/$CCSMUSER/archive/$CASE FALSE UNSET /p/lscratchd/$CCSMUSER/ccsm_baselines /p/lscratchd/ma21/ccsm3data/tools/cprnc/cprnc LINUX - mshow - msub - wlin -at- bnl.gov 8 - 12 - - - pbatch - - - walltime=01:00:00 - - - - srun - - -N {{ num_nodes }} - - - - - + 16 + 16 + lc_slurm + + srun + + + use + use + /usr/global/tools/dotkit/init.csh + /usr/global/tools/dotkit/init.sh + + pgi-14.3 + mvapich2-pgi-1.7 + netcdf-pgi-4.1.3 + + + ic-14.0.211 + mvapich2-intel-2.1 + netcdf-intel-4.1.3 + + + + /usr/local/tools/netcdf-pgi-4.1.3/ + /usr/local/tools/parallel-netcdf-pgi-1.6.1/ + + + /usr/local/tools/netcdf-intel-4.1.3/ + /usr/local/tools/parallel-netcdf-intel-1.6.1/ + + + + + LLNL Linux Cluster, Linux (pgi), 16 pes/node, batch system is Slurm + intel,pgi + mpich,mpi-serial + /p/lscratche/$CCSMUSER/ACME/$CASE/run + /p/lscratche/$CCSMUSER/$CASE/bld + /p/lscratche/$USER + /usr/gdata/climdat/ccsm3data/inputdata + /usr/gdata/climdat/ccsm3data/inputdata/atm/datm7 + /p/lscratche/$CCSMUSER/archive/$CASE + FALSE + UNSET + /p/lscratchd/$CCSMUSER/ccsm_baselines + /p/lscratchd/ma21/ccsm3data/tools/cprnc/cprnc + LINUX + wlin -at- bnl.gov + 8 + 16 + 16 + lc_slurm + + srun + + + use + use + /usr/global/tools/dotkit/init.csh + /usr/global/tools/dotkit/init.sh + + pgi-14.3 + mvapich2-pgi-1.7 + netcdf-pgi-4.1.3 + + + ic-14.0.211 + mvapich2-intel-2.1 + netcdf-intel-4.1.3 + + + + /usr/local/tools/netcdf-pgi-4.1.3/ + /usr/local/tools/parallel-netcdf-pgi-1.6.1/ + + + /usr/local/tools/netcdf-intel-4.1.3/ + /usr/local/tools/parallel-netcdf-intel-1.6.1/ + diff --git a/cime/scripts/lib/CIME/XML/env_mach_specific.py b/cime/scripts/lib/CIME/XML/env_mach_specific.py index b3efbb54bba9..7d8fac4575ed 100644 --- a/cime/scripts/lib/CIME/XML/env_mach_specific.py +++ b/cime/scripts/lib/CIME/XML/env_mach_specific.py @@ -281,8 +281,58 @@ def _load_soft_modules(self, modules_to_load): else: os.environ[key] = newenv[key] - def _load_dotkit_modules(self, _): - expect(False, "Not yet implemented") + def _load_dotkit_modules(self, modules_to_load): + sh_init_cmd = self.get_module_system_init_path("sh") + sh_mod_cmd = self.get_module_system_cmd_path("sh") + + # Load dotkit modules, similar to soft module load + + cmd = "source %s" % sh_init_cmd + + if os.environ.has_key("SOFTENV_ALIASES"): + cmd += " && source $SOFTENV_ALIASES" + if os.environ.has_key("SOFTENV_LOAD"): + cmd += " && source $SOFTENV_LOAD" + + for action,argument in modules_to_load: + cmd += " && %s %s %s" % (sh_mod_cmd, action, argument) + + cmd += " && env" + output = run_cmd_no_fail(cmd) + + ################################################### + # Parse the output to set the os.environ dictionary + ################################################### + newenv = {} + dolater = [] + for line in output.splitlines(): + if line.find('$')>0: + dolater.append(line) + continue + + m=re.match(r'^(\S+)=(\S+)\s*;*\s*$',line) + if m: + key = m.groups()[0] + val = m.groups()[1] + newenv[key] = val + + # Now that initial newenv has been set, resolve variables + for line in dolater: + m=re.match(r'^(\S+)=(\S+)\s*;*\s*$',line) + if m: + key = m.groups()[0] + valunresolved = m.groups()[1] + val = string.Template(valunresolved).safe_substitute(newenv) + expect(val is not None, + 'string value %s unable to be resolved' % valunresolved) + newenv[key] = val + + # Set environment with new or updated values + for key in newenv: + if key in os.environ and key not in newenv: + del(os.environ[key]) + else: + os.environ[key] = newenv[key] def _load_none_modules(self, modules_to_load): """ diff --git a/cime/src/drivers/mct/cime_config/config_component.xml b/cime/src/drivers/mct/cime_config/config_component.xml index 943725f081fd..ea89829825f1 100644 --- a/cime/src/drivers/mct/cime_config/config_component.xml +++ b/cime/src/drivers/mct/cime_config/config_component.xml @@ -544,7 +544,7 @@ char none - moab,pbs,lsf,slurm,cobalt,cobalt_theta,none + lc_slurm,moab,pbs,lsf,slurm,cobalt,cobalt_theta,none config_batch env_batch.xml The batch system type to use for this machine. From 0cda7f49c8ac2e87ecf542ba0f50ae97412082fb Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Tue, 4 Apr 2017 08:42:00 -0700 Subject: [PATCH 02/10] updates to allow ACME to run on LC --- cime/config/acme/machines/config_compilers.xml | 2 +- cime/config/acme/machines/config_machines.xml | 2 ++ cime/src/externals/pio1/pio/pionfput_mod.F90.in | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cime/config/acme/machines/config_compilers.xml b/cime/config/acme/machines/config_compilers.xml index 5b2267f7738e..aa1b49faafd0 100644 --- a/cime/config/acme/machines/config_compilers.xml +++ b/cime/config/acme/machines/config_compilers.xml @@ -273,7 +273,7 @@ for mct, etc. -openmp -openmp -openmp - -free + -fixed -132 ic-14.0.211 mvapich2-intel-2.1 netcdf-intel-4.1.3 + diff --git a/cime/src/externals/pio1/pio/pionfput_mod.F90.in b/cime/src/externals/pio1/pio/pionfput_mod.F90.in index 1ce9353ba2aa..0608f1e55d17 100644 --- a/cime/src/externals/pio1/pio/pionfput_mod.F90.in +++ b/cime/src/externals/pio1/pio/pionfput_mod.F90.in @@ -697,9 +697,11 @@ contains #endif #endif #ifdef _NETCDF +#ifdef _NETCDF4 case(pio_iotype_netcdf4p) ierr=nf90_var_par_access(File%fh, varid, NF90_COLLECTIVE) ierr = nf90_put_var(File%fh, varid, ival, start=int(pstart), count=int(pcount)) +#endif case(pio_iotype_netcdf, pio_iotype_netcdf4c) ! Only io proc 0 will do writing if (Ios%io_rank == 0) then From 475cfa6a03a441e185acab7d16b540979f39481b Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Tue, 4 Apr 2017 11:38:55 -0700 Subject: [PATCH 03/10] Code clean ups --- cime/config/acme/machines/config_compilers.xml | 2 +- cime/config/acme/machines/config_machines.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cime/config/acme/machines/config_compilers.xml b/cime/config/acme/machines/config_compilers.xml index aa1b49faafd0..5b2267f7738e 100644 --- a/cime/config/acme/machines/config_compilers.xml +++ b/cime/config/acme/machines/config_compilers.xml @@ -273,7 +273,7 @@ for mct, etc. -openmp -openmp -openmp - + -free -fixed -132 ic-14.0.211 mvapich2-intel-2.1 netcdf-intel-4.1.3 - From acb0c14c3fd1e37666064abdf122de2a51f2375c Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Tue, 18 Apr 2017 16:05:48 -0700 Subject: [PATCH 04/10] modifications for PR review --- cime/config/acme/machines/config_machines.xml | 6 ++++-- cime/scripts/lib/CIME/XML/env_mach_specific.py | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cime/config/acme/machines/config_machines.xml b/cime/config/acme/machines/config_machines.xml index a4ff1684f5fe..15bfc0797207 100644 --- a/cime/config/acme/machines/config_machines.xml +++ b/cime/config/acme/machines/config_machines.xml @@ -1096,10 +1096,11 @@ 16 16 lc_slurm + /usr/gdata/climdat/timing_performance srun - + use use /usr/global/tools/dotkit/init.csh @@ -1145,10 +1146,11 @@ 16 16 lc_slurm + /usr/gdata/climdat/timing_performance srun - + use use /usr/global/tools/dotkit/init.csh diff --git a/cime/scripts/lib/CIME/XML/env_mach_specific.py b/cime/scripts/lib/CIME/XML/env_mach_specific.py index 7d8fac4575ed..ac77e42dd3e4 100644 --- a/cime/scripts/lib/CIME/XML/env_mach_specific.py +++ b/cime/scripts/lib/CIME/XML/env_mach_specific.py @@ -88,8 +88,8 @@ def load_modules(self, modules_to_load): self._load_module_modules(modules_to_load) elif (module_system == "soft"): self._load_soft_modules(modules_to_load) - elif (module_system == "dotkit"): - self._load_dotkit_modules(modules_to_load) + elif (module_system == "generic"): + self._load_modules_generic(modules_to_load) elif (module_system == "none"): self._load_none_modules(modules_to_load) else: @@ -112,7 +112,7 @@ def list_modules(self): elif (module_system == "soft"): # Does soft really not provide this capability? return "" - elif (module_system == "dotkit"): + elif (module_system == "generic"): return run_cmd_no_fail("%suse -lv" % source_cmd) elif (module_system == "none"): return "" @@ -281,7 +281,7 @@ def _load_soft_modules(self, modules_to_load): else: os.environ[key] = newenv[key] - def _load_dotkit_modules(self, modules_to_load): + def _load_modules_generic(self, modules_to_load): sh_init_cmd = self.get_module_system_init_path("sh") sh_mod_cmd = self.get_module_system_cmd_path("sh") From 2a22d16e2d328bebace0c202c5904be3a9a7e58c Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Wed, 19 Apr 2017 10:01:54 -0700 Subject: [PATCH 05/10] remove white space --- cime/config/acme/machines/config_machines.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cime/config/acme/machines/config_machines.xml b/cime/config/acme/machines/config_machines.xml index 15bfc0797207..48ad9f8d894d 100644 --- a/cime/config/acme/machines/config_machines.xml +++ b/cime/config/acme/machines/config_machines.xml @@ -1091,7 +1091,7 @@ /p/lscratchd/$CCSMUSER/ccsm_baselines /p/lscratchd/ma21/ccsm3data/tools/cprnc/cprnc LINUX - wlin -at- bnl.gov + bogenschutz1 -at- llnl.gov 8 16 16 @@ -1128,20 +1128,20 @@ LLNL Linux Cluster, Linux (pgi), 16 pes/node, batch system is Slurm - intel,pgi + intel, pgi mpich,mpi-serial /p/lscratche/$CCSMUSER/ACME/$CASE/run /p/lscratche/$CCSMUSER/$CASE/bld - /p/lscratche/$USER + /p/lscratche/$USER /usr/gdata/climdat/ccsm3data/inputdata /usr/gdata/climdat/ccsm3data/inputdata/atm/datm7 /p/lscratche/$CCSMUSER/archive/$CASE FALSE UNSET - /p/lscratchd/$CCSMUSER/ccsm_baselines + /p/lscratchd/$CCSMUSER/ccsm_baselines /p/lscratchd/ma21/ccsm3data/tools/cprnc/cprnc LINUX - wlin -at- bnl.gov + bogenschutz1 -at- llnl.gov 8 16 16 From 0ad988aded448f17707241bcc040f59b0d5e374e Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Wed, 19 Apr 2017 13:15:27 -0700 Subject: [PATCH 06/10] add support for mpi-serial builds (for SCM) --- cime/config/acme/machines/config_compilers.xml | 2 -- cime/config/acme/machines/config_machines.xml | 14 ++++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cime/config/acme/machines/config_compilers.xml b/cime/config/acme/machines/config_compilers.xml index 5b2267f7738e..a1899b944ca4 100644 --- a/cime/config/acme/machines/config_compilers.xml +++ b/cime/config/acme/machines/config_compilers.xml @@ -762,7 +762,6 @@ for mct, etc. -O2 -O2 /usr/local/tools/netcdf-intel-4.1.3 - /usr/local/tools/parallel-netcdf-intel-1.6.1 --host=Linux /usr/local/tools/mvapich2-intel-2.1/ mpich @@ -785,7 +784,6 @@ for mct, etc. -O2 -O2 /usr/local/tools/netcdf-intel-4.1.3 - /usr/local/tools/parallel-netcdf-intel-1.6.1 --host=Linux /usr/local/tools/mvapich2-intel-2.1/ mpich diff --git a/cime/config/acme/machines/config_machines.xml b/cime/config/acme/machines/config_machines.xml index 48ad9f8d894d..76d6c544cbd5 100644 --- a/cime/config/acme/machines/config_machines.xml +++ b/cime/config/acme/machines/config_machines.xml @@ -1097,6 +1097,9 @@ 16 lc_slurm /usr/gdata/climdat/timing_performance + + + srun @@ -1118,11 +1121,11 @@ /usr/local/tools/netcdf-pgi-4.1.3/ - /usr/local/tools/parallel-netcdf-pgi-1.6.1/ + /usr/local/tools/parallel-netcdf-pgi-1.6.1/ /usr/local/tools/netcdf-intel-4.1.3/ - /usr/local/tools/parallel-netcdf-intel-1.6.1/ + /usr/local/tools/parallel-netcdf-intel-1.6.1/ @@ -1147,6 +1150,9 @@ 16 lc_slurm /usr/gdata/climdat/timing_performance + + + srun @@ -1168,11 +1174,11 @@ /usr/local/tools/netcdf-pgi-4.1.3/ - /usr/local/tools/parallel-netcdf-pgi-1.6.1/ + /usr/local/tools/parallel-netcdf-pgi-1.6.1/ /usr/local/tools/netcdf-intel-4.1.3/ - /usr/local/tools/parallel-netcdf-intel-1.6.1/ + /usr/local/tools/parallel-netcdf-intel-1.6.1/ From 31b68bd2edcbb7f3cc51c97785ad581729320617 Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Thu, 4 May 2017 16:09:06 -0700 Subject: [PATCH 07/10] change soft to generic for PR approval --- .../scripts/lib/CIME/XML/env_mach_specific.py | 62 +------------------ 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/cime/scripts/lib/CIME/XML/env_mach_specific.py b/cime/scripts/lib/CIME/XML/env_mach_specific.py index ac77e42dd3e4..418efb57832e 100644 --- a/cime/scripts/lib/CIME/XML/env_mach_specific.py +++ b/cime/scripts/lib/CIME/XML/env_mach_specific.py @@ -87,7 +87,7 @@ def load_modules(self, modules_to_load): if (module_system == "module"): self._load_module_modules(modules_to_load) elif (module_system == "soft"): - self._load_soft_modules(modules_to_load) + self._load_modules_generic(modules_to_load) elif (module_system == "generic"): self._load_modules_generic(modules_to_load) elif (module_system == "none"): @@ -221,66 +221,6 @@ def _load_module_modules(self, modules_to_load): "module command %s failed with message:\n%s"%(cmd,errout)) exec(py_module_code) - def _load_soft_modules(self, modules_to_load): - sh_init_cmd = self.get_module_system_init_path("sh") - sh_mod_cmd = self.get_module_system_cmd_path("sh") - - # Some machines can set the environment - # variables using a script (such as /etc/profile.d/00softenv.sh - # on mira or /etc/profile.d/a_softenv.sh on blues) - # which load the new environment variables using softenv-load. - - # Other machines need to run soft-dec.sh and evaluate the output, - # which may or may not have unresolved variables such as - # PATH=/soft/com/packages/intel/16/initial/bin:${PATH} - - cmd = "source %s" % sh_init_cmd - - if os.environ.has_key("SOFTENV_ALIASES"): - cmd += " && source $SOFTENV_ALIASES" - if os.environ.has_key("SOFTENV_LOAD"): - cmd += " && source $SOFTENV_LOAD" - - for action,argument in modules_to_load: - cmd += " && %s %s %s" % (sh_mod_cmd, action, argument) - - cmd += " && env" - output = run_cmd_no_fail(cmd) - - ################################################### - # Parse the output to set the os.environ dictionary - ################################################### - newenv = {} - dolater = [] - for line in output.splitlines(): - if line.find('$')>0: - dolater.append(line) - continue - - m=re.match(r'^(\S+)=(\S+)\s*;*\s*$',line) - if m: - key = m.groups()[0] - val = m.groups()[1] - newenv[key] = val - - # Now that initial newenv has been set, resolve variables - for line in dolater: - m=re.match(r'^(\S+)=(\S+)\s*;*\s*$',line) - if m: - key = m.groups()[0] - valunresolved = m.groups()[1] - val = string.Template(valunresolved).safe_substitute(newenv) - expect(val is not None, - 'string value %s unable to be resolved' % valunresolved) - newenv[key] = val - - # Set environment with new or updated values - for key in newenv: - if key in os.environ and key not in newenv: - del(os.environ[key]) - else: - os.environ[key] = newenv[key] - def _load_modules_generic(self, modules_to_load): sh_init_cmd = self.get_module_system_init_path("sh") sh_mod_cmd = self.get_module_system_cmd_path("sh") From 5f3d09a6cccd59dddde83d43db1ce28a44fffd8d Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Wed, 10 May 2017 13:13:39 -0700 Subject: [PATCH 08/10] update comments for generic module load --- cime/scripts/lib/CIME/XML/env_mach_specific.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cime/scripts/lib/CIME/XML/env_mach_specific.py b/cime/scripts/lib/CIME/XML/env_mach_specific.py index 418efb57832e..3fd33be17052 100644 --- a/cime/scripts/lib/CIME/XML/env_mach_specific.py +++ b/cime/scripts/lib/CIME/XML/env_mach_specific.py @@ -225,7 +225,10 @@ def _load_modules_generic(self, modules_to_load): sh_init_cmd = self.get_module_system_init_path("sh") sh_mod_cmd = self.get_module_system_cmd_path("sh") - # Load dotkit modules, similar to soft module load + # Purpose is for environment management system that does not have + # a python interface and therefore can only determine what they + # do by running shell command and looking at the changes + # in the environment. cmd = "source %s" % sh_init_cmd From d3dde85693689acd2aad4a67cfc6632ee7741740 Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Wed, 10 May 2017 15:04:01 -0700 Subject: [PATCH 09/10] remove whitespace --- cime/scripts/lib/CIME/XML/env_mach_specific.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cime/scripts/lib/CIME/XML/env_mach_specific.py b/cime/scripts/lib/CIME/XML/env_mach_specific.py index 3fd33be17052..709ea5aa6481 100644 --- a/cime/scripts/lib/CIME/XML/env_mach_specific.py +++ b/cime/scripts/lib/CIME/XML/env_mach_specific.py @@ -226,9 +226,9 @@ def _load_modules_generic(self, modules_to_load): sh_mod_cmd = self.get_module_system_cmd_path("sh") # Purpose is for environment management system that does not have - # a python interface and therefore can only determine what they - # do by running shell command and looking at the changes - # in the environment. + # a python interface and therefore can only determine what they + # do by running shell command and looking at the changes + # in the environment. cmd = "source %s" % sh_init_cmd From 84d585fc4067633c3bdef8ad6c3fe7dccf1d5734 Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Mon, 15 May 2017 15:34:50 -0700 Subject: [PATCH 10/10] revert unintended change to slurm --- cime/config/acme/machines/config_batch.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime/config/acme/machines/config_batch.xml b/cime/config/acme/machines/config_batch.xml index 8eb2d286d738..d7afe2a13353 100644 --- a/cime/config/acme/machines/config_batch.xml +++ b/cime/config/acme/machines/config_batch.xml @@ -156,8 +156,8 @@ squeue - msub - #MSUB + sbatch + #SBATCH (\d+)$ --dependency=afterok:jobid %H:%M:%S