FEAT: Improve how cet & init_ion temp check for required neutral species

Author: abukowski21

include/ions.h

@@ -175,11 +175,6 @@ class Ions {
   /// Heat Conduction (bulk):
   arma_cube lambda;
 
-  /// Electron temperature calculations need to know if some neutral species are present
-  bool has_nO;
-  bool has_nO2;
-  bool has_nN2;
-
   // Electrodynamics:
   /// Electric potential:
   arma_cube potential_scgc;

src/calc_electron_temperature.cpp

@@ -160,6 +160,10 @@ arma_cube calc_epsilon(Neutrals &neutrals, Ions &ions) {
   int64_t inO2 = neutrals.get_species_id("O2");
   int64_t inN2 = neutrals.get_species_id("N2");
   int64_t inO = neutrals.get_species_id("O");
+
+  if ((inO == -1) || (inN2 == -1) || (inO2 == -1)) {
+    report.error("Could not find O, N2, or O2 in neutrals species list");
+  }
 
   arma_cube epsilon, x, logx;
 
@@ -327,6 +331,10 @@ std::vector<arma_cube> calc_electron_neutral_collisions(Ions &ions, Neutrals &ne
   int64_t inN2 = neutrals.get_species_id("N2");
   int64_t inO = neutrals.get_species_id("O");
 
+  if ((inO == -1) || (inN2 == -1) || (inO2 == -1)) {
+    report.error("Could not find O, N2, or O2 in neutrals species list");
+  }
+
   Qenc = ions.density_scgc * cME * 3.0 * cKB % (neutrals.temperature_scgc - ions.electron_temperature_scgc)
           % ((2.33e-11 * neutrals.species[inN2].density_scgc * 1.e-6 
               % (1 - 1.21e-4 * ions.electron_temperature_scgc) 

src/calc_ion_temperature.cpp

@@ -28,20 +28,15 @@ void Ions::init_ion_temperature(Neutrals neutrals, Grid grid) {
   temperature_scgc = neutrals.temperature_scgc;
 
   // For electron temperature, we need to check if some species are present or not. 
-  // Do this check now & set a bool or vector:
-  bool has_nO = false;
-  bool has_nO2 = false;
-  bool has_nN2 = false;
-  
-  if (neutrals.get_species_id("O") > -1) 
-    has_nO = true;
-  if (neutrals.get_species_id("O2") > -1) 
-    has_nO2 = true;
-  if (neutrals.get_species_id("N2") > -1)
-    has_nN2 = true;
-  if ((!has_nO && !has_nO2 && !has_nN2) 
-     && (input.get_do_photoelectron_heating() || input.get_do_ionization_heating())) {
-    report.error("Ion photoelectron & ionization heating require neutral O, O2, and N2 to be present.");
+  // Do this check now & warn if needed:
+  if ((neutrals.get_species_id("O") == -1)
+      || (neutrals.get_species_id("O2") == -1) 
+      ||(neutrals.get_species_id("N2") == -1)){
+    if (input.get_do_photoelectron_heating() 
+        || input.get_do_ionization_heating()
+        || input.get_do_electron_neutral_collisional_heating()) {
+    report.error("Your electron temperature sources require neutral O, O2, and N2 to be present.");
+    }
   }
 
   return;