Inland basin flow coupling

CONTRIBUTORS.md

@@ -48,6 +48,7 @@
 | theabro             | Nathan Luke Abraham | NCAS & University of Cambridge  | 2026-04-15 |
 | ss421               | Steven Sandbach    | Met Office                       | 2026-04-20 |
 | MichaelWhitall      | Michael Whitall    | Met Office                       | 2026-04-22 |
+| DanCopsey           | Dan Copsey         | Met Office                       | 2026-05-14 |
 | marcstring          | Marc Stringer      | NCAS, Reading University         | 2026-05-06 |
 | cameronbateman-mo   | Cameron Bateman    | Met Office                       | 2026-05-28 |
 | davelee2804         | David Lee          | Bureau of Meteorology, Australia | 2026-06-02 |

applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/gungho_model/rose-meta/lfric-gungho_model/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py

@@ -865,3 +865,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/jules/rose-meta/lfric-jules/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py

@@ -849,3 +849,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/lfric_atm/example/configuration.nml

@@ -373,6 +373,7 @@ write_minmax_tseries=.false.,
 /
 &jules_hydrology
 l_hydrology=.true.,
+l_inland=.false.,
 l_var_rainfrac=.true.,
 /
 &jules_model_environment_lfric

applications/lfric_atm/metadata/field_def_diags.xml

@@ -638,6 +638,7 @@
   <field id="soil__soil_moist_wilt" name="soil_moist_wilt" long_name="soil_moisture_at_wilting_point" unit="m3 m-3" domain_ref="face" />
   <field id="soil__soil_moist_crit" name="soil_moist_crit" long_name="soil_moisture_at_critical_point" unit="m3 m-3" domain_ref="face" /> 
   <field id="soil__soil_moist_sat" name="soil_moist_sat" long_name="soil_moisture_at_saturation" unit="m3 m-3" domain_ref="face" />
+  <field id="soil__inland_basin_flow" name="inland_basin_flow" long_name="Inland basin flow" unit="kg m-2 s-1" domain_ref="face" />
   <!-- Boundary layer turbulence diagnostics -->
   <field id="turbulence__dtheta_bl" name="dtheta_bl" long_name="potential_temperature_increment_from_bl_scheme" unit="K" grid_ref="full_level_face_grid" />
   <field id="turbulence__dt_bl" name="dt_bl" long_name="temperature_increment_from_bl_scheme" unit="K" grid_ref="full_level_face_grid" />

applications/lfric_atm/metadata/lfric_dictionary.xml

@@ -279,7 +279,7 @@
   <field id="tile_fraction" name="tile_fraction" long_name="surface_tile_fraction" unit="1" domain_ref="face" axis_ref="surface_tiles" />
   <field id="tile_temperature" name="tile_temperature" long_name="surface_tile_temperature" unit="K" domain_ref="face" axis_ref="surface_tiles" />
   <field id="tile_lw_grey_albedo" name="tile_lw_grey_albedo" long_name="surface_tile_lw_grey_albedo" unit="1" domain_ref="face" axis_ref="surface_tiles" />
-  <field id="tile_moisture_flux" name="tile_moisture_flux" long_name="tile_moisture_flux" unit="kg m-2 s-1"  domain_ref="face" axis_ref="surface_tiles"/>  
+  <field id="tile_moisture_flux" name="tile_moisture_flux" long_name="tile_moisture_flux" unit="kg m-2 s-1"  domain_ref="face" axis_ref="surface_tiles"/>
   <field id="snowice_melt" name="snowice_melt" long_name="snowice_melt" unit="kg m-2 s-1"  domain_ref="face" axis_ref="surface_tiles"/>
   <field id="surf_ht_flux" name="surf_ht_flux" long_name="surf_ht_flux" unit="W m-2"  domain_ref="face" axis_ref="surface_tiles"/>
   <field id="snowice_sublimation" name="snowice_sublimation" long_name="snowice_sublimation" unit="kg m-2 s-1"  domain_ref="face" axis_ref="surface_tiles"/>
@@ -292,7 +292,7 @@
   <field id="albedo_obs_scaling" name="albedo_obs_scaling" long_name="albedo_obs_scaling" unit="1" domain_ref="face" axis_ref="land_tile_rad_band" />
   <field id="sea_ice_thickness" name="sea_ice_thickness" long_name="sea_ice_thickness" unit="m" domain_ref="face" axis_ref="sea_ice_categories" />
   <field id="sea_ice_temperature" name="sea_ice_temperature" long_name="sea_ice_bulk_temperature" unit="K" domain_ref="face" axis_ref="sea_ice_categories" />
-  <field id="sea_ice_pensolar" name="sea_ice_pensolar" long_name="sea_ice_pensolar" unit="W m-2"  domain_ref="face" axis_ref="sea_ice_categories"/>        
+  <field id="sea_ice_pensolar" name="sea_ice_pensolar" long_name="sea_ice_pensolar" unit="W m-2"  domain_ref="face" axis_ref="sea_ice_categories"/>
   <field id="sea_surf_temp_pert" name="sea_surf_temp_pert" long_name="sea_surface_temperature_perturbation" unit="K" domain_ref="face" />
   <field id="internal_flux" name="internal_flux" long_name="internal_flux" unit="W m-2" domain_ref="face" />
   <!-- orography fields -->
@@ -404,6 +404,7 @@
   <field id="frozen_soil_moisture" name="frozen_soil_moisture" long_name="mass_fraction_of_frozen_water_in_saturated_soil_moisture" unit="1" domain_ref="face" axis_ref="soil_levels" />
   <!-- energy correction -->
   <field id="temperature_correction_rate" name="temperature_correction_rate" long_name="temperature_rate_for_energy_correction" unit="K s-1" axis_ref="scalar_axis" />
+  <field id="lf_inland_flow" name="lf_inland_flow" long_name="lf_inland_flow" unit="kg m-2 s-1" domain_ref="face" />
   <field id="lf_icefrc" name="lf_icefrc" long_name="lf_icefrc" unit="1" domain_ref="face" axis_ref="sea_ice_categories" />
   <field id="lf_icetck" name="lf_icetck" long_name="lf_icetck" unit="m" domain_ref="face" axis_ref="sea_ice_categories" />
   <field id="lf_icelayert" name="lf_icelayert" long_name="lf_icelayert" unit="m" domain_ref="face" axis_ref="sea_ice_categories" />

applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/lfric_coupled/example/configuration.nml

@@ -169,6 +169,7 @@ write_minmax_tseries=.false.,
 /
 &jules_hydrology
 l_hydrology=.true.,
+l_inland=.false.,
 l_var_rainfrac=.false.
 /
 &jules_model_environment_lfric

applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/linear_model/rose-meta/lfric-linear_model/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/name_transport/rose-meta/lfric-name_transport/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/ngarch/rose-meta/lfric-ngarch/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports

applications/shallow_water/rose-meta/lfric-shallow_water/versions.py

@@ -830,3 +830,18 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t401(MacroUpgrade):
+    """Upgrade macro for ticket #401 by Dan Copsey."""
+
+    BEFORE_TAG = "vn3.1_t394"
+    AFTER_TAG = "vn3.1_t401"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/jules-lsm
+        self.add_setting(
+            config, ["namelist:jules_hydrology", "l_inland"], ".false."
+        )
+
+        return config, self.reports