Skip to content

Commit

Permalink
Merge branch 'jgfouca/cime/fixes_for_titan' into next (PR #1321)
Browse files Browse the repository at this point in the history
Merge #2 for this branch.

[BFB]

* jgfouca/cime/fixes_for_titan:
  Fix type in melvin config change
  • Loading branch information
jgfouca committed Mar 27, 2017
2 parents a95bff3 + 69b7c82 commit 824156f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cime/cime_config/acme/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
<command name="load">sems-env</command>
<command name="load">sems-git</command>
<command name="load">sems-python/2.7.9</command>
<command name="load" compiler="gcc">sems-gcc/5.3.0</command>
<command name="load" compiler="gnu">sems-gcc/5.3.0</command>
<command name="load" compiler="intel">sems-intel/16.0.3</command>
<command name="load">sems-openmpi/1.8.7</command>
<command name="load">sems-cmake/2.8.12</command>
Expand Down

0 comments on commit 824156f

Please sign in to comment.