Skip to content
Snippets Groups Projects
Commit 5374db3f authored by William F Godoy's avatar William F Godoy
Browse files

Merge branch 'master' into bp1read 

Conflicts:
	examples/hello/bpTimeWriter/CMakeLists.txt
	examples/hello/bpWriter/CMakeLists.txt
	source/adios2/engine/dataman/DataManReader.cpp
	source/adios2/engine/dataman/DataManWriter.cpp
	source/adios2/engine/dataman/DataManWriter.h
	source/adios2/toolkit/transport/file/FileDescriptor.cpp
	source/adios2/toolkit/transport/file/FileDescriptor.h
	source/adios2/toolkit/transport/file/FilePointer.cpp
	source/adios2/toolkit/transport/file/FilePointer.h
	source/adios2/toolkit/transport/file/FileStream.cpp
	source/adios2/toolkit/transport/file/FileStream.h
	source/adios2/toolkit/transportman/dataman/DataMan.cpp
	testing/adios2/bindings/C/TestBPWriteTypes.c
	testing/adios2/bindings/C/TestBPWriteTypes_nompi.c
	testing/adios2/engine/bp/TestBPWriteProfilingJSON.cpp
	testing/adios2/engine/bp/TestBPWriteRead.cpp
	testing/adios2/engine/bp/TestBPWriteReadfstream.cpp
	testing/adios2/engine/bp/TestBPWriteReadstdio.cpp
	testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
	testing/adios2/interface/TestADIOSDefineAttribute.cpp
	testing/adios2/interface/TestADIOSDefineVariable.cpp
parents 225eeee6 e29d5bd5
No related branches found
No related tags found
1 merge request!294Bp1read : Initial Reading Capabilities and latest API
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1743 additions and 34 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment