Revert the change to edison as this is now in #1888

E3SM-Project · Nov 7, 2017 · 79b45b0 · 79b45b0
1 parent df66b63
commit 79b45b0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cime/config/acme/machines/config_machines.xml b/cime/config/acme/machines/config_machines.xml
@@ -85,8 +85,8 @@
     <arguments>
       <arg name="label"> --label</arg>
       <arg name="num_tasks" > -n $TOTALPES</arg>
-      <arg name="thread_count"> -c $SHELL{echo 48/`./xmlquery --value MAX_MPITASKS_PER_NODE`|bc}</arg>
-      <arg name="binding"> $SHELL{if [ 24 -ge `./xmlquery --value MAX_MPITASKS_PER_NODE` ]; then echo "--cpu_bind=cores"; else echo "--cpu_bind=threads";fi;} </arg>
+      <arg name="thread_count"> -c $SHELL{echo 48/`./xmlquery --value MAX_TASKS_PER_NODE`*$ENV{OMP_NUM_THREADS} | bc }</arg>
+      <arg name="binding"> $SHELL{if [ 24 -ge `./xmlquery --value MAX_TASKS_PER_NODE` ]; then echo "--cpu_bind=cores"; else echo "--cpu_bind=threads"; fi} </arg>
     </arguments>
   </mpirun>
   <module_system type="module">