Merge pull request #27 from MetOffice/feature/monio_increment_read_write

Add `kMissingVariableName = "none"` for lfric-jedi
MetOffice · Oct 24, 2023 · 45c1e65 · 45c1e65
2 parents 881262b + 1d9514b
commit 45c1e65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/monio/AtlasWriter.cc b/src/monio/AtlasWriter.cc
@@ -330,7 +330,7 @@ atlas::Field monio::AtlasWriter::getWriteField(atlas::Field& field,
     utils::throwException("AtlasWriter::getWriteField()> Field levels misconfiguration...");
   }
   // WARNING - This name-check is an LFRic-Lite specific convention...
-  if (writeName != consts::kToBeDerived && writeName != consts::kToBeImplemented) {
+  if (utils::findInVector(consts::kMissingVariableNames, writeName) == false) {
     if (noFirstLevel == true && field.levels() == consts::kVerticalHalfSize) {
       atlas::util::Config atlasOptions = atlas::option::name(writeName) |
                                          atlas::option::global(0) |

diff --git a/src/monio/Constants.h b/src/monio/Constants.h
@@ -114,9 +114,6 @@ const std::string_view kLatitudeVarName = "latitude";
 const std::string_view kTabSpace = "    ";
 const std::string_view kNotFoundError = "NOT_FOUND";
 
-const std::string_view kToBeDerived = "TO BE DERIVED";
-const std::string_view kToBeImplemented = "TO BE IMPLEMENTED";
-
 const std::string_view kProducedByName = "produced_by";
 const std::string_view kProducedByString = "MONIO: Met Office NetCDF I/O";
 const std::string_view kNamingConventionName = "naming_convention";
@@ -172,6 +169,12 @@ const std::vector<std::string> kNamingConventions({
   "JEDI"
 });
 
+const std::vector<std::string> kMissingVariableNames({
+  "TO BE DERIVED",      // LFRic-Lite - variables without names in the LFRic context
+  "TO BE IMPLEMENTED",  // LFRic-Lite - theoretical variables that aren't used
+  "none"                // LFRic-JEDI
+});
+
 const std::vector<std::string> kLfricCoordVarNames = {std::string(kLfricLonVarName),
                                                       std::string(kLfricLatVarName)};
 const std::vector<std::string> kCoordVarNames = {std::string(kLongitudeVarName),