Remove warning

jaxley/channels/channel.py

@@ -4,6 +4,7 @@
 from abc import ABC, abstractmethod
 from typing import Dict, Optional, Tuple
 from warnings import warn
+
 import jax.numpy as jnp
 
 
@@ -25,29 +26,19 @@ def __init__(self, name: Optional[str] = None):
             "[email protected] or create an issue on Github: "
             "https://github.com/jaxleyverse/jaxley/issues. Thank you!"
         )
-        if not hasattr(self, "current_is_in_mA_per_cm2"):
+        if (
+            not hasattr(self, "current_is_in_mA_per_cm2")
+            and self.current_is_in_mA_per_cm2
+        ):
             raise ValueError(
                 "The channel you are using is deprecated. "
                 "In Jaxley version 0.5.0, we changed the unit of the current returned "
                 "by `compute_current` of channels from `uA/cm^2` to `mA/cm^2`. Please "
                 "update your channel model (by dividing the resulting current by 1000) "
                 "and set `self.current_is_in_mA_per_cm2=True` as the first line "
-                "in the `__init__()` method of your channel. Alternatively, you can "
-                "make Jaxley use `uA/cm^2 by setting "
-                "`self.current_is_in_mA_per_cm2=False` as the "
-                f"first line in the `__init__()` method of your channel. {contact}"
-            )
-        if not self.current_is_in_mA_per_cm2:
-            warn(
-                "You are using `current_is_in_mA_per_cm2=False`. This means that the "
-                "current through the channel will be considered in `uA/cm^2`. In "
-                "future versions of Jaxley, we will remove this option and force the "
-                "channel to return the current in `mA/cm^2`. We recommend to adapt "
-                "your `compute_current()` method now and return the current in "
-                "`mA/cm^2` (by dividing the current by 1000). After this has been "
-                "done, set `current_is_in_mA_per_cm2=True` to get rid of this "
-                f"warning. {contact}"
+                "in the `__init__()` method of your channel. {contact}"
             )
+
         self._name = name if name else self.__class__.__name__
 
     @property

jaxley/modules/base.py

@@ -1806,15 +1806,9 @@ def _channel_currents(
             voltage_term = (membrane_currents[1] - membrane_currents[0]) / diff
             constant_term = membrane_currents[0] - voltage_term * voltages[indices]
 
-            if channel.current_is_in_mA_per_cm2:
-                # * 1000 to convert from mA/cm^2 to uA/cm^2.
-                voltage_terms = voltage_terms.at[indices].add(voltage_term * 1000.0)
-                constant_terms = constant_terms.at[indices].add(-constant_term * 1000.0)
-            else:
-                # If `current_is_in_mA_per_cm2=False` then the current is assumed as
-                # `uA/cm^2`.
-                voltage_terms = voltage_terms.at[indices].add(voltage_term)
-                constant_terms = constant_terms.at[indices].add(-constant_term)
+            # * 1000 to convert from mA/cm^2 to uA/cm^2.
+            voltage_terms = voltage_terms.at[indices].add(voltage_term * 1000.0)
+            constant_terms = constant_terms.at[indices].add(-constant_term * 1000.0)
 
             # Save the current (for the unperturbed voltage) as a state that will
             # also be passed to the state update.