Merge pull request #49 from MetOffice/feature/fix_bug_memory_manag

[bugfix] I/O processing procedure: fixed bug (memory leakage)

Author: phlndrwd

src/monio/File.cc

@@ -53,8 +53,10 @@ void monio::File::close() {
   } else if (fileMode_ == netCDF::NcFile::write) {
     oops::Log::debug() << "write" << std::endl;
   }
-  getFile().close();
-  dataFile_.release();
+  if (dataFile_ != nullptr) {
+    getFile().close();
+    dataFile_.reset();
+  }
 }
 // Reading functions ///////////////////////////////////////////////////////////////////////////////
 

src/monio/Monio.cc

@@ -319,8 +319,12 @@ void monio::Monio::writeFieldSet(const atlas::FieldSet& localFieldSet,
 
 void monio::Monio::closeFiles() {
   oops::Log::trace() << "Monio::closeFiles()" << std::endl;
-  reader_.closeFile();
-  writer_.closeFile();
+  if (reader_.isOpen() == true) {
+    reader_.closeFile();
+  }
+  if (writer_.isOpen() == true) {
+    writer_.closeFile();
+  }
 }
 
 int monio::Monio::initialiseFile(const atlas::Grid& grid,

src/monio/Reader.cc

@@ -59,7 +59,7 @@ void monio::Reader::closeFile() {
   if (mpiCommunicator_.rank() == mpiRankOwner_) {
     if (isOpen() == true) {
       getFile().close();
-      file_.release();
+      file_.reset();
     }
   }
 }

src/monio/Writer.cc

@@ -55,7 +55,7 @@ void monio::Writer::closeFile() {
   if (mpiCommunicator_.rank() == mpiRankOwner_) {
     if (isOpen() == true) {
       getFile().close();
-      file_.release();
+      file_.reset();
     }
   }
 }