Skip to content

Commit

Permalink
Fixes support for LBL Lawrencium machines
Browse files Browse the repository at this point in the history
- Corrects the module command for language = python
- Remove the duplicate 'account' entry in the run script
  • Loading branch information
Gautam Bisht committed Feb 22, 2017
1 parent 2781fa9 commit 24e2f9f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 0 additions & 2 deletions cime_config/acme/machines/config_batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@
<batch_system MACH="lawrencium-lr2" type="slurm" version="x.y">
<directives>
<directive>--ntasks-per-node={{ tasks_per_node }}</directive>
<directive>--account={{ project }}</directive>
<directive>--exclusive</directive>
</directives>
<queues>
Expand All @@ -392,7 +391,6 @@
<batch_system MACH="lawrencium-lr3" type="slurm" version="x.y">
<directives>
<directive>--ntasks-per-node={{ tasks_per_node }}</directive>
<directive>--account={{ project }}</directive>
<directive>--exclusive</directive>
</directives>
<queues>
Expand Down
10 changes: 6 additions & 4 deletions cime_config/acme/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2043,14 +2043,15 @@
<init_path lang="sh">/etc/profile.d/modules.sh</init_path>
<init_path lang="csh">/etc/profile.d/modules.csh</init_path>
<init_path lang="perl">/usr/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/Modules/python.py</init_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<cmd_path lang="perl">/usr/Modules/bin/modulecmd perl</cmd_path>
<cmd_path lang="python">module</cmd_path>
<cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
<modules>
<command name="purge"/>
<command name="load">cmake</command>
<command name="load">perl xml-libxml switch</command>
<command name="load">perl xml-libxml switch python/2.7.11</command>
</modules>
<modules compiler="intel">
<command name="load">intel/2015.6.233</command>
Expand Down Expand Up @@ -2105,14 +2106,15 @@
<init_path lang="sh">/etc/profile.d/modules.sh</init_path>
<init_path lang="csh">/etc/profile.d/modules.csh</init_path>
<init_path lang="perl">/usr/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/Modules/python.py</init_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<cmd_path lang="perl">/usr/Modules/bin/modulecmd perl</cmd_path>
<cmd_path lang="python">module</cmd_path>
<cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
<modules>
<command name="purge"/>
<command name="load">cmake</command>
<command name="load">perl xml-libxml switch</command>
<command name="load">perl xml-libxml switch python/2.7.11</command>
</modules>
<modules compiler="intel">
<command name="load">intel/2015.6.233</command>
Expand Down

0 comments on commit 24e2f9f

Please sign in to comment.