- Timestamp:
- 03/08/19 16:59:14 (5 years ago)
- Location:
- XIOS/dev/dev_olga
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_olga/arch/arch-X64_IRENE.env
r1589 r1654 1 1 module unload netcdf-c netcdf-fortran hdf5 flavor perl hdf5 boost blitz mpi gnu 2 module load gnu3 module load mpi/openmpi/2.0.24 2 module load flavor/hdf5/parallel 5 3 module load netcdf-fortran/4.4.4 6 4 module load hdf5/1.8.20 5 module load gnu 7 6 module load boost 8 7 module load blitz -
XIOS/dev/dev_olga/bld.cfg
r1636 r1654 43 43 bld::lib xios 44 44 bld::target libxios.a 45 bld::target generate_fortran_interface.exe45 #bld::target generate_fortran_interface.exe 46 46 #bld::target test_remap.exe 47 #bld::target xios_server.exe47 bld::target xios_server.exe 48 48 #bld::target test_regular.exe 49 49 #bld::target test_xios2_cmip6.exe -
XIOS/dev/dev_olga/src/filter/file_server_writer_filter.cpp
r1653 r1654 12 12 ERROR("CFileServerWriterFilter::CFileServerWriterFilter(CField* field)", 13 13 "The field cannot be null."); 14 filterId = InvalidableObject::count;15 InvalidableObject::count++;16 14 } 17 15 18 16 void CFileServerWriterFilter::onInputReady(std::vector<CDataPacketPtr> data) 19 17 { 20 field->writeUpdateData(data[0]->data); 18 field->writeUpdateData(data[0]->data); 21 19 } 22 20 -
XIOS/dev/dev_olga/src/filter/file_writer_filter.cpp
r1653 r1654 7 7 namespace xios 8 8 { 9 CFileWriterFilter::CFileWriterFilter(CGarbageCollector& gc, CField* field )9 CFileWriterFilter::CFileWriterFilter(CGarbageCollector& gc, CField* field, bool buildWorkflowGraph /* =false */) 10 10 : CInputPin(gc, 1) 11 11 , field(field) … … 14 14 ERROR("CFileWriterFilter::CFileWriterFilter(CField* field)", 15 15 "The field cannot be null."); 16 filterId = InvalidableObject::count; 17 InvalidableObject::count++; 16 if (buildWorkflowGraph) 17 { 18 filterId = InvalidableObject::count; 19 InvalidableObject::count++; 20 } 18 21 } 19 22 … … 38 41 39 42 field->sendUpdateData(dataArray); 43 40 44 } 41 45 -
XIOS/dev/dev_olga/src/filter/file_writer_filter.hpp
r1653 r1654 20 20 * \param gc the associated garbage collector 21 21 * \param field the associated field 22 * \param[in] buildWorkflowGraph indicates whether the workflow will be visualized 22 23 */ 23 CFileWriterFilter(CGarbageCollector& gc, CField* field );24 CFileWriterFilter(CGarbageCollector& gc, CField* field, bool buildWorkflowGraph = false); 24 25 25 26 inline StdString GetName(void) {return StdString("File writer filter");}; -
XIOS/dev/dev_olga/src/filter/input_pin.hpp
r1653 r1654 130 130 //! Whether some triggers have been set 131 131 bool hasTriggers; 132 132 133 }; // class CInputPin 133 134 } // namespace xios -
XIOS/dev/dev_olga/src/filter/output_pin.cpp
r1653 r1654 10 10 , buildWorkflowGraph(buildWorkflowGraph) 11 11 { 12 filterId = InvalidableObject::count; 13 InvalidableObject::count++; 12 if (buildWorkflowGraph) 13 { 14 filterId = InvalidableObject::count; 15 InvalidableObject::count++; 16 } 14 17 } 15 18 … … 49 52 } 50 53 else 54 { 51 55 deliverOuput(packet); 56 } 52 57 } 53 58 -
XIOS/dev/dev_olga/src/filter/output_pin.hpp
r1653 r1654 97 97 CGarbageCollector& gc; //!< The garbage collector associated to the output pin 98 98 99 //! <Whether the ouput should be triggered manually99 //! Whether the ouput should be triggered manually 100 100 bool manualTrigger; 101 101 102 //! <The list of connected filters and the corresponding slot numbers102 //! The list of connected filters and the corresponding slot numbers 103 103 std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> > outputs; 104 104 -
XIOS/dev/dev_olga/src/filter/source_filter.cpp
r1653 r1654 25 25 "Impossible to construct a source filter without providing a grid."); 26 26 } 27 27 28 28 template <int N> 29 29 void CSourceFilter::streamData(CDate date, const CArray<double, N>& data) -
XIOS/dev/dev_olga/src/filter/source_filter.hpp
r1653 r1654 74 74 const bool compression ; //!< indicates if data need to be compressed : on client side : true, on server side : false 75 75 const bool mask ; //!< indicates whether grid mask should be applied (true for clients, false for servers) 76 76 77 }; // class CSourceFilter 77 78 } // namespace xios -
XIOS/dev/dev_olga/src/filter/store_filter.cpp
r1653 r1654 21 21 ERROR("CStoreFilter::CStoreFilter(CContext* context, CGrid* grid)", 22 22 "Impossible to construct a store filter without providing a grid."); 23 filterId = InvalidableObject::count;24 InvalidableObject::count++;23 // filterId = InvalidableObject::count; 24 // InvalidableObject::count++; 25 25 } 26 26 -
XIOS/dev/dev_olga/src/node/field.cpp
r1653 r1654 1212 1212 instantDataFilter = clientSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, false, true, NoneDu, false, 1213 1213 detectMissingValues, defaultValue, buildWorkflowGraph)); 1214 if (buildWorkflowGraph) CWorkflowGraph::mapFilters[instantDataFilter->getFilterId()] = instantDataFilter->GetName(); 1214 1215 } 1215 1216 } … … 1227 1228 if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write)) 1228 1229 { 1229 fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this ));1230 fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this, buildWorkflowGraph)); 1230 1231 getTemporalDataFilter(gc, file->output_freq)->connectOutput(fileWriterFilter, 0); 1231 1232 if (buildWorkflowGraph) -
XIOS/dev/dev_olga/src/workflow_graph.cpp
r1653 r1654 24 24 // Create a list of filters (graph nodes) 25 25 size_t filterIdx = 0; 26 filters.resize(mapFilters.size()); 26 27 for (auto it=mapFilters.begin(); it != mapFilters.end(); it++) 27 28 { 28 filters .push_back(it->second);29 filters[it->first]=it->second; 29 30 } 30 31
Note: See TracChangeset
for help on using the changeset viewer.