Changeset 775 for XIOS/trunk/src/transformation/grid_generate.cpp

Timestamp:

11/02/15 11:46:25 (8 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

File:

• XIOS/trunk/src/transformation/grid_generate.cpp (modified) (4 diffs)

XIOS/trunk/src/transformation/grid_generate.cpp

@@ -17 +17 @@
 : gridSource_(source), gridDestination_(destination), algoTypes_()
 {
-  //Verify the compatibity between two grids
-  int numElement = gridDestination_->axis_domain_order.numElements();
-  if (numElement != gridSource_->axis_domain_order.numElements())
-    ERROR("CGridGenerate::CGridGenerate(CGrid* destination, CGrid* source)",
-       << "Two grids have different number of elements"
-       << "Number of elements of grid source " <<gridSource_->getId() << " is " << gridSource_->axis_domain_order.numElements()  << std::endl
-       << "Number of elements of grid destination " <<gridDestination_->getId() << " is " << numElement);
-
-  for (int i = 0; i < numElement; ++i)
-  {
-    if (gridDestination_->axis_domain_order(i) != gridSource_->axis_domain_order(i))
+  if (0 != source)
+  {
+    //Verify the compatibity between two grids
+    int numElement = gridDestination_->axis_domain_order.numElements();
+    if (numElement != gridSource_->axis_domain_order.numElements())
       ERROR("CGridGenerate::CGridGenerate(CGrid* destination, CGrid* source)",
-         << "Transformed grid and its grid source have incompatible elements"
-         << "Grid source " <<gridSource_->getId() << std::endl
-         << "Grid destination " <<gridDestination_->getId());
+         << "Two grids have different number of elements"
+         << "Number of elements of grid source " <<gridSource_->getId() << " is " << gridSource_->axis_domain_order.numElements()  << std::endl
+         << "Number of elements of grid destination " <<gridDestination_->getId() << " is " << numElement);
+
+    for (int i = 0; i < numElement; ++i)
+    {
+      if (gridDestination_->axis_domain_order(i) != gridSource_->axis_domain_order(i))
+        ERROR("CGridGenerate::CGridGenerate(CGrid* destination, CGrid* source)",
+           << "Transformed grid and its grid source have incompatible elements"
+           << "Grid source " <<gridSource_->getId() << std::endl
+           << "Grid destination " <<gridDestination_->getId());
+    }
   }
 
@@ -179 +182 @@
 {
   std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
-  std::vector<CAxis*> axisListSrcP = gridSource_->getAxis();
 
   int axisIndex =  elementPosition2AxisPositionInGrid_[elementPositionInGrid];
@@ -207 +209 @@
 {
   std::vector<CDomain*> domainListDestP = gridDestination_->getDomains();
-  std::vector<CDomain*> domainListSrcP = gridSource_->getDomains();
+  std::vector<CDomain*> domainListSrcP(domainListDestP.size());
+  if (0 != gridSource_) domainListSrcP = gridSource_->getDomains();
 
   int domainIndex =  elementPosition2DomainPositionInGrid_[elementPositionInGrid];
@@ -223 +226 @@
       {
         genRectDomain = dynamic_cast<CGenerateRectilinearDomain*> (it->second);
-        algo = new CDomainAlgorithmGenerateRectilinear(domainListDestP[domainIndex], domainListSrcP[domainIndex], gridSource_, genRectDomain);
+        algo = new CDomainAlgorithmGenerateRectilinear(domainListDestP[domainIndex], domainListSrcP[domainIndex],
+                                                       gridDestination_, gridSource_, genRectDomain);
       }
       else