hotfix/updated simulation types check

Author: marc-flex

tidy3d/components/tcad/simulation/heat_charge.py

@@ -109,6 +109,18 @@
 HeatSourceTypes = (UniformHeatSource, HeatSource, HeatFromElectricSource)
 ChargeSourceTypes = ()
 ElectricBCTypes = (VoltageBC, CurrentBC, InsulatingBC)
+ChargeTypes = (
+    SteadyChargeDCAnalysis,
+    IsothermalSteadyChargeDCAnalysis,
+    SSACAnalysis,
+    IsothermalSSACAnalysis,
+)
+ChargeMonitorTypes = (
+    SteadyPotentialMonitor,
+    SteadyFreeCarrierMonitor,
+    SteadyCapacitanceMonitor,
+    SteadyCurrentDensityMonitor,
+)
 
 AnalysisSpecType = Union[ElectricalAnalysisType, UnsteadyHeatAnalysis]
 
@@ -683,13 +695,6 @@ def check_freqs_requires_ac_source(cls, values):
     def check_charge_simulation(cls, values):
         """Makes sure that Charge simulations are set correctly."""
 
-        ChargeMonitorType = (
-            SteadyPotentialMonitor,
-            SteadyFreeCarrierMonitor,
-            SteadyCapacitanceMonitor,
-            SteadyCurrentDensityMonitor,
-        )
-
         simulation_types = cls._check_simulation_types(values=values)
 
         if TCADAnalysisTypes.CHARGE in simulation_types:
@@ -707,7 +712,7 @@ def check_charge_simulation(cls, values):
 
             # check that we have at least one charge monitor
             monitors = values["monitors"]
-            if not any(isinstance(mnt, ChargeMonitorType) for mnt in monitors):
+            if not any(isinstance(mnt, ChargeMonitorTypes) for mnt in monitors):
                 raise SetupError(
                     "Charge simulations require the definition of, at least, one of these monitors: "
                     "'[SteadyPotentialMonitor, SteadyFreeCarrierMonitor, SteadyCapacitanceMonitor, SteadyCurrentDensityMonitor]' "
@@ -723,7 +728,17 @@ def check_charge_simulation(cls, values):
                             "Currently, Charge simulations support only unstructured monitors. Please set "
                             f"monitor '{mnt.name}' to 'unstructured = True'."
                         )
-
+            # check that we have at least one semiconductor medium
+            structures = values["structures"]
+            sc_present = False
+            for structure in structures:
+                if isinstance(structure.medium.charge, SemiconductorMedium):
+                    sc_present = True
+                    break
+            if not sc_present:
+                raise SetupError(
+                    f"{TCADAnalysisTypes.CHARGE} simulations require the definition of, at least, one semiconductor medium."
+                )
         return values
 
     @pd.root_validator(skip_on_failure=True)
@@ -880,23 +895,23 @@ def _check_simulation_types(
 
         boundaries = list(values["boundary_spec"])
         sources = list(values["sources"])
+        analysis_spec = values["analysis_spec"]
 
         structures = list(values["structures"])
+
+        if isinstance(analysis_spec, ChargeTypes):
+            simulation_types.append(TCADAnalysisTypes.CHARGE)
+
         semiconductor_present = HeatChargeSimulation._check_if_semiconductor_present(
             structures=structures
         )
-        if semiconductor_present:
-            simulation_types.append(TCADAnalysisTypes.CHARGE)
 
         for boundary in boundaries:
             if isinstance(boundary.condition, HeatBCTypes):
                 simulation_types.append(TCADAnalysisTypes.HEAT)
             if isinstance(boundary.condition, ElectricBCTypes):
-                # for the time being, assume tha the simulation will be of
-                # type CHARGE if we have semiconductors
-                if semiconductor_present:
-                    simulation_types.append(TCADAnalysisTypes.CHARGE)
-                else:
+                # type CONDUCTION if we have no semiconductors
+                if not semiconductor_present:
                     simulation_types.append(TCADAnalysisTypes.CONDUCTION)
 
         for source in sources:
@@ -1933,17 +1948,8 @@ def _get_simulation_types(self) -> list[TCADAnalysisTypes]:
         """
         simulation_types = []
 
-        # NOTE: for the time being, if a simulation has SemiconductorMedium
-        # then we consider it of being a 'TCADAnalysisTypes.CHARGE'
-        ChargeTypes = (
-            SteadyChargeDCAnalysis,
-            IsothermalSteadyChargeDCAnalysis,
-            SSACAnalysis,
-            IsothermalSSACAnalysis,
-        )
         if isinstance(self.analysis_spec, ChargeTypes):
-            if self._check_if_semiconductor_present(self.structures):
-                return [TCADAnalysisTypes.CHARGE]
+            return [TCADAnalysisTypes.CHARGE]
 
         # check if unsteady heat
         if isinstance(self.analysis_spec, UnsteadyHeatAnalysis):