Changeset 2351 for XIOS

Timestamp:

07/06/22 15:29:52 (2 years ago)

Author:

ymipsl

Message:

• Solve inheritance problem when referenced field is not on the same grid that current field and no transformation is involved (grid casting).
• Solve name inheritance problem for axis, domain or scalar elements in ouput files. Now name is determided folowing id or names of inherited element if current id is automatically generated.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp (modified) (13 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -1951 +1951 @@
     if (CGrid::has(newId))
     {
-      cout<<"Retrive existing grid : "<<newId<<endl ;
+      info(100)<<"Retrive existing grid : "<<newId<<endl ;
       newGrid = CGrid::get(newId);
       isNewGrid = false ;
@@ -1957 +1957 @@
     else  
     {
-      cout<<"Create new grid : "<<newId<<endl ;
+      info(100)<<"Create new grid : "<<newId<<endl ;
       newGrid = CGrid::create(newId) ;
       isNewGrid = true ;
@@ -1978 +1978 @@
 
       SElement srcElement  ;
-      if (gridSrc==nullptr) srcElement = this->elements_[i] ;
-      else srcElement = gridSrc->elements_[i] ;
-
-      if (gridSrc==nullptr) transformationPath.mergePaths() ;
+      
+      CTransformationPaths testTransformationPath(transformationPath) ;
+      testTransformationPath.mergePaths() ;
+
+      if (testTransformationPath.hasTransform())
+      {  
+        if (gridSrc==nullptr) srcElement = this->elements_[i] ;
+        else srcElement = gridSrc->elements_[i] ;
+
+        if (gridSrc==nullptr) transformationPath.mergePaths() ;
+        else
+        {  
+          if (srcElement.type==TYPE_DOMAIN)      transformationPath.mergePaths(srcElement.domain->getTransformationPaths()) ;
+          else if (srcElement.type==TYPE_AXIS)   transformationPath.mergePaths(srcElement.axis->getTransformationPaths()) ;
+          else if (srcElement.type==TYPE_SCALAR) transformationPath.mergePaths(srcElement.scalar->getTransformationPaths()) ;
+        }
+      }
       else
-      {  
-        if (srcElement.type==TYPE_DOMAIN)      transformationPath.mergePaths(srcElement.domain->getTransformationPaths()) ;
-        else if (srcElement.type==TYPE_AXIS)   transformationPath.mergePaths(srcElement.axis->getTransformationPaths()) ;
-        else if (srcElement.type==TYPE_SCALAR) transformationPath.mergePaths(srcElement.scalar->getTransformationPaths()) ;
-      }
+      {
+        srcElement = this->elements_[i] ;
+        transformationPath.mergePaths() ;
+      }  
 
       hasTransform=transformationPath.hasTransform()  ;
@@ -2009 +2021 @@
         map<int,int> posInGrid={{0,0}} ;
                
-        cout<<"--> New transform from "<<srcElementId<<" to "<<dstElementId<<endl ;
+        info(100)<<"--> New transform from "<<srcElementId<<" to "<<dstElementId<<endl ;
         if (dstElementType==EElement::DOMAIN)
         {
@@ -2022 +2034 @@
             {
               dstDomain = CDomain::get(dstElementId) ;
-              cout<<"Retrive existing domain : "<<dstElementId<<endl ;
+              info(100)<<"Retrive existing domain : "<<dstElementId<<endl ;
             }
             else
@@ -2028 +2040 @@
               dstDomain = CDomain::create() ;
               dstDomain->createAlias(dstElementId) ;
-              cout<<"Create new domain : "<<dstDomain->getId()<<" with alias : "<<dstElementId<<endl ;
+              info(100)<<"Create new domain : "<<dstDomain->getId()<<" with alias : "<<dstElementId<<endl ;
 
               if (isGenerate) 
@@ -2084 +2096 @@
             {
               dstAxis = CAxis::get(dstElementId) ;
-              cout<<"Retrive existing axis : "<<dstElementId<<endl ;
+              info(100)<<"Retrive existing axis : "<<dstElementId<<endl ;
             }
             else
@@ -2090 +2102 @@
               dstAxis = CAxis::create() ;
               dstAxis->createAlias(dstElementId) ;
-              cout<<"Create new axis : "<<dstAxis->getId()<<" with alias : "<<dstElementId<<endl ;
+              info(100)<<"Create new axis : "<<dstAxis->getId()<<" with alias : "<<dstElementId<<endl ;
               
               if (isGenerate) 
@@ -2145 +2157 @@
             {
               dstScalar = CScalar::get(dstElementId) ;
-              cout<<"Retrive existing scalar : "<<dstElementId<<endl ;
+              info(100)<<"Retrive existing scalar : "<<dstElementId<<endl ;
             }
             else
@@ -2151 +2163 @@
               dstScalar = CScalar::create() ;
               dstScalar->createAlias(dstElementId) ;
-              cout<<"Create new scalar : "<<dstScalar->getId()<<" with alias : "<<dstElementId<<endl ;
+              info(100)<<"Create new scalar : "<<dstScalar->getId()<<" with alias : "<<dstElementId<<endl ;
               
               if (isGenerate) 
@@ -2323 +2335 @@
           domain->duplicateAttributes(element.domain) ;
           domain->setTemplateId(element.domain) ;
-          if (domain->name.isEmpty()) domain->name = element.domain->getId() ;
+          domain->name = domain->getDomainOutputName() ;
           newGrid->addDomain(domain->getId()) ;
         }
@@ -2331 +2343 @@
           axis->duplicateAttributes(element.axis) ;
           axis->setTemplateId(element.axis) ;
-          if (axis->name.isEmpty()) axis->name = element.axis->getId() ;
+          axis->name = axis->getAxisOutputName() ;
           newGrid->addAxis(axis->getId()) ;
         }
@@ -2339 +2351 @@
           scalar->duplicateAttributes(element.scalar) ;
           scalar->setTemplateId(element.scalar) ;
-          if (scalar->name.isEmpty()) scalar->name = element.scalar->getId() ;
+          scalar->name = scalar->getScalarOutputName() ;
           newGrid->addScalar(scalar->getId()) ;
         }