Merge pull request #170 from OMS-NetZero/fix-aer-direct-scale

Fix aerosol direct scaling

CHANGELOG.rst

@@ -4,6 +4,8 @@ Changelog
 v2.2.2
 ------
 
+(`#170 <https://github.com/OMS-NetZero/FAIR/pull/170>`_) Fix to the radiative forcing scale factor in aerosol-radiation interactions (`#168 <https://github.com/OMS-NetZero/FAIR/issues/168>`_)
+
 (`#169 <https://github.com/OMS-NetZero/FAIR/pull/169>`_) Removed logging messages which were too annoying and slowed down overrides in all but default cases (`#162 <https://github.com/OMS-NetZero/FAIR/issues/162>`_)
 
 v2.2.1

src/fair/fair.py

@@ -1448,7 +1448,7 @@ def run(self, progress=True, suppress_warnings=True):
                     concentration_array[i_timepoint + 1 : i_timepoint + 2, ...],
                     baseline_emissions_array[None, None, ...],
                     baseline_concentration_array[None, None, ...],
-                    forcing_scale_array[None, None, ...],
+                    forcing_scale_array[None, None, ..., self._ari_indices],
                     erfari_radiative_efficiency_array[None, None, ...],
                     self._aerosol_chemistry_from_emissions_indices,
                     self._aerosol_chemistry_from_concentration_indices,

src/fair/forcing/aerosol/erfari.py

@@ -50,7 +50,7 @@ def calculate_erfari_forcing(
     erf_out[..., emissions_indices] = (
         (emissions[..., emissions_indices] - baseline_emissions[..., emissions_indices])
         * radiative_efficiency[..., emissions_indices]
-    ) * forcing_scaling[..., emissions_indices]
+    ) * forcing_scaling
 
     # concentration-driven forcers
     erf_out[..., concentration_indices] = (
@@ -59,7 +59,7 @@ def calculate_erfari_forcing(
             - baseline_concentration[..., concentration_indices]
         )
         * radiative_efficiency[..., concentration_indices]
-    ) * forcing_scaling[..., concentration_indices]
+    ) * forcing_scaling
 
     # in future we can retain contributions from each species. Will need one ERFari
     # array index for each species so we don't do this here yet.