Changeset 346 for XIOS/trunk/src/data_output.cpp

Timestamp:

04/12/12 17:02:23 (12 years ago)

Author:

ymipsl

Message:

Suppress access to CObjectFactory class and CTreeManager.

YM

File:

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

XIOS/trunk/src/data_output.cpp

@@ -23 +23 @@
          if (grid->axis_ref.isEmpty())
          {
-            this->writeGrid
-            (CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue()));
+            this->writeGrid(CDomain::get(grid->domain_ref.getValue()));
          }
          else
          {
-            this->writeGrid
-            (CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue()),
-             CObjectFactory::GetObject<CAxis>(grid->axis_ref.getValue()));
+            this->writeGrid(CDomain::get(grid->domain_ref.getValue()),
+                            CAxis::get(grid->axis_ref.getValue()));
          }
       }
@@ -75 +73 @@
          (const boost::shared_ptr<CField> field)
       {
-         boost::shared_ptr<CContext> context =
-         CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+         boost::shared_ptr<CContext> context = CContext::getCurrent() ;
          boost::shared_ptr<CCalendar> calendar = context->getCalendar();
          
@@ -95 +92 @@
       void CDataOutput::writeFieldData(const boost::shared_ptr<CField> field)
       {
-         boost::shared_ptr<CGrid> grid =
-            CObjectFactory::GetObject<CGrid>(field->grid_ref.getValue());
-         boost::shared_ptr<CDomain> domain =
-            CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue());
+         boost::shared_ptr<CGrid> grid = CGrid::get(field->grid_ref.getValue());
+         boost::shared_ptr<CDomain> domain = CDomain::get(grid->domain_ref.getValue());
             
 //         if (domain->isEmpty()) return;