Changeset 2632

Timestamp:

05/29/24 19:23:08 (5 weeks ago)

Author:

ymipsl

Message:

• Recheck grid/domain/axis/scalar after reading grid from file, otherwise some attributes are not taking into account.

YM

Location:

XIOS3/trunk/src/node

Files:

• axis.cpp (modified) (2 diffs)
• axis.hpp (modified) (1 diff)
• domain.cpp (modified) (2 diffs)
• domain.hpp (modified) (1 diff)
• field.cpp (modified) (2 diffs)
• grid.cpp (modified) (1 diff)
• grid.hpp (modified) (1 diff)
• scalar.cpp (modified) (2 diffs)
• scalar.hpp (modified) (1 diff)

XIOS3/trunk/src/node/axis.cpp

@@ -279 +279 @@
    */
    
-   void CAxis::checkAttributes(void)
-   {
-      if (checkAttributes_done_) return ;
+   void CAxis::checkAttributes(bool recheck)
+   {
+      if (!recheck && checkAttributes_done_) return ;
       checkGeometricAttributes(true) ;
       initializeLocalElement() ;
@@ -291 +291 @@
    }
    
-   void CAxis::resetGeometricAttributes(void)
+    void CAxis::resetGeometricAttributes(void)
    {
      n_glo.reset();

XIOS3/trunk/src/node/axis.hpp

@@ -124 +124 @@
         
          /// Vérifications ///
-         void checkAttributes(void);
+         void checkAttributes(bool recheck=false);
          bool checkAttributes_done_ = false ;
          bool checkGeometricAttributes(bool generateError) ; 

XIOS3/trunk/src/node/domain.cpp

@@ -1760 +1760 @@
    CATCH_DUMP_ATTR
 
-   void CDomain::checkAttributes(void)
-   TRY
-   {
-      if (this->checkAttributes_done_) return;
+   void CDomain::checkAttributes(bool recheck)
+   TRY
+   {
+      if (!recheck && checkAttributes_done_) return ;
       this->checkDomain();
       this->compute2dBox() ;
@@ -1804 +1804 @@
    }
    CATCH_DUMP_ATTR
+
+
 
    size_t CDomain::computeAttributesHash( MPI_Comm comm )

XIOS3/trunk/src/node/domain.hpp

@@ -88 +88 @@
 
          /// Vérifications ///
-         void checkAttributes(void);
+         void checkAttributes(bool recheck=false);
          bool checkAttributes_done_ = false ;
 

XIOS3/trunk/src/node/field.cpp

@@ -749 +749 @@
          //grid_->completeGrid(); // grid generation, to be checked
          if (fileIn_->isClientSide()) fileIn_->readFieldAttributesValues(this);
-         grid_->checkElementsAttributes() ;
+         grid_->checkElementsAttributes(true) ; // need to recheck
 //         grid_->solveDomainAxisBaseRef();
          // probably in future tag grid incomplete if coming from a reading
@@ -781 +781 @@
       }
     }
+
+    // do again ref inheritance for field attributes read from file
+    this->solveRefInheritance();
 
     buildWorkflowGraphDone_ = true ;

XIOS3/trunk/src/node/grid.cpp

@@ -1974 +1974 @@
   \brief check attributes of all elements of the grid
   */
-  void CGrid::checkElementsAttributes(void)
+  void CGrid::checkElementsAttributes(bool recheck)
   TRY
   {
     setDomainList();
-    for (auto domainId : domList_) CDomain::get(domainId)->checkAttributes();
+    for (auto domainId : domList_) CDomain::get(domainId)->checkAttributes(recheck);
 
     setAxisList();
-    for (auto axisId : axisList_) CAxis::get(axisId)->checkAttributes();
+    for (auto axisId : axisList_) CAxis::get(axisId)->checkAttributes(recheck);
     
     setScalarList();
-    for (auto scalarId : scalarList_) CScalar::get(scalarId)->checkAttributes();
+    for (auto scalarId : scalarList_) CScalar::get(scalarId)->checkAttributes(recheck);
   }
   CATCH_DUMP_ATTR

XIOS3/trunk/src/node/grid.hpp

@@ -157 +157 @@
       public:            
          void solveDomainAxisRef(bool areAttributesChecked);
-         void checkElementsAttributes(void) ;
+         void checkElementsAttributes(bool recheck=false) ;
 
          void solveDomainRef(bool checkAtt);

XIOS3/trunk/src/node/scalar.cpp

@@ -116 +116 @@
   }
 
-  void CScalar::checkAttributes(void)
-  {
-    if (checkAttributes_done_) return ;
+  void CScalar::checkAttributes(bool recheck)
+  {
+    if (!recheck && checkAttributes_done_) return ;
     checkAttributes_done_ = true ; 
     
@@ -134 +134 @@
     addModelView() ;
   }
-
+ 
   /*!
     Compare two scalar objects. 

XIOS3/trunk/src/node/scalar.hpp

@@ -88 +88 @@
 
     public:
-      void checkAttributes(void);
+      void checkAttributes(bool recheck=false);
       bool checkAttributes_done_ = false ;