Changeset 1882 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp

Timestamp:

05/18/20 10:11:57 (4 years ago)

Author:

ymipsl

Message:

Xios coupling branch
Refactor and simplify file writer filter management on server side.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp (modified) (3 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp

@@ -190 +190 @@
         void recvUpdateDataFromCoupler(std::map<int,CBufferIn*>& rankBuffers);
         
-        void writeField(void);
+        void writeField(const CArray<double,1>& data);
         bool sendReadDataRequest(const CDate& tsDataRequested, CContextClient* client);
         bool sendReadDataRequestIfNeeded(void);
         static void recvReadDataRequest(CEventServer& event);
         void recvReadDataRequest(CContextServer* server);
-        EReadField readField(void);
+        EReadField readField(CArray<double,1>& data);
         static void recvReadDataReady(CEventServer& event);
         void recvReadDataReady(vector<int> ranks, vector<CBufferIn*> buffers);
@@ -206 +206 @@
         void triggerLateField(void) ;
 
-        void outputField(CArray<double,3>& fieldOut);
-        void outputField(CArray<double,2>& fieldOut);
-        void outputField(CArray<double,1>& fieldOut);
-        void inputField(CArray<double,3>& fieldOut);
-        void inputField(CArray<double,2>& fieldOut);
-        void inputField(CArray<double,1>& fieldOut);
-        void outputCompressedField(CArray<double, 1>& fieldOut);
-        void scaleFactorAddOffset(double scaleFactor, double addOffset);
-        void invertScaleFactorAddOffset(double scaleFactor, double addOffset);
+//        void outputField(CArray<double,3>& fieldOut);
+//        void outputField(CArray<double,2>& fieldOut);
+        void outputField(const CArray<double,1>& dataIn, CArray<double,1>& dataOut);
+
+//        void inputField(CArray<double,3>& fieldOut);
+//        void inputField(CArray<double,2>& fieldOut);
+        void inputField(const CArray<double,1>& dataIn, CArray<double,1>& dataOut);
+        void outputCompressedField(const CArray<double,1>& dataIn, CArray<double, 1>& dataOut);
+        void scaleFactorAddOffset(CArray<double,1>& data, double scaleFactor, double addOffset);
+        void invertScaleFactorAddOffset(CArray<double,1>& data, double scaleFactor, double addOffset);
         void parse(xml::CXMLNode& node);
 
@@ -329 +330 @@
 
          // map<int, CArray<double,1> > data_srv;
-         CArray<double,1> recvDataSrv;
+//         CArray<double,1> recvDataSrv; // not usefull anymore
          
          std::shared_ptr<func::CFunctor> recvFoperationSrv;