Skip to content
Snippets Groups Projects
Commit 2d2ba46a authored by Podhorszki, Norbert's avatar Podhorszki, Norbert
Browse files

Merge branch 'chuckatkins-tweak-formatting' into adios1

Conflicts:
	doc/API_design/API_example_use.cpp
	examples/groupless/basic/reader.cpp
	examples/groupless/basic/writer.cpp
	examples/groupless/compound/reader.cpp
	examples/groupless/compound/writer.cpp
	examples/groupless/multistep/reader_allsteps.cpp
	examples/groupless/multistep/reader_stepping.cpp
	examples/groupless/multistep/writer_multistep.cpp
	examples/heatTransfer/IO_adios2.cpp
	examples/heatTransfer/main.cpp
	examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp
	include/ADIOS.h
	include/capsule/shmem/ShmSystemV.h
	include/core/Method.h
	include/core/Support.h
	include/core/Variable.h
	include/engine/adios1/ADIOS1Reader.h
	include/engine/adios1/ADIOS1Writer.h
	include/format/BP1.h
	include/format/BP1Writer.h
	source/core/Method.cpp
	source/engine/adios1/ADIOS1Reader.cpp
	source/transport/file/FileDescriptor.cpp
parents 317f902e 1757fc4f
No related branches found
No related tags found
1 merge request!41ADIOS1 Write engine, Selections, Variable.SetSelection() and updated Heat Transfer example
Showing
with 99 additions and 86 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment