X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?p=LbmBenchmarkKernelsPublic.git;a=blobdiff_plain;f=src%2FGeometry.c;h=c7e3f204ffcf7e8d8c9bab1adf0f29899fdb895a;hp=0450c56d81fb6fea2b988bf16f7c0864b4e21f61;hb=0fde6e45e9be83893afae896cf49a799777f6d7c;hpb=712d0b8fc4a382e1cfe4edef8b0ade11b0a2ce25 diff --git a/src/Geometry.c b/src/Geometry.c index 0450c56..c7e3f20 100644 --- a/src/Geometry.c +++ b/src/Geometry.c @@ -32,6 +32,8 @@ #include +static const char * g_geoTypeStr[] = { "box", "channel", "pipe", "blocks", "fluid" }; + void GeoCreateByStr(const char * geometryType, int dims[3], int periodic[3], LatticeDesc * ld) { int type = -1; @@ -102,9 +104,9 @@ void GeoCreateByType(GEO_TYPES type, void * typeDetails, int dims[3], int period Assert(type >= GEO_TYPE_MIN); Assert(type <= GEO_TYPE_MAX); - const char * geoTypeStr[] = { "box", "channel", "pipe", "blocks", "fluid" }; + // const char * geoTypeStr[] = { "box", "channel", "pipe", "blocks", "fluid" }; - printf("# geometry: %d x %d x %d nodes, type %d %s\n", dims[0], dims[1], dims[2], type, geoTypeStr[type]); + // printf("# geometry: %d x %d x %d nodes, type %d %s\n", dims[0], dims[1], dims[2], type, geoTypeStr[type]); ld->Dims[0] = dims[0]; ld->Dims[1] = dims[1]; @@ -113,6 +115,7 @@ void GeoCreateByType(GEO_TYPES type, void * typeDetails, int dims[3], int period ld->PeriodicX = periodic[0]; ld->PeriodicY = periodic[1]; ld->PeriodicZ = periodic[2]; + ld->Name = g_geoTypeStr[type]; LatticeT * lattice; MemAlloc((void **)&lattice, sizeof(LatticeT) * dims[0] * dims[1] * dims[2]);