Changeset 887 for XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

Timestamp:

07/05/16 15:59:02 (8 years ago)

Author:

mhnguyen

Message:

Adding a new type of element into grid: Scalar

+) Add a new node Scalar for xml
+) Make some change on writing scalar value
+) Reorganize some codes
+) Remove some redundant codes

Test
+) On Curie
+) All tests pass

File:

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

XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

@@ -84 +84 @@
   std::vector<CAxis*> axisListDestP = gridDst->getAxis();
   std::vector<CDomain*> domainListDestP = gridDst->getDomains();
-  CArray<bool,1> axisDomainDstOrder = gridDst->axis_domain_order;
+  CArray<int,1> axisDomainDstOrder = gridDst->axis_domain_order;
   std::vector<CAxis*> axisListSrcP = gridSrc->getAxis();
   std::vector<CDomain*> domainListSrcP = gridSrc->getDomains();
@@ -96 +96 @@
     if (idx == elementPositionInGrid)
       computeExchangeGlobalIndex(indexSrc, globalIndexOfTransformedElementOnProc); //globalElementIndexOnProc[idx]);
-    if (axisDomainDstOrder(idx)) // It's domain
+    if (2 == axisDomainDstOrder(idx)) // It's domain
     {
       if (idx != elementPositionInGrid)
@@ -106 +106 @@
 
     }
-    else //it's an axis
+    else if (1 == axisDomainDstOrder(idx))//it's an axis
     {
       if (idx != elementPositionInGrid)
@@ -226 +226 @@
                                                                    SourceDestinationIndexMap& globaIndexWeightFromSrcToDst)
 {
+  std::vector<CDomain*> domainListSrcP = gridSrc->getDomains();
+  std::vector<CAxis*> axisListSrcP = gridSrc->getAxis();
+  std::vector<CScalar*> scalarListSrcP = gridSrc->getScalars();
+  CArray<int,1> axisDomainSrcOrder = gridSrc->axis_domain_order;
+
+  size_t nbElement = axisDomainSrcOrder.numElements();
+  std::vector<size_t> nGlobSrc(nbElement);
+  size_t globalSrcSize = 1;
+  int domainIndex = 0, axisIndex = 0, scalarIndex = 0;
+  for (int idx = 0; idx < nbElement; ++idx)
+  {
+    nGlobSrc[idx] = globalSrcSize;
+    int elementDimension = axisDomainSrcOrder(idx);
+
+    // If this is a domain
+    if (2 == elementDimension)
+    {
+      globalSrcSize *= domainListSrcP[domainIndex]->nj_glo.getValue() * domainListSrcP[domainIndex]->ni_glo.getValue();
+      ++domainIndex;
+    }
+    else if (1 == elementDimension) // So it's an axis
+    {
+      globalSrcSize *= axisListSrcP[axisIndex]->n_glo.getValue();
+      ++axisIndex;
+    }
+    else
+    {
+      globalSrcSize *= 1;
+      ++scalarIndex;
+    }
+  }
+
+  std::vector<CDomain*> domainListDestP = gridDst->getDomains();
   std::vector<CAxis*> axisListDestP = gridDst->getAxis();
-  std::vector<CDomain*> domainListDestP = gridDst->getDomains();
-  CArray<bool,1> axisDomainDstOrder = gridDst->axis_domain_order;
-  std::vector<CAxis*> axisListSrcP = gridSrc->getAxis();
-  std::vector<CDomain*> domainListSrcP = gridSrc->getDomains();
-  CArray<bool,1> axisDomainSrcOrder = gridDst->axis_domain_order;
-  size_t nbElement = axisDomainSrcOrder.numElements();
-  std::vector<size_t> nGlobSrc(nbElement), nGlobDst(nbElement);
-  size_t globalSrcSize = 1, globalDstSize = 1;
-  int domainIndex = 0;
-  int axisIndex = 0;
+  std::vector<CScalar*> scalarListDestP = gridDst->getScalars();
+  CArray<int,1> axisDomainDstOrder = gridDst->axis_domain_order;
+
+  std::vector<size_t> nGlobDst(nbElement);
+  size_t globalDstSize = 1;
+  domainIndex = axisIndex = scalarIndex = 0;
   for (int idx = 0; idx < nbElement; ++idx)
   {
-    nGlobSrc[idx] = globalSrcSize;
     nGlobDst[idx] = globalDstSize;
-    bool isDomain = axisDomainSrcOrder(idx);
+    int elementDimension = axisDomainSrcOrder(idx);
 
     // If this is a domain
-    if (isDomain)
-    {
-      globalSrcSize *= domainListSrcP[domainIndex]->nj_glo.getValue() * domainListSrcP[domainIndex]->ni_glo.getValue();
+    if (2 == elementDimension)
+    {
       globalDstSize *= domainListDestP[domainIndex]->nj_glo.getValue() * domainListDestP[domainIndex]->ni_glo.getValue();
       ++domainIndex;
     }
-    else // So it's an axis
-    {
-      globalSrcSize *= axisListSrcP[axisIndex]->n_glo.getValue();
+    else if (1 == elementDimension) // So it's an axis
+    {
       globalDstSize *= axisListDestP[axisIndex]->n_glo.getValue();
       ++axisIndex;
+    }
+    else
+    {
+      globalDstSize *= 1;
+      ++scalarIndex;
     }
   }