Changeset 957 for XIOS/trunk/src/node/grid.cpp

Timestamp:

09/30/16 15:28:05 (8 years ago)

Author:

rlacroix

Message:

Fix a possible crash caused by an infinite recursion.

The way virtual groups were handled could cause id clashes which lead to have groups containing themselves.

File:

• XIOS/trunk/src/node/grid.cpp (modified) (3 diffs)

XIOS/trunk/src/node/grid.cpp

@@ -36 +36 @@
       , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
    {
-     setVirtualDomainGroup();
-     setVirtualAxisGroup();
-     setVirtualScalarGroup();
+     setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
+     setVirtualAxisGroup(CAxisGroup::create(getId() + "_virtual_axis_group"));
+     setVirtualScalarGroup(CScalarGroup::create(getId() + "_virtual_scalar_group"));
    }
 
@@ -54 +54 @@
       , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
    {
-     setVirtualDomainGroup();
-     setVirtualAxisGroup();
-     setVirtualScalarGroup();
+     setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
+     setVirtualAxisGroup(CAxisGroup::create(getId() + "_virtual_axis_group"));
+     setVirtualScalarGroup(CScalarGroup::create(getId() + "_virtual_scalar_group"));
    }
 
@@ -1482 +1482 @@
    }
 
-   //----------------------------------------------------------------
-   //! Create virtual field group, which is done normally on initializing file
-   void CGrid::setVirtualDomainGroup(void)
-   {
-      this->setVirtualDomainGroup(CDomainGroup::create());
-   }
-
-   //! Create virtual variable group, which is done normally on initializing file
-   void CGrid::setVirtualAxisGroup(void)
-   {
-      this->setVirtualAxisGroup(CAxisGroup::create());
-   }
-
-   //! Create virtual variable group, which is done normally on initializing file
-   void CGrid::setVirtualScalarGroup(void)
-   {
-      this->setVirtualScalarGroup(CScalarGroup::create());
-   }
-
    /*!
    \brief Send a message to create a domain on server side