Squashed 'src/' changes from 60ccbf83..c035d9c3

c035d9c3 Tony updates to phreeqc_rates.dat. Added albite_rates. Copy/paste error in read.cpp
fcec621e basicsubs.cpp fix from Tony
e5b4b11e Fixed some HTML, still a problem with colors of links.

git-subtree-dir: src
git-subtree-split: c035d9c3b76f807db7d87066c235c9f6867e5497

basicsubs.cpp

@@ -1759,7 +1759,7 @@ pr_pressure(const char* phase_name)
 			class phase* phase_ptr_gas = phase_bsearch(gas_comp_ptr->Get_phase_name().c_str(), &j, FALSE);
 			if (phase_ptr == phase_ptr_gas)
 			{
-				if (gas_phase_ptr->Get_pr_in())
+				if (gas_phase_ptr->Get_pr_in() && phase_ptr->moles_x)
 				{
 					return phase_ptr->pr_p;
 				}
@@ -1807,7 +1807,7 @@ pr_phi(const char* phase_name)
 			class phase* phase_ptr_gas = phase_bsearch(gas_comp_ptr->Get_phase_name().c_str(), &j, FALSE);
 			if (phase_ptr == phase_ptr_gas)
 			{
-				if (gas_phase_ptr->Get_pr_in())
+				if (gas_phase_ptr->Get_pr_in() && phase_ptr->moles_x)
 					return phase_ptr->pr_phi;
 				else
 					return gas_comp_ptr->Get_phi();

read.cpp

@@ -2439,7 +2439,7 @@ read_mean_gammas(void)
 /* ---------------------------------------------------------------------- */
 {
 	/*
-	 *      Reads kinetics data
+	 *      Reads MEAN_GAMMAS data
 	 *
 	 *      Arguments:
 	 *	 none
@@ -2540,7 +2540,7 @@ read_mean_gammas(void)
 		break;
 		case OPTION_ERROR:
 			input_error++;
-			error_msg("Unknown input in KINETICS keyword.", CONTINUE);
+			error_msg("Unknown input in MEAN_GAMMAS keyword.", CONTINUE);
 			error_msg(line_save, CONTINUE);
 			break;
 		}