Changeset 1004 for XIOS/trunk/src/node/interpolate_domain.cpp

Timestamp:

11/25/16 14:12:15 (7 years ago)

Author:

mhnguyen

Message:

Some modifications of reading/writing interpolation weight from/into a file
There are 3 attributes concerning read/write weights from/into a file

• write_weight: true/false. Default value: false
• weight_filename.
• mode: Default value: compute + read: read from file whose name is weight_filename + compute: compute weights + read_or_compute: if weight_filename already exists, the weights will be read from it; otherwise the weights will be computed

In mode compute and read_or_compute, if there is no weight_filename, a filename whose format
xios_interpolation_weight_nameOfContext_nameOfDomainSource_nameOfDomainDestination.nc will be used for read/write.

Test
+) On Curie
+) Work

File:

• XIOS/trunk/src/node/interpolate_domain.cpp (modified) (1 diff)

XIOS/trunk/src/node/interpolate_domain.cpp

@@ -48 +48 @@
     }
 
-    StdString weightFile = "interpolation_weights_" + domainSrc->getDomainOutputName();
+    if (this->mode.isEmpty()) this->mode.setValue(mode_attr::compute);
+    if (this->write_weight.isEmpty()) this->write_weight.setValue(false);
 
-    if (!this->mode.isEmpty())
-    { 
-      if (mode_attr::read == this->mode)
-      {
-         if (this->file.isEmpty())
-         {
+    StdString weightFile;
+    switch (this->mode)
+    {
+      case mode_attr::read:
+        if (this->file.isEmpty())
+        {
+          if (!this->write_weight)
             ERROR("void CInterpolateDomain::checkValid(CDomain* domainSrc)",
                  << "Read mode is activated but there is no file specified." << std::endl
                  << "Please define a correct file containing interpolation weights with option 'file'. ");
-         }
-         else
-         {
-           weightFile = this->file;
-           ifstream f(weightFile.c_str());
-           if (!f.good())
-             ERROR("void CInterpolateDomain::checkValid(CDomain* domainSrc)",
-                   << "Read mode is activated but file "  << weightFile << " doesn't exist." << std::endl
-                   << "Please check this file ");
-         }
-      }
-      else
-      {
-        if (file.isEmpty())
-          this->file.setValue(weightFile);
-      }   
-    }
-    else
-    {
-      if (!file.isEmpty()) // set mode read
-      {
-         weightFile = this->file;
-         ifstream f(weightFile.c_str());
-         if (!f.good()) // file doesn't exist
-           this->mode.setValue(mode_attr::write);
-         else
-           this->mode.setValue(mode_attr::read);
-      }
-      else // only calculate weights() Mode set write but there is no file)
-      {
-        this->mode.setValue(mode_attr::write);
-      }
+        }
+        else
+        {
+          weightFile = this->file;
+          ifstream f(weightFile.c_str());
+          if (!f.good())
+            ERROR("void CInterpolateDomain::checkValid(CDomain* domainSrc)",
+                  << "Read mode is activated but file "  << weightFile << " doesn't exist." << std::endl
+                  << "Please check this file ");
+        }
+        break;
+      case mode_attr::compute:
+        break;
+      case mode_attr::read_or_compute:
+        if (!this->file.isEmpty() && !this->write_weight)
+        {
+          weightFile = this->file;
+          ifstream f(weightFile.c_str());
+          if (!f.good())
+            ERROR("void CInterpolateDomain::checkValid(CDomain* domainSrc)",
+                  << "read_or_compute mode is activated but file "  << weightFile << " doesn't exist." << std::endl
+                  << "Please check this file ");
+        }
+        break;
+      default:
+        break;
     }