Changeset 1646 for XIOS/dev/dev_trunk_omp/src/data_output.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/src/data_output.cpp (modified) (5 diffs)

XIOS/dev/dev_trunk_omp/src/data_output.cpp

@@ -47 +47 @@
 
       void CDataOutput::writeGrid(CDomain* domain, CAxis* axis)
+      TRY
       {
          this->writeDomain_(domain);
          this->writeAxis_(axis);
       }
+      CATCH
 
       void CDataOutput::writeGrid(std::vector<CDomain*> domains, std::vector<CAxis*> axis)
+      TRY
       {
         int domSize = domains.size();
@@ -59 +62 @@
         for (int i = 0; i < aSize; ++i) this->writeAxis_(axis[i]);
       }
+      CATCH
 
       void CDataOutput::writeGrid(std::vector<CDomain*> domains, std::vector<CAxis*> axis, std::vector<CScalar*> scalars)
+      TRY
       {
         int domSize = domains.size();
@@ -69 +74 @@
         for (int i = 0; i < sSize; ++i) this->writeScalar_(scalars[i]);
       }
+      CATCH
 
       //----------------------------------------------------------------
 
       void CDataOutput::writeGrid(CDomain* domain)
+      TRY
       {
          this->writeDomain_(domain);
       }
+      CATCH
 
       void CDataOutput::writeTimeDimension(void)
+      TRY
       {
          this->writeTimeDimension_();
       }
+      CATCH
 
       //----------------------------------------------------------------
 
       void CDataOutput::writeFieldTimeAxis(CField* field)
+      TRY
       {
          CContext* context = CContext::getCurrent() ;
@@ -91 +102 @@
          this->writeTimeAxis_(field, calendar);
       }
-      
+      CATCH
+
       void CDataOutput::writeField(CField* field)
+      TRY
       {
          this->writeField_(field);
       }
+      CATCH
 
       //----------------------------------------------------------------
 
       void CDataOutput::writeFieldGrid(CField* field)
+      TRY
       {
          this->writeGrid(field->getRelGrid(),
                          !field->indexed_output.isEmpty() && field->indexed_output);
       }
-
+      CATCH
       //----------------------------------------------------------------
 
       void CDataOutput::writeFieldData(CField* field)
+      TRY
       {
 //         CGrid* grid = CGrid::get(field->grid_ref.getValue());
@@ -113 +129 @@
          this->writeFieldData_(field);
       }
+      CATCH
 
       ///----------------------------------------------------------------