Add 12 hydrometeor variable recipes and 3 humidity recipes with TL/AD using diagnostic cloud scheme

src/CMakeLists.txt

@@ -81,6 +81,30 @@ vader/recipes/TotalWaterMixingRatioWrtWetAir.h
 vader/recipes/TotalWaterMixingRatioWrtWetAir_A.cc
 vader/recipes/EastwardWindAt10m_A.cc
 vader/recipes/EastwardWindAt10m.h
+vader/recipes/EffectiveRadiusOfCloudIceParticle.h
+vader/recipes/EffectiveRadiusOfCloudIceParticle_A.cc
+vader/recipes/EffectiveRadiusOfCloudLiquidWaterParticle.h
+vader/recipes/EffectiveRadiusOfCloudLiquidWaterParticle_A.cc
+vader/recipes/EffectiveRadiusOfGraupelParticle.h
+vader/recipes/EffectiveRadiusOfGraupelParticle_A.cc
+vader/recipes/EffectiveRadiusOfHailParticle.h
+vader/recipes/EffectiveRadiusOfHailParticle_A.cc
+vader/recipes/EffectiveRadiusOfRainParticle.h
+vader/recipes/EffectiveRadiusOfRainParticle_A.cc
+vader/recipes/EffectiveRadiusOfSnowParticle.h
+vader/recipes/EffectiveRadiusOfSnowParticle_A.cc
+vader/recipes/MassContentOfCloudIceInAtmosphereLayer.h
+vader/recipes/MassContentOfCloudIceInAtmosphereLayer_A.cc
+vader/recipes/MassContentOfCloudLiquidWaterInAtmosphereLayer.h
+vader/recipes/MassContentOfCloudLiquidWaterInAtmosphereLayer_A.cc
+vader/recipes/MassContentOfGraupelInAtmosphereLayer.h
+vader/recipes/MassContentOfGraupelInAtmosphereLayer_A.cc
+vader/recipes/MassContentOfHailInAtmosphereLayer.h
+vader/recipes/MassContentOfHailInAtmosphereLayer_A.cc
+vader/recipes/MassContentOfRainInAtmosphereLayer.h
+vader/recipes/MassContentOfRainInAtmosphereLayer_A.cc
+vader/recipes/MassContentOfSnowInAtmosphereLayer.h
+vader/recipes/MassContentOfSnowInAtmosphereLayer_A.cc
 vader/recipes/VirtualPotentialTemperature_A.cc
 vader/recipes/VirtualPotentialTemperature_B.cc
 vader/recipes/VirtualPotentialTemperature.h

src/vader/DefaultCookbook.h

@@ -21,7 +21,19 @@
 #include "recipes/DryAirDensity.h"
 #include "recipes/DryAirDensityLevelsMinusOne.h"
 #include "recipes/EastwardWindAt10m.h"
+#include "recipes/EffectiveRadiusOfCloudIceParticle.h"
+#include "recipes/EffectiveRadiusOfCloudLiquidWaterParticle.h"
+#include "recipes/EffectiveRadiusOfGraupelParticle.h"
+#include "recipes/EffectiveRadiusOfHailParticle.h"
+#include "recipes/EffectiveRadiusOfRainParticle.h"
+#include "recipes/EffectiveRadiusOfSnowParticle.h"
 #include "recipes/HydrostaticExnerLevels.h"
+#include "recipes/MassContentOfCloudIceInAtmosphereLayer.h"
+#include "recipes/MassContentOfCloudLiquidWaterInAtmosphereLayer.h"
+#include "recipes/MassContentOfGraupelInAtmosphereLayer.h"
+#include "recipes/MassContentOfHailInAtmosphereLayer.h"
+#include "recipes/MassContentOfRainInAtmosphereLayer.h"
+#include "recipes/MassContentOfSnowInAtmosphereLayer.h"
 #include "recipes/NorthwardWindAt10m.h"
 #include "recipes/ParticulateMatter2p5.h"
 #include "recipes/RainMixingRatio.h"
