Changeset 771 for XIOS/trunk/src/node

Timestamp:

10/30/15 16:33:49 (9 years ago)

Author:

rlacroix

Message:

Remove the now unused base reference framework.

Location:

XIOS/trunk/src/node

Files:

• axis.cpp (modified) (2 diffs)
• field.cpp (modified) (3 diffs)
• file.cpp (modified) (1 diff)
• grid.cpp (modified) (2 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -23 +23 @@
    CAxis::CAxis(void)
       : CObjectTemplate<CAxis>()
-      , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject(), areClientAttributesChecked_(false)
+      , CAxisAttributes(), isChecked(false), relFiles(), areClientAttributesChecked_(false)
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
@@ -32 +32 @@
    CAxis::CAxis(const StdString & id)
       : CObjectTemplate<CAxis>(id)
-      , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject(), areClientAttributesChecked_(false)
+      , CAxisAttributes(), isChecked(false), relFiles(), areClientAttributesChecked_(false)
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)

XIOS/trunk/src/node/field.cpp

@@ -30 +30 @@
    CField::CField(void)
       : CObjectTemplate<CField>(), CFieldAttributes()
-      , baseRefObject()
       , grid(), file()
       , written(false)
@@ -42 +41 @@
    CField::CField(const StdString& id)
       : CObjectTemplate<CField>(id), CFieldAttributes()
-      , baseRefObject()
       , grid(), file()
       , written(false)
@@ -504 +502 @@
         {
           solveRefInheritance(true);
-          solveBaseReference();
           if (hasDirectFieldReference()) getDirectFieldReference()->solveAllReferenceEnabledField(false);
         }

XIOS/trunk/src/node/file.cpp

@@ -161 +161 @@
          // Le champ est finalement actif, on y ajoute la référence au champ de base.
          (*it)->setRelFile(CFile::get(this));
-//         (*it)->baseRefObject->refObject.push_back(*it);
-         // A faire, ajouter les references intermediaires...
       }
       enabledFields = newEnabledFields;

XIOS/trunk/src/node/grid.cpp

@@ -1221 +1221 @@
       {
         pDom->solveRefInheritance(apply);
-        pDom->solveBaseReference();
         pDom->solveSrcInheritance();
         pDom->solveInheritanceTransformation();
@@ -1235 +1234 @@
       {
         pAxis->solveRefInheritance(apply);
-        pAxis->solveBaseReference();
         pAxis->solveInheritanceTransformation();
       }