Merge branch 'release/1.21.0'

ecmwf · May 14, 2024 · 979a904 · 979a904
2 parents ab6b0c5 + 5bbf422
commit 979a904
Show file tree

Hide file tree

Showing 700 changed files with 1,815 additions and 1,409 deletions.
diff --git a/.github/ci-config.yml b/.github/ci-config.yml
@@ -1,3 +1,4 @@
+cmake_options: -DENABLE_BUILD_TOOLS=ON
 dependencies: |
   ecmwf/ecbuild
   MathisRosenhauer/libaec@master

diff --git a/.github/ci-hpc-config.yml b/.github/ci-hpc-config.yml
@@ -7,3 +7,5 @@ build:
     - ecmwf/eckit@develop
     - ecmwf/atlas@develop
   parallel: 64
+  env:
+    - MIR_CACHING=0
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.20.0
+1.21.0
diff --git a/etc/mir/parameter-class.yaml b/etc/mir/parameter-class.yaml
diff --git a/src/mir/action/filter/ShTruncate.cc b/src/mir/action/filter/ShTruncate.cc
@@ -43,7 +43,8 @@ bool ShTruncate::sameAs(const Action& other) const {
 
 
 void ShTruncate::print(std::ostream& out) const {
-    out << "ShTruncate[" << "truncation=" << truncation_ << "]";
+    out << "ShTruncate["
+        << "truncation=" << truncation_ << "]";
 }
 
 

diff --git a/src/mir/action/interpolate/Gridded2GridDef.cc b/src/mir/action/interpolate/Gridded2GridDef.cc
@@ -47,7 +47,8 @@ void Gridded2GridDef::custom(std::ostream& out) const {
 
 
 void Gridded2GridDef::print(std::ostream& out) const {
-    out << "Gridded2GridDef[" << "griddef=" << griddef_ << ",";
+    out << "Gridded2GridDef["
+        << "griddef=" << griddef_ << ",";
     Gridded2UnrotatedGrid::print(out);
     out << "]";
 }

diff --git a/src/mir/action/interpolate/Gridded2RegularLL.cc b/src/mir/action/interpolate/Gridded2RegularLL.cc
@@ -40,7 +40,8 @@ Gridded2RegularLL::Gridded2RegularLL(const param::MIRParametrisation& parametris
 
     repres::latlon::LatLon::globaliseBoundingBox(bbox_, increments_, reference_);
 
-    Log::debug() << "Gridded2RegularLL: globalise:" << "\n\t" << increments_ << "\n\t" << bbox_
+    Log::debug() << "Gridded2RegularLL: globalise:"
+                 << "\n\t" << increments_ << "\n\t" << bbox_
                  << "\n\t"
                     "shifted in latitude? "
                  << increments_.isLatitudeShifted(bbox_)

diff --git a/src/mir/action/interpolate/Gridded2RotatedLL.cc b/src/mir/action/interpolate/Gridded2RotatedLL.cc
@@ -40,7 +40,8 @@ Gridded2RotatedLL::Gridded2RotatedLL(const param::MIRParametrisation& parametris
 
     repres::latlon::LatLon::globaliseBoundingBox(bbox_, increments_, reference_);
 
-    Log::debug() << "Gridded2RotatedLL: globalise:" << "\n\t" << increments_ << "\n\t" << bbox_
+    Log::debug() << "Gridded2RotatedLL: globalise:"
+                 << "\n\t" << increments_ << "\n\t" << bbox_
                  << "\n\t"
                     "shifted in latitude? "
                  << increments_.isLatitudeShifted(bbox_)

diff --git a/src/mir/action/plan/Action.cc b/src/mir/action/plan/Action.cc
@@ -172,7 +172,8 @@ Action* ActionFactory::build(const std::string& name, const param::MIRParametris
 
                         if (j != m->end()) {
                             std::ostringstream oss;
-                            oss << "ActionFactory: ambiguous '" << name << "'" << ", could be '" << j->first << "'"
+                            oss << "ActionFactory: ambiguous '" << name << "'"
+                                << ", could be '" << j->first << "'"
                                 << " or '" << p->first << "'";
                             Log::error() << "   " << j->first << std::endl;
                             throw exception::SeriousBug(oss.str());

diff --git a/src/mir/action/plan/ActionPlan.cc b/src/mir/action/plan/ActionPlan.cc
@@ -144,13 +144,21 @@ void ActionPlan::execute(context::Context& ctx) const {
 
     for (const auto& p : *this) {
         if (Log::debug_active()) {
-            Log::debug() << "Executing:" << "\n" << sep << "\n" << *p << "\n" << sep << std::endl;
+            Log::debug() << "Executing:"
+                         << "\n"
+                         << sep << "\n"
+                         << *p << "\n"
+                         << sep << std::endl;
         }
 
         p->perform(ctx);
 
         if (Log::debug_active()) {
-            Log::debug() << "Result:" << "\n" << sep << "\n" << ctx << "\n" << sep << std::endl;
+            Log::debug() << "Result:"
+                         << "\n"
+                         << sep << "\n"
+                         << ctx << "\n"
+                         << sep << std::endl;
         }
     }
 
@@ -180,7 +188,11 @@ void ActionPlan::estimate(context::Context& ctx, api::MIREstimation& estimation)
 void ActionPlan::compress() {
     const char* sep = "#########";
 
-    Log::debug() << "Compress:" << "\n" << sep << "\n" << *this << "\n" << sep << std::endl;
+    Log::debug() << "Compress:"
+                 << "\n"
+                 << sep << "\n"
+                 << *this << "\n"
+                 << sep << std::endl;
 
     bool hasCompressed = false;
     bool more          = true;
@@ -193,8 +205,9 @@ void ActionPlan::compress() {
 
             if (action(i).mergeWithNext(action(i + 1))) {
 
-                Log::debug() << "ActionPlan::compress: " << "\n   " << oldAction.str() << "\n + " << action(i + 1)
-                             << "\n = " << action(i) << std::endl;
+                Log::debug() << "ActionPlan::compress: "
+                             << "\n   " << oldAction.str() << "\n + " << action(i + 1) << "\n = " << action(i)
+                             << std::endl;
 
                 delete at(i + 1);
                 erase(begin() + long(i + 1));
@@ -217,10 +230,16 @@ void ActionPlan::compress() {
     }
 
     if (hasCompressed) {
-        Log::debug() << "Compress result:" << "\n" << sep << "\n" << *this << "\n" << sep << std::endl;
+        Log::debug() << "Compress result:"
+                     << "\n"
+                     << sep << "\n"
+                     << *this << "\n"
+                     << sep << std::endl;
     }
     else {
-        Log::debug() << "Compress result: unable to compress" << "\n" << sep << std::endl;
+        Log::debug() << "Compress result: unable to compress"
+                     << "\n"
+                     << sep << std::endl;
     }
 }
 

diff --git a/src/mir/action/transform/ShToGridded.cc b/src/mir/action/transform/ShToGridded.cc
@@ -187,8 +187,8 @@ void ShToGridded::transform(data::MIRField& field, const repres::Representation&
         }
         else if (!creator.supported()) {
 
-            Log::warning() << "ShToGridded: LegendreCacheCreator is not supported for:" << "\n  representation: "
-                           << representation << "\n  options: " << options_ << std::endl
+            Log::warning() << "ShToGridded: LegendreCacheCreator is not supported for:"
+                           << "\n  representation: " << representation << "\n  options: " << options_ << std::endl
                            << "ShToGridded: continuing with hindered performance" << std::endl;
 
             trans = atlas_trans_t(grid, domain, truncation, options_);
@@ -317,8 +317,9 @@ bool ShToGridded::mergeWithNext(const Action& next) {
         repres::RepresentationHandle out(outputRepresentation());
         cropping_.boundingBox(out->extendBoundingBox(bbox));
 
-        Log::debug() << "ShToGridded::mergeWithNext: " << "\n   " << oldAction.str() << "\n + " << next
-                     << "\n = " << *this << "\n + " << "(...)" << std::endl;
+        Log::debug() << "ShToGridded::mergeWithNext: "
+                     << "\n   " << oldAction.str() << "\n + " << next << "\n = " << *this << "\n + "
+                     << "(...)" << std::endl;
     }
     return false;
 }

diff --git a/src/mir/caching/InMemoryCache.cc b/src/mir/caching/InMemoryCache.cc
@@ -113,8 +113,9 @@ void InMemoryCache<T>::reserve(const InMemoryCacheUsage& usage) {
     auto u = usage;
     auto p = (f + u) - c;
 
-    Log::debug() << "CACHE-RESERVE-" << name_ << " " << " => " << u << " footprint: " << f << " capacity: " << c
-                 << " f+u: " << f + u << " f+u-c: " << p << std::endl;
+    Log::debug() << "CACHE-RESERVE-" << name_ << " "
+                 << " => " << u << " footprint: " << f << " capacity: " << c << " f+u: " << f + u << " f+u-c: " << p
+                 << std::endl;
 
 
     if (p) {

diff --git a/src/mir/compare/Field.cc b/src/mir/compare/Field.cc
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <ostream>
 
+#include "eckit/log/JSON.h"
 #include "eckit/option/CmdArgs.h"
 #include "eckit/option/SimpleOption.h"
 

diff --git a/src/mir/compare/FieldComparator.cc b/src/mir/compare/FieldComparator.cc
@@ -569,14 +569,16 @@ void FieldComparator::compareFieldStatistics(const MultiFile& multi1, const Mult
     constexpr double relativeErrorMax = 0.01;
 
     if (s1.values_ != s2.values_) {
-        Log::info() << "Number of data values mismatch:" << "\n  " << multi1 << ": " << s1.values_ << " " << field1
-                    << "\n  " << multi2 << ": " << s2.values_ << " " << field2 << std::endl;
+        Log::info() << "Number of data values mismatch:"
+                    << "\n  " << multi1 << ": " << s1.values_ << " " << field1 << "\n  " << multi2 << ": " << s2.values_
+                    << " " << field2 << std::endl;
         error("statistics-mismatches");
     }
 
     if (s1.missing_ != s2.missing_) {
-        Log::info() << "Number of missing values mismatch:" << "\n  " << multi1 << ": " << s1.missing_ << " " << field1
-                    << "\n  " << multi2 << ": " << s2.missing_ << " " << field2 << std::endl;
+        Log::info() << "Number of missing values mismatch:"
+                    << "\n  " << multi1 << ": " << s1.missing_ << " " << field1 << "\n  " << multi2 << ": "
+                    << s2.missing_ << " " << field2 << std::endl;
         error("statistics-mismatches");
     }
 
@@ -641,8 +643,9 @@ void FieldComparator::compareFieldValues(const FieldComparator::MultiFile& multi
         auto problems = comp->execute(input1->field(), input2->field());
 
         if (!problems.empty()) {
-            Log::info() << "Value compare failed between:" << "\n  " << multi1 << ": " << field1 << "\n  " << multi2
-                        << ": " << field2 << "\n  reporting " << *comp << "\n  failed because" << problems << std::endl;
+            Log::info() << "Value compare failed between:"
+                        << "\n  " << multi1 << ": " << field1 << "\n  " << multi2 << ": " << field2 << "\n  reporting "
+                        << *comp << "\n  failed because" << problems << std::endl;
             error("values-mismatches");
         }
     }
@@ -669,8 +672,9 @@ void FieldComparator::compareFieldMissingValues(const FieldComparator::MultiFile
     auto problems = comp->execute(input1->field(), input2->field());
 
     if (!problems.empty()) {
-        Log::info() << "Value compare failed between:" << "\n  " << multi1 << ": " << field1 << "\n  " << multi2 << ": "
-                    << field2 << "\n  reporting " << *comp << "\n  failed because" << problems << std::endl;
+        Log::info() << "Value compare failed between:"
+                    << "\n  " << multi1 << ": " << field1 << "\n  " << multi2 << ": " << field2 << "\n  reporting "
+                    << *comp << "\n  failed because" << problems << std::endl;
         error("values-mismatches");
     }
 }
@@ -733,7 +737,8 @@ void FieldComparator::missingField(const MultiFile& multi1, const MultiFile& mul
 
     std::vector<Field> matches = field.bestMatches(fields);
     if (!matches.empty()) {
-        Log::info() << " ? " << "No match found in " << multi2 << std::endl;
+        Log::info() << " ? "
+                    << "No match found in " << multi2 << std::endl;
         size_t cnt = 0;
 
         auto flds = field.sortByDifference(fields);
@@ -781,7 +786,8 @@ void FieldComparator::missingField(const MultiFile& multi1, const MultiFile& mul
     }
     else {
 
-        Log::info() << " + " << "Possible matched in " << multi2 << std::endl;
+        Log::info() << " + "
+                    << "Possible matched in " << multi2 << std::endl;
 
         size_t cnt = 0;
         for (const auto& other : matches) {
@@ -845,8 +851,8 @@ void FieldComparator::compareCounts(const std::string& name, const MultiFile& mu
     size_t n2 = count(multi2, fields2);
 
     if (n1 != n2) {
-        Log::info() << name << " count mismatch" << "\n  " << n1 << " " << multi1 << "\n  " << n2 << " " << multi2
-                    << std::endl;
+        Log::info() << name << " count mismatch"
+                    << "\n  " << n1 << " " << multi1 << "\n  " << n2 << " " << multi2 << std::endl;
         error("count-mismatches");
     }
 }

diff --git a/src/mir/data/CartesianVector2DField.cc b/src/mir/data/CartesianVector2DField.cc
@@ -95,7 +95,8 @@ void CartesianVector2DField::rotate(const util::Rotation& rotation, MIRValuesVec
 
 
 void CartesianVector2DField::print(std::ostream& out) const {
-    out << "CartesianVector2DField[" << "]";
+    out << "CartesianVector2DField["
+        << "]";
 }
 
 

diff --git a/src/mir/input/GribInput.cc b/src/mir/input/GribInput.cc
@@ -127,7 +127,8 @@ bool ConditionT<std::string>::eval(grib_handle* h) const {
     }
 
     if (err != 0) {
-        Log::debug() << "ConditionT<std::string>::eval(" << ",key=" << key_ << ") failed " << err << std::endl;
+        Log::debug() << "ConditionT<std::string>::eval("
+                     << ",key=" << key_ << ") failed " << err << std::endl;
         GRIB_ERROR(err, key_);
     }
 

diff --git a/src/mir/method/MethodWeighted.cc b/src/mir/method/MethodWeighted.cc
@@ -272,7 +272,8 @@ const WeightMatrix& MethodWeighted::getMatrix(context::Context& ctx, const repre
 
         j << "interpolation";
         j.startObject();
-        j << "engine" << "mir";
+        j << "engine"
+          << "mir";
         j << "version" << caching::WeightCache::version();
         const static std::map<eckit::Hash::digest_t, std::string> KNOWN_METHOD{
             {"73e1dd539879ffbbbb22d6bc789c2262", "linear"},

diff --git a/src/mir/method/fe/CalculateCellLongestDiagonal.cc b/src/mir/method/fe/CalculateCellLongestDiagonal.cc
@@ -86,6 +86,7 @@ double CalculateCellLongestDiagonal::operator()(atlas::Mesh& mesh, bool include_
                         d = std::max(d, util::Earth::distance(P[ni], P[nj]));
                         if (d > dMax) {
                             Log::warning() << "CalculateCellLongestDiagonal: limited to maximum " << dMax << "m";
+                            mesh.metadata().set(name_, dMax);
                             return dMax;
                         }
                     }
-Original file line number
+Diff line change
@@ Expand Up @@
     void CartesianVector2DField::print(std::ostream& out) const {
-        out << "CartesianVector2DField[" << "]";
+        out << "CartesianVector2DField["
+            << "]";
     }
@@ Expand Down @@