mirror of
https://github.com/paboyle/Grid.git
synced 2025-06-12 20:27:06 +01:00
Re-Merge branch 'develop' into feature/gpu-port
Pull in Regensburg MultiGrid pull request
This commit is contained in:
@ -177,8 +177,8 @@ int main(int argc,char **argv)
|
||||
ioTest<TextWriter, TextReader>("iotest.dat", obj, "text (object) ");
|
||||
ioTest<TextWriter, TextReader>("iotest.dat", vec, "text (vector of objects)");
|
||||
//// text
|
||||
ioTest<JSONWriter, JSONReader>("iotest.json", obj, "JSON (object) ");
|
||||
ioTest<JSONWriter, JSONReader>("iotest.json", vec, "JSON (vector of objects)");
|
||||
// ioTest<JSONWriter, JSONReader>("iotest.json", obj, "JSON (object) ");
|
||||
// ioTest<JSONWriter, JSONReader>("iotest.json", vec, "JSON (vector of objects)");
|
||||
|
||||
//// HDF5
|
||||
#ifdef HAVE_HDF5
|
||||
|
Reference in New Issue
Block a user