Squashed 'src/' changes from cb6d9f49..3d5242f5

3d5242f5 bug in processing ISOTOPE_RATIOS
034e9210 added commented code to check e- in non-master species.

git-subtree-dir: src
git-subtree-split: 3d5242f5ccaf56cbcad48d33caee0340fb97da65

tidy.cpp

@@ -5431,6 +5431,16 @@ tidy_isotope_ratios(void)
 		/*
 		 * Mark master species list as minor isotope
 		 */
+		if (isotope_ratio[i]->isotope_name == NULL)
+		{
+
+			input_error++;
+			error_string = sformatf(
+				"For ISOTOPE_RATIO, did not find ISOTOPE name for this isotope ratio %s",
+				isotope_ratio[i]->name);
+			error_msg(error_string, CONTINUE);
+			continue;
+		}
 		master_isotope_ptr =
 			master_isotope_search(isotope_ratio[i]->isotope_name);
 		if (master_isotope_ptr == NULL)

utilities.cpp

@@ -41,6 +41,10 @@ calc_alk(CReaction& rxn_ref)
 			break;
 		}
 		return_value += r_token->coef * master_ptr->alk;
+		//if (strcmp(r_token->name, "e-") == 0 && strcmp(rxn_ref.token[0].name,"e-") != 0)
+		//{
+		//	std::cerr << rxn_ref.token[0].name << "   Non-master species has e- in reaction.\n";
+		//}
 		r_token++;
 	}
 	return (return_value);