examples/heatTransfer/write/IO_adios1.cpp · 4e6944060e5a543f90fca97a854dd1eea3750682 · Podhorszki, Norbert / ADIOS2

7 years ago

Merge remote-tracking branch 'upstream/master' into refactor · 396a42fe

William F Godoy authored 7 years ago

Conflicts:
	examples/experimental/multistep/reader_allsteps.cpp
	examples/experimental/multistep/reader_stepping.cpp
	examples/experimental/multistep/writer_multistep.cpp
	examples/hello/README.md
	examples/hello/bpWriter/helloBPWriter.cpp
	examples/hello/hdf5Writer/helloHDF5Writer.cpp
	source/adios2/engine/hdf5/HDF5Common.cpp
	source/adios2/engine/hdf5/HDF5WriterP.cpp
	source/adios2/engine/hdf5/HDF5WriterP.h

396a42fe

History

Merge remote-tracking branch 'upstream/master' into refactor

William F Godoy authored 7 years ago

Conflicts:
	examples/experimental/multistep/reader_allsteps.cpp
	examples/experimental/multistep/reader_stepping.cpp
	examples/experimental/multistep/writer_multistep.cpp
	examples/hello/README.md
	examples/hello/bpWriter/helloBPWriter.cpp
	examples/hello/hdf5Writer/helloHDF5Writer.cpp
	source/adios2/engine/hdf5/HDF5Common.cpp
	source/adios2/engine/hdf5/HDF5WriterP.cpp
	source/adios2/engine/hdf5/HDF5WriterP.h

Code owners

Assign users and groups as approvers for specific file changes. Learn more.