small patch to improve the way command line arguments are read in so …

…all arguments work even when the -m argument is given after the particle or lookup counts

src/Makefile

@@ -2,7 +2,7 @@
 # User Options
 #===============================================================================
 
-COMPILER  = gnu
+COMPILER  = intel
 OPTIMIZE  = yes
 DEBUG     = no
 PROFILE   = no

src/io.c

@@ -86,6 +86,9 @@ Input read_CLI( int argc, char * argv[] )
 	// defaults to no temperature dependence (Doppler broadening)
 	input.doppler = 1;
 
+	int default_lookups = 1;
+	int default_particles = 1;
+
 	// Collect Raw Input
 	for( int i = 1; i < argc; i++ )
 	{
@@ -114,8 +117,11 @@ Input read_CLI( int argc, char * argv[] )
 			{
 				input.simulation_method = EVENT_BASED;
 				// Also resets default # of lookups
-				input.lookups =  input.lookups * input.particles;
-				input.particles = 0;
+				if( default_lookups && default_particles )
+				{
+					input.lookups =  input.lookups * input.particles;
+					input.particles = 0;
+				}
 			}
 			else
 				print_CLI_error();
@@ -124,15 +130,21 @@ Input read_CLI( int argc, char * argv[] )
 		else if( strcmp(arg, "-l") == 0 )
 		{
 			if( ++i < argc )
+			{
 				input.lookups = atoi(argv[i]);
+				default_lookups = 0;
+			}
 			else
 				print_CLI_error();
 		}
 		// particles (-p)
 		else if( strcmp(arg, "-p") == 0 )
 		{
 			if( ++i < argc )
+			{
 				input.particles = atoi(argv[i]);
+				default_particles = 0;
+			}
 			else
 				print_CLI_error();
 		}