Fix problem in propogation of BGL geometry option.

NEWS

@@ -3,6 +3,7 @@ documents those changes that are of interest to users and admins.
 
 * Changes in SLURM 0.5.0-pre8
 =============================
+ -- BlueGene srun --geometry was not getting propogated properly.
 
 * Changes in SLURM 0.5.0-pre7
 =============================

src/common/slurm_protocol_pack.c

@@ -1988,7 +1988,7 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer)
 	packstr(job_desc_ptr->network, buffer);
 
 	if (select_g_alloc_jobinfo (&jobinfo) == SLURM_SUCCESS) {
-#if SYSTEM_DIMENSION
+#if SYSTEM_DIMENSIONS
 		select_g_set_jobinfo(jobinfo, SELECT_DATA_GEOMETRY, 
 			job_desc_ptr->geometry);
 #endif
@@ -2069,7 +2069,7 @@ _unpack_job_desc_msg(job_desc_msg_t ** job_desc_buffer_ptr, Buf buffer)
 	if (select_g_alloc_jobinfo (&job_desc_ptr->select_jobinfo)
 	||  select_g_unpack_jobinfo(job_desc_ptr->select_jobinfo, buffer))
 		goto unpack_error;
-#if SYSTEM_DIMENSION
+#if SYSTEM_DIMENSIONS
 	select_g_get_jobinfo(job_desc_ptr->select_jobinfo, 
 		SELECT_DATA_GEOMETRY, job_desc_ptr->geometry);
 #endif

src/slurmctld/job_mgr.c

@@ -2216,7 +2216,7 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
 
 	if (select_g_alloc_jobinfo(&job_ptr->select_jobinfo))
 		return SLURM_ERROR;
-#if SYSTEM_DIMENSION
+#if SYSTEM_DIMENSIONS
 	select_g_set_jobinfo(job_ptr->select_jobinfo,
 		SELECT_DATA_GEOMETRY, 
 		job_desc->geometry);

src/srun/allocate.c

@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <sys/poll.h>
 
+
 #include "src/common/log.h"
 #include "src/common/macros.h"
 #include "src/common/slurm_auth.h"
@@ -381,7 +382,7 @@ job_desc_msg_create_from_opts (char *script)
 	if (opt.hold)
 		j->priority     = 0;
 
-#if SYSTEM_DIMENSION
+#if SYSTEM_DIMENSIONS
 	if (opt.geometry[0] > 0) {
 		int i;
 		for (i=0; i<SYSTEM_DIMENSIONS; i++)