@@ -80,7 +92,31 @@ const cookbookConfigType Vader::defaultCookbookDefinition = {
                                      {vwind_at_10m_A::Name}},
         {oops::Variable{"mass_density_of_particulate_matter_2p5_in_air"},
                                      {ParticulateMatter2p5_A::Name,
-                                      ParticulateMatter2p5_B::Name}}
+                                      ParticulateMatter2p5_B::Name}},
+        {oops::Variable{"mass_content_of_cloud_liquid_water_in_atmosphere_layer"},
+                                     {MassContentOfCloudLiquidWaterInAtmosphereLayer_A::Name}},
+        {oops::Variable{"mass_content_of_cloud_ice_in_atmosphere_layer"},
+                                     {MassContentOfCloudIceInAtmosphereLayer_A::Name}},
+        {oops::Variable{"mass_content_of_rain_in_atmosphere_layer"},
+                                     {MassContentOfRainInAtmosphereLayer_A::Name}},
+        {oops::Variable{"mass_content_of_snow_in_atmosphere_layer"},
+                                     {MassContentOfSnowInAtmosphereLayer_A::Name}},
+        {oops::Variable{"mass_content_of_graupel_in_atmosphere_layer"},
+                                     {MassContentOfGraupelInAtmosphereLayer_A::Name}},
+        {oops::Variable{"mass_content_of_hail_in_atmosphere_layer"},
+                                     {MassContentOfHailInAtmosphereLayer_A::Name}},
+        {oops::Variable{"effective_radius_of_cloud_liquid_water_particle"},
+                                     {EffectiveRadiusOfCloudLiquidWaterParticle_A::Name}},
+        {oops::Variable{"effective_radius_of_cloud_ice_particle"},
+                                     {EffectiveRadiusOfCloudIceParticle_A::Name}},
+        {oops::Variable{"effective_radius_of_rain_particle"},
+                                     {EffectiveRadiusOfRainParticle_A::Name}},
+        {oops::Variable{"effective_radius_of_snow_particle"},
+                                     {EffectiveRadiusOfSnowParticle_A::Name}},
+        {oops::Variable{"effective_radius_of_graupel_particle"},
+                                     {EffectiveRadiusOfGraupelParticle_A::Name}},
+        {oops::Variable{"effective_radius_of_hail_particle"},
+                                     {EffectiveRadiusOfHailParticle_A::Name}}
     };
 
 }  // namespace vader

src/vader/recipes/EffectiveRadiusOfCloudIceParticle.h

@@ -0,0 +1,51 @@
+/*
+ * (C) Crown Copyright 2025 Met Office.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "atlas/field/FieldSet.h"
+#include "atlas/functionspace/FunctionSpace.h"
+#include "vader/RecipeBase.h"
+
+namespace vader
+{
+
+// -------------------------------------------------------------------------------------------------
+
+/*! \brief The class 'EffectiveRadiusOfCloudIceParticle_A' defines a recipe for
+ *         effective radius of ice particle
+ *
+ *  \details This instantiation of RecipeBase produces effective radius
+ *           using temperature-dependent relationship.
+ *           Inputs: air_temperature
+ *           Output units: m
+ */
+class EffectiveRadiusOfCloudIceParticle_A : public RecipeBase
+{
+ public:
+    static const char Name[];
+
+    typedef EmptyRecipeParameters Parameters_;
+
+    EffectiveRadiusOfCloudIceParticle_A(const Parameters_ &,
+                                                   const VaderConfigVars &);
+
+    std::string name() const override;
+    oops::Variable product() const override;
+    oops::Variables ingredients() const override;
+    size_t productLevels(const atlas::FieldSet &) const override;
+    atlas::FunctionSpace productFunctionSpace(const atlas::FieldSet &) const override;
+
+    void executeNL(atlas::FieldSet &) override;
+};
+
+// -------------------------------------------------------------------------------------------------
+
+}  // namespace vader

src/vader/recipes/EffectiveRadiusOfCloudIceParticle_A.cc

