Merge pull request #3 from lwang-astro/master

Bug fix from Long Wang for multiple power-law IMF
ahwkuepper · Mar 14, 2016 · c05ea21 · c05ea21
2 parents ac2fc7d + 2ba10cf
commit c05ea21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -27,11 +27,11 @@ OBJECTS = $(SOURCE:.f=.o)
 
 mcluster_sse: $(OBJECTS) $(LFLAGS)
 	$(CC) -c main.c -D SSE -lm
-	$(CC) $(CFLAGS) $(OBJECTS) main.o -o mcluster_sse -lm 
+	$(CC) $(OBJECTS) main.o -o mcluster_sse -lm $(CFLAGS) 
 
 mcluster_gpu: $(OBJECTS) $(LFLAGS) gpupot.gpu.o main.c
 	$(CC) -c main.c -D SSE -D GPU -lm -I$(CUDA_PATH)/include
-	$(CC) $(CFLAGS) $(OBJECTS) main.o gpupot.gpu.o -L$(CUDA_PATH)/lib64 -lcudart -lstdc++ -o mcluster_gpu -lm
+	$(CC) $(OBJECTS) main.o gpupot.gpu.o  -o mcluster_gpu -L$(CUDA_PATH)/lib64 -lcudart -lstdc++ -lm $(CFLAGS) 
 
 mcluster: 
 	$(CC) -o mcluster main.c -lm

diff --git a/main.c b/main.c
@@ -219,7 +219,7 @@ int main (int argv, char **argc) {
 			if (mn < MAX_MN) { 
 				mlim[mn] = atof(optarg);
 				if (mn == 0) mlow = atof(optarg);
-				if (mn == 1) mup = atof(optarg);
+				if (mn == MAX_MN-1) mup = atof(optarg);
 				mn++; 
 				break;
 			} else { printf("\nError: Number of mass params exceded maximum limit of %d\n", MAX_MN); return 1; }