Changeset 1545 for XIOS/dev/branch_openmp/src/node/file.hpp

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

File:

• XIOS/dev/branch_openmp/src/node/file.hpp (modified) (4 diffs)

XIOS/dev/branch_openmp/src/node/file.hpp

@@ -13 +13 @@
 #include "attribute_enum_impl.hpp"
 #include "context_client.hpp"
-//#include "mpi.hpp"
+
 
 namespace xios {
@@ -72 +72 @@
          /// Accesseurs ///
          const StdString getFileOutputName(void) const;
-         boost::shared_ptr<CDataOutput> getDataOutput(void) const;
-         boost::shared_ptr<CDataInput> getDataInput(void) const;
+         std::shared_ptr<CDataOutput> getDataOutput(void) const;
+         std::shared_ptr<CDataInput> getDataInput(void) const;
          CFieldGroup* getVirtualFieldGroup(void) const;
          CVariableGroup* getVirtualVariableGroup(void) const;
@@ -119 +119 @@
          void checkGridOfEnabledFields();
          void sendGridOfEnabledFields();
-         void sendGridComponentOfEnabledFields();   
+         void sendGridComponentOfEnabledFields();
+
+         void sortEnabledFieldsForUgrid();
 
          // Add component into file
@@ -185 +187 @@
          CFieldGroup* vFieldGroup;
          CVariableGroup* vVariableGroup;
-         boost::shared_ptr<CDataOutput> data_out;
-         boost::shared_ptr<CDataInput> data_in;
+         std::shared_ptr<CDataOutput> data_out;
+         std::shared_ptr<CDataInput> data_in;
          std::vector<CField*> enabledFields;