diff --git a/include/Cubism/LosslessCompression.h b/include/Cubism/LosslessCompression.h index e633d0d7bb11b7c8838a1105793e2c9c79ba742c..28ed3d7a4c162ce4152962a72e58a52a97468ed6 100644 --- a/include/Cubism/LosslessCompression.h +++ b/include/Cubism/LosslessCompression.h @@ -18,12 +18,11 @@ CUBISM_NAMESPACE_BEGIN extern "C" { +// FIXME: [fabianw@mavt.ethz.ch; Sat Nov 24 2018 11:25:37 PM (+0100)] CubismZ +// dependence #include "myfpzip.h" } -inline size_t ZZcompress(unsigned char *buf, unsigned len, int layout[4], unsigned *max); -inline size_t ZZdecompress(unsigned char * inputbuf, size_t ninputbytes, int layout[4], unsigned char * outputbuf, const size_t maxsize); - template inline size_t ZZdecompress(unsigned char * inputbuf, size_t ninputbytes, int layout[4], unsigned char * outputbuf, const size_t maxsize) diff --git a/include/Cubism/MeshKernels.h b/include/Cubism/MeshKernels.h index 6e1b95284a2c7f791d0acc76ba1dc65231b1b039..a8b8fb29aba5e9c2308cafe1f460380a19f2d187 100644 --- a/include/Cubism/MeshKernels.h +++ b/include/Cubism/MeshKernels.h @@ -17,8 +17,8 @@ #include #include // C++11 -#include "MeshMap.h" -#include "ArgumentParser.h" +#include "Cubism/MeshMap.h" +#include "Cubism/ArgumentParser.h" CUBISM_NAMESPACE_BEGIN diff --git a/include/Cubism/ZBinDumper.h b/include/Cubism/ZBinDumper.h index feaab39536e8a2cbfd9353ae9bc53a8fb3325610..6524cb02230120cd967a65bd9432417f56870c79 100644 --- a/include/Cubism/ZBinDumper.h +++ b/include/Cubism/ZBinDumper.h @@ -24,10 +24,6 @@ typedef struct _header_serial long size[8]; } header_serial; -/* -inline size_t ZZcompress(unsigned char *buf, unsigned len, int layout[4], unsigned *max) -inline size_t ZZdecompress(unsigned char * inputbuf, size_t ninputbytes, int layout[4], unsigned char * outputbuf, const size_t maxsize); -*/ // The following requirements for the data TStreamer are required: // TStreamer::NCHANNELS : Number of data elements (1=Scalar, 3=Vector, 9=Tensor) @@ -114,7 +110,7 @@ void DumpZBin(const TGrid &grid, unsigned int max = local_bytes; // int layout[4] = {NCHANNELS, NX, NY, NZ}; int layout[4] = {NX, NY, NZ, 1}; - long compressed_bytes = ZZcompress((unsigned char *)array_all, local_bytes, layout, &max); // "in place" + long compressed_bytes = ZZcompress((unsigned char *)array_all, local_bytes, layout, &max); // "in place" printf("Writing %ld bytes of Compressed data (cr = %.2f)\n", compressed_bytes, NX*NY*NZ*sizeof(Real)*NCHANNELS*1.0/compressed_bytes); @@ -191,7 +187,7 @@ void ReadZBin(TGrid &grid, const std::string& f_name, const std::string& read_pa size_t rb_data = fread(tmp, 1, compressed_bytes, file_id); int layout[4] = {NX, NY, NZ, 1}; - size_t decompressed_bytes = ZZdecompress(tmp, compressed_bytes, layout, (unsigned char *)array_all, local_bytes); + size_t decompressed_bytes = ZZdecompress(tmp, compressed_bytes, layout, (unsigned char *)array_all, local_bytes); free(tmp); #if DBG printf("size = %ld (%ld)\n", decompressed_bytes, local_bytes); fflush(0); diff --git a/include/Cubism/ZBinDumper_MPI.h b/include/Cubism/ZBinDumper_MPI.h index 90280bb74cd1e1254691a14daa7f38c9e8512886..7fae4a5c3fd53d54f9cd745ac1652289aa3ed7c9 100644 --- a/include/Cubism/ZBinDumper_MPI.h +++ b/include/Cubism/ZBinDumper_MPI.h @@ -29,10 +29,6 @@ typedef struct _header long size[8]; } header; -/* -inline size_t ZZcompress(unsigned char *buf, unsigned len, int layout[4], unsigned *max) -inline size_t ZZdecompress(unsigned char * inputbuf, size_t ninputbytes, int layout[4], unsigned char * outputbuf, const size_t maxsize); -*/ // The following requirements for the data TStreamer are required: // TStreamer::NCHANNELS : Number of data elements (1=Scalar, 3=Vector, 9=Tensor) @@ -42,7 +38,7 @@ template void DumpZBin_MPI( const TGrid &grid, const int iCounter, - const TGrid::Real t, + const typename TGrid::Real t, const std::string &f_name, const std::string &dump_path = ".", const bool bDummy = false) @@ -140,7 +136,7 @@ void DumpZBin_MPI( unsigned int max = local_bytes; // int layout[4] = {NCHANNELS, NX, NY, NZ}; int layout[4] = {NX, NY, NZ, 1}; - long compressed_bytes = ZZcompress((unsigned char *)array_all, local_bytes, layout, &max); // "in place" + long compressed_bytes = ZZcompress((unsigned char *)array_all, local_bytes, layout, &max); // "in place" #if DBG printf("Writing %ld bytes of Compressed data (cr = %.2f)\n", compressed_bytes, local_bytes*1.0/compressed_bytes); #endif @@ -253,7 +249,7 @@ void ReadZBin_MPI(TGrid &grid, const std::string& f_name, const std::string& rea // int layout[4] = {NCHANNELS, NX, NY, NZ}; int layout[4] = {NX, NY, NZ, 1}; - size_t decompressed_bytes = ZZdecompress(tmp, compressed_bytes, layout, (unsigned char *)array_all, local_bytes); + size_t decompressed_bytes = ZZdecompress(tmp, compressed_bytes, layout, (unsigned char *)array_all, local_bytes); free(tmp); #if DBG printf("rank %d, offset = %ld, size = %ld (%ld)\n", rank, offset, decompressed_bytes, local_bytes); fflush(0); diff --git a/src/ArgumentParser.cpp b/src/ArgumentParser.cpp index dfd83dbfeb86b0c07599a22d37fa59e94eb33ce3..1ba81439675346d5e375c811885c9a8446e4f94f 100644 --- a/src/ArgumentParser.cpp +++ b/src/ArgumentParser.cpp @@ -1,11 +1,11 @@ -#include "Cubism/ArgumentParser.h" - #include #include #include #include #include // C++11 +#include "Cubism/ArgumentParser.h" + CUBISM_NAMESPACE_BEGIN /////////////////////////////////////////////////////////// diff --git a/src/Histogram.cpp b/src/Histogram.cpp index edbb411c81c5e6e02b2866b0fea8ee43f7424862..83b05fc564ecd49129dd06944dbfc0739cfc9e9c 100644 --- a/src/Histogram.cpp +++ b/src/Histogram.cpp @@ -7,12 +7,13 @@ * Copyright 2012 ETH Zurich. All rights reserved. * */ -#include "Histogram.h" #include #include #include #include +#include "Cubism/Histogram.h" + using namespace std; CUBISM_NAMESPACE_BEGIN