@@ -0,0 +1,106 @@
+/*
+ * (C) Crown Copyright 2025 Met Office.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+#include <cmath>
+#include <iostream>
+#include <vector>
+
+#include "atlas/array.h"
+#include "atlas/field/Field.h"
+#include "oops/util/Logger.h"
+#include "vader/recipes/EffectiveRadiusOfCloudIceParticle.h"
+
+namespace vader {
+
+// -------------------------------------------------------------------------------------------------
+// Static attribute initialization
+const char EffectiveRadiusOfCloudIceParticle_A::Name[] =
+    "EffectiveRadiusOfCloudIceParticle_A";
+
+// Register the maker
+static RecipeMaker<EffectiveRadiusOfCloudIceParticle_A>
+  makerEffectiveRadiusOfCloudIceParticle_A_(
+      EffectiveRadiusOfCloudIceParticle_A::Name);
+
+// -------------------------------------------------------------------------------------------------
+
+EffectiveRadiusOfCloudIceParticle_A::
+    EffectiveRadiusOfCloudIceParticle_A(
+        const Parameters_ & params,
+        const VaderConfigVars & configVariables) {
+  oops::Log::trace() << "EffectiveRadiusOfCloudIceParticle_A::"
+                     << "EffectiveRadiusOfCloudIceParticle_A" << std::endl;
+}
+
+std::string EffectiveRadiusOfCloudIceParticle_A::name() const {
+  return EffectiveRadiusOfCloudIceParticle_A::Name;
+}
+
+oops::Variable EffectiveRadiusOfCloudIceParticle_A::product() const {
+  return oops::Variable{"effective_radius_of_cloud_ice_particle"};
+}
+
+oops::Variables EffectiveRadiusOfCloudIceParticle_A::ingredients() const {
+  return oops::Variables{std::vector<std::string>{"air_temperature"}};
+}
+
+size_t EffectiveRadiusOfCloudIceParticle_A::productLevels(
+    const atlas::FieldSet & afieldset) const {
+  return afieldset.field("air_temperature").shape(1);
+}
+
+atlas::FunctionSpace EffectiveRadiusOfCloudIceParticle_A::productFunctionSpace(
+    const atlas::FieldSet & afieldset) const {
+  return afieldset.field("air_temperature").functionspace();
+}
+
+void EffectiveRadiusOfCloudIceParticle_A::executeNL(
+    atlas::FieldSet & afieldset) {
+  oops::Log::trace() << "EffectiveRadiusOfCloudIceParticle_A::"
+                     << "executeNL starting" << std::endl;
+
+  // Get input field
+  auto temp = atlas::array::make_view<double, 2>(afieldset.field("air_temperature"));
+
+  // Create output field
+  auto reff_field = afieldset.field(
+      "effective_radius_of_cloud_ice_particle");
+  auto reff = atlas::array::make_view<double, 2>(reff_field);
+
+  const size_t npoints = temp.shape(0);
+  const size_t nlevels = temp.shape(1);
+
+  // Temperature-dependent effective radius for ice particles
+  // Typical range: 20-100 micrometers
+  // Colder temperatures -> smaller crystals
+  const double T_freeze = 273.15;  // K
+  const double T_cold = 233.15;    // -40C
+  const double r_min = 20.0e-6;    // minimum radius (m)
+  const double r_max = 100.0e-6;   // maximum radius (m)
+
+  for (size_t jn = 0; jn < npoints; ++jn) {
+    for (size_t jl = 0; jl < nlevels; ++jl) {
+      const double T = temp(jn, jl);
+
+      if (T < T_freeze) {
+        // Warmer ice clouds have larger particles due to aggregation
+        const double temp_factor = (T - T_cold) / (T_freeze - T_cold);
+        reff(jn, jl) = r_min + (r_max - r_min) * std::max(0.0, std::min(1.0, temp_factor));
+      } else {
+        // Above freezing, use minimum value
+        reff(jn, jl) = r_min;
+      }
+    }
+  }
+
+  oops::Log::trace() << "EffectiveRadiusOfCloudIceParticle_A::"
+                     << "executeNL done" << std::endl;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+}  // namespace vader

src/vader/recipes/EffectiveRadiusOfCloudLiquidWaterParticle.h

@@ -0,0 +1,51 @@
+/*
+ * (C) Crown Copyright 2025 Met Office.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "atlas/field/FieldSet.h"
+#include "atlas/functionspace/FunctionSpace.h"
+#include "vader/RecipeBase.h"
+
+namespace vader
+{
+
+// -------------------------------------------------------------------------------------------------
+
+/*! \brief The class 'EffectiveRadiusOfCloudLiquidWaterParticle_A' defines a recipe for
+ *         effective radius of cloud liquid water particle
+ *
+ *  \details This instantiation of RecipeBase produces effective radius
+ *           using temperature-dependent relationship (Martin et al. 1994).
+ *           Inputs: air_temperature
+ *           Output units: m
+ */
+class EffectiveRadiusOfCloudLiquidWaterParticle_A : public RecipeBase
+{
+ public:
+    static const char Name[];
+
+    typedef EmptyRecipeParameters Parameters_;
+
+    EffectiveRadiusOfCloudLiquidWaterParticle_A(const Parameters_ &,
+                                                 const VaderConfigVars &);
+
+    std::string name() const override;
+    oops::Variable product() const override;
+    oops::Variables ingredients() const override;
+    size_t productLevels(const atlas::FieldSet &) const override;
+    atlas::FunctionSpace productFunctionSpace(const atlas::FieldSet &) const override;
+
+    void executeNL(atlas::FieldSet &) override;
+};
+
+// -------------------------------------------------------------------------------------------------
+
+}  // namespace vader