Missed some merge conflicts.

MetOffice · Oct 25, 2023 · 4bfc642 · 4bfc642
1 parent 93d6b72
commit 4bfc642
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 66 deletions.
diff --git a/src/monio/AtlasReader.cc b/src/monio/AtlasReader.cc
@@ -41,7 +41,6 @@ void monio::AtlasReader::populateFieldWithDataContainer(atlas::Field& field,
   if (mpiCommunicator_.rank() == mpiRankOwner_) {
     int dataType = dataContainer.get()->getType();
     switch (dataType) {
-<<<<<<< HEAD
       case consts::eDataTypes::eDouble: {
         const std::shared_ptr<DataContainerDouble> dataContainerDouble =
             std::static_pointer_cast<DataContainerDouble>(dataContainer);
@@ -61,27 +60,6 @@ void monio::AtlasReader::populateFieldWithDataContainer(atlas::Field& field,
         break;
       }
       default: {
-=======
-    case consts::eDataTypes::eDouble: {
-      const std::shared_ptr<DataContainerDouble> dataContainerDouble =
-          std::static_pointer_cast<DataContainerDouble>(dataContainer);
-          populateField(field, dataContainerDouble->getData(), lfricToAtlasMap, noFirstLevel);
-      break;
-    }
-    case consts::eDataTypes::eFloat: {
-      const std::shared_ptr<DataContainerFloat> dataContainerFloat =
-          std::static_pointer_cast<DataContainerFloat>(dataContainer);
-          populateField(field, dataContainerFloat->getData(), lfricToAtlasMap, noFirstLevel);
-      break;
-    }
-    case consts::eDataTypes::eInt: {
-      const std::shared_ptr<DataContainerInt> dataContainerInt =
-          std::static_pointer_cast<DataContainerInt>(dataContainer);
-          populateField(field, dataContainerInt->getData(), lfricToAtlasMap, noFirstLevel);
-      break;
-    }
-    default: {
->>>>>>> 94662e8d3e65f47bd55526903c917eb1c763175c
         Monio::get().closeFiles();
         utils::throwException("AtlasReader::populateFieldWithDataContainer()> "
                                  "Data type not coded for...");
@@ -96,7 +74,6 @@ void monio::AtlasReader::populateFieldWithDataContainer(atlas::Field& field,
   if (mpiCommunicator_.rank() == mpiRankOwner_) {
     int dataType = dataContainer.get()->getType();
     switch (dataType) {
-<<<<<<< HEAD
       case consts::eDataTypes::eDouble: {
         const std::shared_ptr<DataContainerDouble> dataContainerDouble =
             std::static_pointer_cast<DataContainerDouble>(dataContainer);
@@ -116,27 +93,6 @@ void monio::AtlasReader::populateFieldWithDataContainer(atlas::Field& field,
         break;
       }
       default: {
-=======
-    case consts::eDataTypes::eDouble: {
-      const std::shared_ptr<DataContainerDouble> dataContainerDouble =
-          std::static_pointer_cast<DataContainerDouble>(dataContainer);
-          populateField(field, dataContainerDouble->getData());
-      break;
-    }
-    case consts::eDataTypes::eFloat: {
-      const std::shared_ptr<DataContainerFloat> dataContainerFloat =
-          std::static_pointer_cast<DataContainerFloat>(dataContainer);
-          populateField(field, dataContainerFloat->getData());
-      break;
-    }
-    case consts::eDataTypes::eInt: {
-      const std::shared_ptr<DataContainerInt> dataContainerInt =
-          std::static_pointer_cast<DataContainerInt>(dataContainer);
-          populateField(field, dataContainerInt->getData());
-      break;
-    }
-    default: {
->>>>>>> 94662e8d3e65f47bd55526903c917eb1c763175c
         Monio::get().closeFiles();
         utils::throwException("AtlasReader::populateFieldWithDataContainer()> "
                                  "Data type not coded for...");

diff --git a/src/monio/AtlasWriter.cc b/src/monio/AtlasWriter.cc
@@ -204,11 +204,7 @@ void monio::AtlasWriter::populateDataContainerWithField(
       }
       default: {
         Monio::get().closeFiles();
-<<<<<<< HEAD
         utils::throwException("AtlasWriter::populateDataContainerWithField()> "
-=======
-utils::throwException("AtlasWriter::populateDataContainerWithField()> "
->>>>>>> 94662e8d3e65f47bd55526903c917eb1c763175c
                                  "Data type not coded for...");
       }
     }
@@ -259,23 +255,10 @@ void monio::AtlasWriter::populateDataContainerWithField(
         populateDataVec(dataContainerDouble->getData(), field, dimensions);
         break;
       }
-<<<<<<< HEAD
       default: {
         Monio::get().closeFiles();
         utils::throwException("AtlasWriter::populateDataContainerWithField()> "
-=======
-      std::shared_ptr<DataContainerDouble> dataContainerDouble =
-                        std::static_pointer_cast<DataContainerDouble>(dataContainer);
-      dataContainerDouble->clear();
-      dataContainerDouble->setSize(fieldSize);
-      populateDataVec(dataContainerDouble->getData(), field, dimensions);
-      break;
-    }
-    default: {
-        Monio::get().closeFiles();
-utils::throwException("AtlasWriter::populateDataContainerWithField()> "
->>>>>>> 94662e8d3e65f47bd55526903c917eb1c763175c
-                                 "Data type not coded for...");
+                              "Data type not coded for...");
       }
     }
   }
@@ -289,11 +272,7 @@ void monio::AtlasWriter::populateDataVec(std::vector<T>& dataVec,
   int numLevels = field.levels();
   if ((lfricToAtlasMap.size() * numLevels) != dataVec.size()) {
     Monio::get().closeFiles();
-<<<<<<< HEAD
     utils::throwException("AtlasWriter::populateDataVec()> "
-=======
-utils::throwException("AtlasWriter::populateDataVec()> "
->>>>>>> 94662e8d3e65f47bd55526903c917eb1c763175c
                           "Data container is not configured for the expected data...");
   }
   auto fieldView = atlas::array::make_view<T, 2>(field);