Switch ions to i-i onlky

bendudson · May 20, 2024 · e4a8963 · e4a8963
1 parent 8a8af5c
commit e4a8963
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/evolve_pressure.cxx b/src/evolve_pressure.cxx
@@ -311,19 +311,21 @@ void EvolvePressure::finally(const Options& state) {
                     collision_names.push_back(collision_name);
                   }
 
-          } else {
+          } else if (identifySpeciesType(species.name()) == "electron") {
+            if (/// Electron-ion collisions
+                (collisionSpeciesMatch(    
+                  collision_name, species.name(), "e", "coll", "exact"))) {
+
+                    collision_names.push_back(collision_name);
+                  }
+
+          } else if (identifySpeciesType(species.name()) == "ion") {
             if (/// Self-collisions
-              (collisionSpeciesMatch(    
-                collision_name, species.name(), species.name(), "coll", "exact")) or
-              /// Ion-electron collisions
-              (collisionSpeciesMatch(    
-                collision_name, species.name(), "+", "coll", "partial")) or
-              /// Electron-ion collisions
-              (collisionSpeciesMatch(    
-                collision_name, species.name(), "e", "coll", "exact"))) {
-
-                  collision_names.push_back(collision_name);
-                }
+                (collisionSpeciesMatch(    
+                  collision_name, species.name(), species.name(), "coll", "exact"))) {
+
+                    collision_names.push_back(collision_name);
+                  }
           }
 
         }