[MOAB-dev] commit/MOAB: danwu: Deleted ineffective backslash-newlines from the error handling code. It turns out that __LINE__ refers to physical lines, not logical ones.
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Mar 25 16:30:19 CDT 2014
1 new commit in MOAB:
https://bitbucket.org/fathomteam/moab/commits/80b822d03567/
Changeset: 80b822d03567
Branch: error_handling_enhancement
User: danwu
Date: 2014-03-25 22:29:58
Summary: Deleted ineffective backslash-newlines from the error handling code. It turns out that __LINE__ refers to physical lines, not logical ones.
Affected #: 6 files
diff --git a/src/io/NCHelper.cpp b/src/io/NCHelper.cpp
index 8124098..42bf23d 100644
--- a/src/io/NCHelper.cpp
+++ b/src/io/NCHelper.cpp
@@ -68,9 +68,9 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
Tag numDimsTag = 0;
tag_name = "__NUM_DIMS";
int numDims = dimNames.size();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 1, MB_TYPE_INTEGER, numDimsTag, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 1, MB_TYPE_INTEGER, numDimsTag, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(numDimsTag, &_fileSet, 1, &numDims); \
+ rval = mbImpl->tag_set_data(numDimsTag, &_fileSet, 1, &numDims);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -79,9 +79,9 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
Tag numVarsTag = 0;
tag_name = "__NUM_VARS";
int numVars = varInfo.size();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 1, MB_TYPE_INTEGER, numVarsTag, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 1, MB_TYPE_INTEGER, numVarsTag, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(numVarsTag, &_fileSet, 1, &numVars); \
+ rval = mbImpl->tag_set_data(numVarsTag, &_fileSet, 1, &numVars);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -96,10 +96,10 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
dimnames.push_back('\0');
}
int dimnamesSz = dimnames.size();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, dimNamesTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, dimNamesTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
const void* ptr = dimnames.c_str();
- rval = mbImpl->tag_set_by_ptr(dimNamesTag, &_fileSet, 1, &ptr, &dimnamesSz); \
+ rval = mbImpl->tag_set_by_ptr(dimNamesTag, &_fileSet, 1, &ptr, &dimnamesSz);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -108,10 +108,10 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
Tag dimLensTag = 0;
tag_name = "__DIM_LENS";
int dimLensSz = dimLens.size();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_INTEGER, dimLensTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_INTEGER, dimLensTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
ptr = &(dimLens[0]);
- rval = mbImpl->tag_set_by_ptr(dimLensTag, &_fileSet, 1, &ptr, &dimLensSz); \
+ rval = mbImpl->tag_set_by_ptr(dimLensTag, &_fileSet, 1, &ptr, &dimLensSz);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -126,10 +126,10 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
varnames.push_back('\0');
}
int varnamesSz = varnames.size();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, varNamesTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, varNamesTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
ptr = varnames.c_str();
- rval = mbImpl->tag_set_by_ptr(varNamesTag, &_fileSet, 1, &ptr, &varnamesSz); \
+ rval = mbImpl->tag_set_by_ptr(varNamesTag, &_fileSet, 1, &ptr, &varnamesSz);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -144,9 +144,9 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
std::vector<int> val(2, 0);
val[0] = 0;
val[1] = nTimeSteps - 1;
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]); \
+ rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -168,9 +168,9 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
std::stringstream ss_tag_name;
ss_tag_name << "__" << dimNames[i] << "_LOC_VALS";
tag_name = ss_tag_name.str();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), val.size(), MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), val.size(), MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]); \
+ rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -193,9 +193,9 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
mbImpl->tag_get_handle(tmptagname.c_str(), 0, MB_TYPE_OPAQUE, tmptag, MB_TAG_ANY);
varInfo[mapIter->first].varTags[i] = tmptag;
}
- rval = mbImpl->tag_get_handle(tag_name.c_str(), varDimSz, MB_TYPE_HANDLE, varNamesDimsTag, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), varDimSz, MB_TYPE_HANDLE, varNamesDimsTag, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(varNamesDimsTag, &_fileSet, 1, &(varInfo[mapIter->first].varTags[0])); \
+ rval = mbImpl->tag_set_data(varNamesDimsTag, &_fileSet, 1, &(varInfo[mapIter->first].varTags[0]));
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -205,21 +205,21 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
Tag part_tag = scdi->part_method_tag();
if (!part_tag)
SET_ERR(MB_FAILURE, "Trouble getting PARTITION_METHOD tag");
- rval = mbImpl->tag_set_data(part_tag, &_fileSet, 1, &partMethod); \
+ rval = mbImpl->tag_set_data(part_tag, &_fileSet, 1, &partMethod);
CHK_ERR1(rval, "Trouble setting data for PARTITION_METHOD tag");
// <__GLOBAL_ATTRIBS>
tag_name = "__GLOBAL_ATTRIBS";
Tag globalAttTag = 0;
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, globalAttTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, globalAttTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
std::string gattVal;
std::vector<int> gattLen;
- rval = create_attrib_string(globalAtts, gattVal, gattLen); \
+ rval = create_attrib_string(globalAtts, gattVal, gattLen);
CHK_ERR1(rval, "Trouble creating global attribute string");
const void* gattptr = gattVal.c_str();
int globalAttSz = gattVal.size();
- rval = mbImpl->tag_set_by_ptr(globalAttTag, &_fileSet, 1, &gattptr, &globalAttSz); \
+ rval = mbImpl->tag_set_by_ptr(globalAttTag, &_fileSet, 1, &gattptr, &globalAttSz);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -229,9 +229,9 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
Tag globalAttLenTag = 0;
if (gattLen.size() == 0)
gattLen.push_back(0);
- rval = mbImpl->tag_get_handle(tag_name.c_str(), gattLen.size(), MB_TYPE_INTEGER, globalAttLenTag, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), gattLen.size(), MB_TYPE_INTEGER, globalAttLenTag, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(globalAttLenTag, &_fileSet, 1, &gattLen[0]); \
+ rval = mbImpl->tag_set_data(globalAttLenTag, &_fileSet, 1, &gattLen[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -242,15 +242,15 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
ssTagName << "__" << mapIter->first << "_ATTRIBS";
tag_name = ssTagName.str();
Tag varAttTag = 0;
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, varAttTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, varAttTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
std::string varAttVal;
std::vector<int> varAttLen;
- rval = create_attrib_string(mapIter->second.varAtts, varAttVal, varAttLen); \
+ rval = create_attrib_string(mapIter->second.varAtts, varAttVal, varAttLen);
CHK_ERR1_STR(rval, "Trouble creating attribute string for variable " << mapIter->first);
const void* varAttPtr = varAttVal.c_str();
int varAttSz = varAttVal.size();
- rval = mbImpl->tag_set_by_ptr(varAttTag, &_fileSet, 1, &varAttPtr, &varAttSz); \
+ rval = mbImpl->tag_set_by_ptr(varAttTag, &_fileSet, 1, &varAttPtr, &varAttSz);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -260,9 +260,9 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
ssTagName << "_LEN";
tag_name = ssTagName.str();
Tag varAttLenTag = 0;
- rval = mbImpl->tag_get_handle(tag_name.c_str(), varAttLen.size(), MB_TYPE_INTEGER, varAttLenTag, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), varAttLen.size(), MB_TYPE_INTEGER, varAttLenTag, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(varAttLenTag, &_fileSet, 1, &varAttLen[0]); \
+ rval = mbImpl->tag_set_data(varAttLenTag, &_fileSet, 1, &varAttLen[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -273,12 +273,12 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
Tag varNamesLocsTag = 0;
std::vector<int> varNamesLocs(varInfo.size());
rval = mbImpl->tag_get_handle(tag_name.c_str(), varNamesLocs.size(), MB_TYPE_INTEGER, varNamesLocsTag, MB_TAG_CREAT
- | MB_TAG_SPARSE); \
+ | MB_TAG_SPARSE);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
for (mapIter = varInfo.begin(); mapIter != varInfo.end(); ++mapIter) {
varNamesLocs[std::distance(varInfo.begin(), mapIter)] = mapIter->second.entLoc;
}
- rval = mbImpl->tag_set_data(varNamesLocsTag, &_fileSet, 1, &varNamesLocs[0]); \
+ rval = mbImpl->tag_set_data(varNamesLocsTag, &_fileSet, 1, &varNamesLocs[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -288,11 +288,11 @@ ErrorCode NCHelper::create_conventional_tags(const std::vector<int>& tstep_nums)
tag_name = "__MESH_TYPE";
std::string meshTypeName = get_mesh_type_name();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, meshTypeTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_OPAQUE, meshTypeTag, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
ptr = meshTypeName.c_str();
int leng = meshTypeName.size();
- rval = mbImpl->tag_set_by_ptr(meshTypeTag, &_fileSet, 1, &ptr, &leng); \
+ rval = mbImpl->tag_set_by_ptr(meshTypeTag, &_fileSet, 1, &ptr, &leng);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -385,7 +385,7 @@ ErrorCode NCHelper::read_variables_to_set(std::vector<ReadNC::VarData>& vdatas,
Interface*& mbImpl = _readNC->mbImpl;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_variables_to_set_allocate(vdatas, tstep_nums); \
+ ErrorCode rval = read_variables_to_set_allocate(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble allocating space to read set variables");
// Finally, read into that space
@@ -438,11 +438,11 @@ ErrorCode NCHelper::read_variables_to_set(std::vector<ReadNC::VarData>& vdatas,
}
dbgOut.tprintf(2, "Converting set variable %s, time step %d\n", vdatas[i].varName.c_str(), tstep_nums[t]);
- rval = convert_variable(vdatas[i], t); \
+ rval = convert_variable(vdatas[i], t);
CHK_ERR1_STR(rval, "Failed to convert set variable " << vdatas[i].varName);
dbgOut.tprintf(2, "Setting tag data for set variable %s, time step %d\n", vdatas[i].varName.c_str(), tstep_nums[t]);
- rval = mbImpl->tag_set_by_ptr(vdatas[i].varTags[t], &_fileSet, 1, &data, &vdatas[i].sz); \
+ rval = mbImpl->tag_set_by_ptr(vdatas[i].varTags[t], &_fileSet, 1, &data, &vdatas[i].sz);
CHK_ERR1_STR(rval, "Failed to set tag data for set variable " << vdatas[i].varName);
// Memory pointed by pointer data can be deleted, as tag_set_by_ptr() has already copied the tag values
@@ -767,14 +767,14 @@ ErrorCode NCHelper::create_dummy_variables()
// Create a corresponding sparse tag
Tag tagh;
ErrorCode rval = mbImpl->tag_get_handle(var_name.c_str(), 0, MB_TYPE_INTEGER, tagh,
- MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Failed to create tag for dimension " << var_name);
// Tag value is the dimension length
const void* ptr = &dimLens[i];
// Tag size is 1
int size = 1;
- rval = mbImpl->tag_set_by_ptr(tagh, &_fileSet, 1, &ptr, &size); \
+ rval = mbImpl->tag_set_by_ptr(tagh, &_fileSet, 1, &ptr, &size);
CHK_ERR1_STR(rval, "Failed to set tag data for dimension " << var_name);
dbgOut.tprintf(2, "Sparse tag is created for dimension %s\n", var_name.c_str());
@@ -832,7 +832,7 @@ ErrorCode NCHelper::read_variables_to_set_allocate(std::vector<ReadNC::VarData>&
// Get the tag to read into
if (!vdatas[i].varTags[t]) {
- rval = get_tag_to_set(vdatas[i], tstep_nums[t], vdatas[i].varTags[t]); \
+ rval = get_tag_to_set(vdatas[i], tstep_nums[t], vdatas[i].varTags[t]);
CHK_ERR1_STR(rval, "Trouble getting tag for set variable " << vdatas[i].varName);
}
@@ -867,7 +867,7 @@ ErrorCode ScdNCHelper::check_existing_mesh() {
// Get the number of vertices
int num_verts;
- ErrorCode rval = mbImpl->get_number_entities_by_dimension(_fileSet, 0, num_verts); \
+ ErrorCode rval = mbImpl->get_number_entities_by_dimension(_fileSet, 0, num_verts);
CHK_ERR1(rval, "Trouble getting number of vertices");
/*
@@ -883,7 +883,7 @@ ErrorCode ScdNCHelper::check_existing_mesh() {
// Check the number of elements too
int num_elems;
- rval = mbImpl->get_number_entities_by_dimension(_fileSet, (-1 == lCDims[2] ? 2 : 3), num_elems); \
+ rval = mbImpl->get_number_entities_by_dimension(_fileSet, (-1 == lCDims[2] ? 2 : 3), num_elems);
CHK_ERR1(rval, "Trouble getting number of elements");
/*
@@ -913,7 +913,7 @@ ErrorCode ScdNCHelper::create_mesh(Range& faces)
ScdBox* scd_box;
ErrorCode rval = scdi->construct_box(HomCoord(lDims[0], lDims[1], lDims[2], 1), HomCoord(lDims[3], lDims[4], lDims[5], 1),
- NULL, 0, scd_box, locallyPeriodic, &parData, true); \
+ NULL, 0, scd_box, locallyPeriodic, &parData, true);
CHK_ERR1(rval, "Trouble creating scd vertex sequence");
// Add verts to tmp_range first, so we can duplicate global ids in vertex ids
@@ -922,11 +922,11 @@ ErrorCode ScdNCHelper::create_mesh(Range& faces)
if (mpFileIdTag) {
int count;
void* data;
- rval = mbImpl->tag_iterate(*mpFileIdTag, tmp_range.begin(), tmp_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(*mpFileIdTag, tmp_range.begin(), tmp_range.end(), count, data);
CHK_ERR1(rval, "Failed to get tag iterator on file id tag");
assert(count == scd_box->num_vertices());
int* fid_data = (int*) data;
- rval = mbImpl->tag_iterate(mGlobalIdTag, tmp_range.begin(), tmp_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, tmp_range.begin(), tmp_range.end(), count, data);
CHK_ERR1(rval, "Failed to get tag iterator on global id tag");
assert(count == scd_box->num_vertices());
int* gid_data = (int*) data;
@@ -937,14 +937,14 @@ ErrorCode ScdNCHelper::create_mesh(Range& faces)
// Then add box set and elements to the range, then to the file set
tmp_range.insert(scd_box->start_element(), scd_box->start_element() + scd_box->num_elements() - 1);
tmp_range.insert(scd_box->box_set());
- rval = mbImpl->add_entities(_fileSet, tmp_range); \
+ rval = mbImpl->add_entities(_fileSet, tmp_range);
CHK_ERR1(rval, "Couldn't add new vertices to current file set");
dbgOut.tprintf(1, "scdbox %d quads, %d vertices\n", scd_box->num_elements(), scd_box->num_vertices());
// Set the vertex coordinates
double *xc, *yc, *zc;
- rval = scd_box->get_coordinate_arrays(xc, yc, zc); \
+ rval = scd_box->get_coordinate_arrays(xc, yc, zc);
CHK_ERR1(rval, "Couldn't get vertex coordinate arrays");
int i, j, k, il, jl, kl;
@@ -971,7 +971,7 @@ ErrorCode ScdNCHelper::create_mesh(Range& faces)
int num_verts = (lDims[3] - lDims[0] + 1) * (lDims[4] - lDims[1] + 1) * (-1 == lDims[2] ? 1 : lDims[5] - lDims[2] + 1);
std::vector<int> gids(num_verts);
Range verts(scd_box->start_vertex(), scd_box->start_vertex() + scd_box->num_vertices() - 1);
- rval = mbImpl->tag_get_data(mGlobalIdTag, verts, &gids[0]); \
+ rval = mbImpl->tag_get_data(mGlobalIdTag, verts, &gids[0]);
CHK_ERR1(rval, "Trouble getting local gid values of vertices");
int vmin = *(std::min_element(gids.begin(), gids.end())), vmax = *(std::max_element(gids.begin(), gids.end()));
dbgOut.tprintf(1, "Vertex gids %d-%d\n", vmin, vmax);
@@ -983,14 +983,14 @@ ErrorCode ScdNCHelper::create_mesh(Range& faces)
if (2 <= dbgOut.get_verbosity()) {
assert(scd_box->boundary_complete());
EntityHandle dum_ent = scd_box->start_element();
- rval = mbImpl->list_entities(&dum_ent, 1); \
+ rval = mbImpl->list_entities(&dum_ent, 1);
CHK_ERR1(rval, "Trouble listing first hex");
std::vector<EntityHandle> connect;
- rval = mbImpl->get_connectivity(&dum_ent, 1, connect); \
+ rval = mbImpl->get_connectivity(&dum_ent, 1, connect);
CHK_ERR1(rval, "Trouble getting connectivity");
- rval = mbImpl->list_entities(&connect[0], connect.size()); \
+ rval = mbImpl->list_entities(&connect[0], connect.size());
CHK_ERR1(rval, "Trouble listing element connectivity");
}
@@ -1005,19 +1005,19 @@ ErrorCode ScdNCHelper::read_variables(std::vector<std::string>& var_names, std::
std::vector<ReadNC::VarData> vdatas;
std::vector<ReadNC::VarData> vsetdatas;
- ErrorCode rval = read_variables_setup(var_names, tstep_nums, vdatas, vsetdatas); \
+ ErrorCode rval = read_variables_setup(var_names, tstep_nums, vdatas, vsetdatas);
CHK_ERR1(rval, "Trouble setting up to read variables");
- rval = create_quad_coordinate_tag(); \
+ rval = create_quad_coordinate_tag();
CHK_ERR1(rval, "Trouble creating COORDS tag for quads");
if (!vsetdatas.empty()) {
- rval = read_variables_to_set(vsetdatas, tstep_nums); \
+ rval = read_variables_to_set(vsetdatas, tstep_nums);
CHK_ERR1(rval, "Trouble reading variables to set");
}
if (!vdatas.empty()) {
- rval = read_scd_variables_to_nonset(vdatas, tstep_nums); \
+ rval = read_scd_variables_to_nonset(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble reading variables to verts/edges/faces");
}
@@ -1036,14 +1036,14 @@ ErrorCode ScdNCHelper::read_scd_variables_to_nonset_allocate(std::vector<ReadNC:
// Get vertices in set
Range verts;
- rval = mbImpl->get_entities_by_dimension(_fileSet, 0, verts); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 0, verts);
CHK_ERR1(rval, "Trouble getting vertices in current file set");
assert("Should only have a single vertex subrange, since they were read in one shot" &&
verts.psize() == 1);
// Get faces in set
Range faces;
- rval = mbImpl->get_entities_by_dimension(_fileSet, 2, faces); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 2, faces);
CHK_ERR1(rval, "Trouble getting faces in current file set");
assert("Should only have a single face subrange, since they were read in one shot" &&
faces.psize() == 1);
@@ -1053,7 +1053,7 @@ ErrorCode ScdNCHelper::read_scd_variables_to_nonset_allocate(std::vector<ReadNC:
bool& isParallel = _readNC->isParallel;
if (isParallel) {
ParallelComm*& myPcomm = _readNC->myPcomm;
- rval = myPcomm->filter_pstatus(faces, PSTATUS_NOT_OWNED, PSTATUS_NOT, -1, &faces_owned); \
+ rval = myPcomm->filter_pstatus(faces, PSTATUS_NOT_OWNED, PSTATUS_NOT, -1, &faces_owned);
CHK_ERR1(rval, "Trouble getting owned faces in current file set");
}
else
@@ -1118,14 +1118,14 @@ ErrorCode ScdNCHelper::read_scd_variables_to_nonset_allocate(std::vector<ReadNC:
// Get the tag to read into
if (!vdatas[i].varTags[t]) {
- rval = get_tag_to_nonset(vdatas[i], tstep_nums[t], vdatas[i].varTags[t], vdatas[i].numLev); \
+ rval = get_tag_to_nonset(vdatas[i], tstep_nums[t], vdatas[i].varTags[t], vdatas[i].numLev);
CHK_ERR1_STR(rval, "Trouble getting tag for non-set variable " << vdatas[i].varName);
}
// Get ptr to tag space
void* data;
int count;
- rval = mbImpl->tag_iterate(vdatas[i].varTags[t], range->begin(), range->end(), count, data); \
+ rval = mbImpl->tag_iterate(vdatas[i].varTags[t], range->begin(), range->end(), count, data);
CHK_ERR1_STR(rval, "Failed to get tag iterator for non-set variable " << vdatas[i].varName);
assert((unsigned)count == range->size());
vdatas[i].varDatas[t] = data;
@@ -1144,7 +1144,7 @@ ErrorCode ScdNCHelper::read_scd_variables_to_nonset(std::vector<ReadNC::VarData>
{
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_scd_variables_to_nonset_allocate(vdatas, tstep_nums); \
+ ErrorCode rval = read_scd_variables_to_nonset_allocate(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble allocating space to read non-set variables");
// Finally, read into that space
@@ -1251,7 +1251,7 @@ ErrorCode ScdNCHelper::read_scd_variables_to_nonset(std::vector<ReadNC::VarData>
for (unsigned int i = 0; i < vdatas.size(); i++) {
for (unsigned int t = 0; t < tstep_nums.size(); t++) {
dbgOut.tprintf(2, "Converting non-set variable %s, time step %d\n", vdatas[i].varName.c_str(), tstep_nums[t]);
- rval = convert_variable(vdatas[i], t); \
+ rval = convert_variable(vdatas[i], t);
CHK_ERR1_STR(rval, "Failed to convert non-set variable " << vdatas[i].varName);
}
}
@@ -1271,7 +1271,7 @@ ErrorCode ScdNCHelper::create_quad_coordinate_tag() {
Interface*& mbImpl = _readNC->mbImpl;
Range ents;
- ErrorCode rval = mbImpl->get_entities_by_type(_fileSet, moab::MBQUAD, ents); \
+ ErrorCode rval = mbImpl->get_entities_by_type(_fileSet, moab::MBQUAD, ents);
CHK_ERR1(rval, "Trouble getting quads");
std::size_t numOwnedEnts = 0;
@@ -1280,7 +1280,7 @@ ErrorCode ScdNCHelper::create_quad_coordinate_tag() {
bool& isParallel = _readNC->isParallel;
if (isParallel) {
ParallelComm*& myPcomm = _readNC->myPcomm;
- rval = myPcomm->filter_pstatus(ents, PSTATUS_NOT_OWNED, PSTATUS_NOT, -1, &ents_owned); \
+ rval = myPcomm->filter_pstatus(ents, PSTATUS_NOT_OWNED, PSTATUS_NOT, -1, &ents_owned);
CHK_ERR1(rval, "Trouble getting owned quads");
numOwnedEnts = ents_owned.size();
}
@@ -1308,16 +1308,16 @@ ErrorCode ScdNCHelper::create_quad_coordinate_tag() {
}
std::string tag_name = "COORDS";
Tag tagh = 0;
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 3, MB_TYPE_DOUBLE, tagh, MB_TAG_DENSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 3, MB_TYPE_DOUBLE, tagh, MB_TAG_DENSE | MB_TAG_CREAT);
CHK_ERR1(rval, "Trouble creating COORDS tag");
void *data;
int count;
#ifdef USE_MPI
- rval = mbImpl->tag_iterate(tagh, ents_owned.begin(), ents_owned.end(), count, data); \
+ rval = mbImpl->tag_iterate(tagh, ents_owned.begin(), ents_owned.end(), count, data);
CHK_ERR1(rval, "Failed to get COORDS tag iterator on owned quads");
#else
- rval = mbImpl->tag_iterate(tagh, ents.begin(), ents.end(), count, data); \
+ rval = mbImpl->tag_iterate(tagh, ents.begin(), ents.end(), count, data);
CHK_ERR1(rval, "Failed to get COORDS tag iterator on quads");
#endif
assert(count == (int)numOwnedEnts);
@@ -1332,22 +1332,22 @@ ErrorCode UcdNCHelper::read_variables(std::vector<std::string>& var_names, std::
std::vector<ReadNC::VarData> vdatas;
std::vector<ReadNC::VarData> vsetdatas;
- ErrorCode rval = read_variables_setup(var_names, tstep_nums, vdatas, vsetdatas); \
+ ErrorCode rval = read_variables_setup(var_names, tstep_nums, vdatas, vsetdatas);
CHK_ERR1(rval, "Trouble setting up to read variables");
if (!vsetdatas.empty()) {
- rval = read_variables_to_set(vsetdatas, tstep_nums); \
+ rval = read_variables_to_set(vsetdatas, tstep_nums);
CHK_ERR1(rval, "Trouble reading variables to set");
}
if (!vdatas.empty()) {
#ifdef PNETCDF_FILE
// With pnetcdf support, we will use async read
- rval = read_ucd_variables_to_nonset_async(vdatas, tstep_nums); \
+ rval = read_ucd_variables_to_nonset_async(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble reading variables to verts/edges/faces");
#else
// Without pnetcdf support, we will use old read
- rval = read_ucd_variables_to_nonset(vdatas, tstep_nums); \
+ rval = read_ucd_variables_to_nonset(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble reading variables to verts/edges/faces");
#endif
}
diff --git a/src/io/NCHelperEuler.cpp b/src/io/NCHelperEuler.cpp
index fe15c6e..9f67a71 100644
--- a/src/io/NCHelperEuler.cpp
+++ b/src/io/NCHelperEuler.cpp
@@ -69,7 +69,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
// Check i periodicity and set globallyPeriodic[0]
std::vector<double> til_vals(2);
- ErrorCode rval = read_coordinate("lon", gCDims[3] - 1, gCDims[3], til_vals); \
+ ErrorCode rval = read_coordinate("lon", gCDims[3] - 1, gCDims[3], til_vals);
CHK_ERR1(rval, "Trouble reading 'lon' variable");
if (std::fabs(2 * til_vals[1] - til_vals[0] - 360) < 0.001)
globallyPeriodic[0] = 1;
@@ -135,7 +135,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
parData.partMethod = partMethod;
int pdims[3];
- rval = ScdInterface::compute_partition(procs, rank, parData, lDims, locallyPeriodic, pdims); \
+ rval = ScdInterface::compute_partition(procs, rank, parData, lDims, locallyPeriodic, pdims);
CHK_ERR1(rval, "Error returned from compute_partition");
for (int i = 0; i < 3; i++)
parData.pDims[i] = pdims[i];
@@ -185,7 +185,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
std::map<std::string, ReadNC::VarData>::iterator vmit;
if (-1 != lCDims[0]) {
if ((vmit = varInfo.find("lon")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("lon", lCDims[0], lCDims[3], ilCVals); \
+ rval = read_coordinate("lon", lCDims[0], lCDims[3], ilCVals);
CHK_ERR1(rval, "Trouble reading 'lon' variable");
}
else {
@@ -195,7 +195,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
if (-1 != lCDims[1]) {
if ((vmit = varInfo.find("lat")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("lat", lCDims[1], lCDims[4], jlCVals); \
+ rval = read_coordinate("lat", lCDims[1], lCDims[4], jlCVals);
CHK_ERR1(rval, "Trouble reading 'lat' variable");
}
else {
@@ -223,7 +223,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
if (!isParallel || ((gDims[4] - gDims[1]) == (lDims[4] - lDims[1]))) {
std::string gwName("gw");
std::vector<double> gwVals(lDims[4] - lDims[1] - 1);
- rval = read_coordinate(gwName.c_str(), lDims[1], lDims[4] - 2, gwVals); \
+ rval = read_coordinate(gwName.c_str(), lDims[1], lDims[4] - 2, gwVals);
CHK_ERR1(rval, "Trouble reading 'gw' variable");
// Copy the correct piece
jlVals[0] = -(M_PI / 2) * 180 / M_PI;
@@ -242,7 +242,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
// If this is the first row
if (lDims[1] == gDims[1]) {
std::vector<double> gwVals(lDims[4]);
- rval = read_coordinate(gwName.c_str(), 0, lDims[4] - 1, gwVals); \
+ rval = read_coordinate(gwName.c_str(), 0, lDims[4] - 1, gwVals);
CHK_ERR1(rval, "Trouble reading 'gw' variable");
// Copy the correct piece
jlVals[0] = -(M_PI / 2) * 180 / M_PI;
@@ -255,7 +255,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
// Or if it's the last row
else if (lDims[4] == gDims[4]) {
std::vector<double> gwVals(lDims[4] - 1);
- rval = read_coordinate(gwName.c_str(), 0, lDims[4] - 2, gwVals); \
+ rval = read_coordinate(gwName.c_str(), 0, lDims[4] - 2, gwVals);
CHK_ERR1(rval, "Trouble reading 'gw' variable");
// copy the correct piece
gwSum = -1;
@@ -273,7 +273,7 @@ ErrorCode NCHelperEuler::init_mesh_vals()
int start = lDims[1] - 1;
int end = lDims[4] - 1;
std::vector<double> gwVals(end);
- rval = read_coordinate(gwName.c_str(), 0, end - 1, gwVals); \
+ rval = read_coordinate(gwName.c_str(), 0, end - 1, gwVals);
CHK_ERR1(rval, "Trouble reading 'gw' variable");
gwSum = -1;
for (int j = 0; j != start - 1; j++)
@@ -294,11 +294,11 @@ ErrorCode NCHelperEuler::init_mesh_vals()
// Store time coordinate values in tVals
if (nTimeSteps > 0) {
if ((vmit = varInfo.find("time")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("time", 0, nTimeSteps - 1, tVals); \
+ rval = read_coordinate("time", 0, nTimeSteps - 1, tVals);
CHK_ERR1(rval, "Trouble reading 'time' variable");
}
else if ((vmit = varInfo.find("t")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("t", 0, nTimeSteps - 1, tVals); \
+ rval = read_coordinate("t", 0, nTimeSteps - 1, tVals);
CHK_ERR1(rval, "Trouble reading 't' variable");
}
else {
@@ -361,9 +361,9 @@ ErrorCode NCHelperEuler::init_mesh_vals()
std::stringstream ss_tag_name;
ss_tag_name << ijdimNames[i] << "_LOC_MINMAX";
tag_name = ss_tag_name.str();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]); \
+ rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -402,9 +402,9 @@ ErrorCode NCHelperEuler::init_mesh_vals()
std::stringstream ss_tag_name;
ss_tag_name << ijdimNames[i] << "_LOC_VALS";
tag_name = ss_tag_name.str();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_DOUBLE, tagh, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_DOUBLE, tagh, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_by_ptr(tagh, &_fileSet, 1, &val, &val_len); \
+ rval = mbImpl->tag_set_by_ptr(tagh, &_fileSet, 1, &val, &val_len);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -432,16 +432,16 @@ ErrorCode NCHelperEuler::init_mesh_vals()
std::stringstream ss_tag_name;
ss_tag_name << ijdimNames[i] << "_GLOBAL_MINMAX";
tag_name = ss_tag_name.str();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]); \
+ rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
}
// Hack: create dummy variables, if needed, for dimensions with no corresponding coordinate variables
- rval = create_dummy_variables(); \
+ rval = create_dummy_variables();
CHK_ERR1(rval, "Failed to create dummy variables");
return MB_SUCCESS;
diff --git a/src/io/NCHelperFV.cpp b/src/io/NCHelperFV.cpp
index 1120866..a85e834 100644
--- a/src/io/NCHelperFV.cpp
+++ b/src/io/NCHelperFV.cpp
@@ -86,7 +86,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
// Check i periodicity and set globallyPeriodic[0]
std::vector<double> til_vals(2);
- ErrorCode rval = read_coordinate("lon", gCDims[3] - 1, gCDims[3], til_vals); \
+ ErrorCode rval = read_coordinate("lon", gCDims[3] - 1, gCDims[3], til_vals);
CHK_ERR1(rval, "Trouble reading 'lon' variable");
if (std::fabs(2 * til_vals[1] - til_vals[0] - 360) < 0.001)
globallyPeriodic[0] = 1;
@@ -151,7 +151,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
parData.partMethod = partMethod;
int pdims[3];
- rval = ScdInterface::compute_partition(procs, rank, parData, lDims, locallyPeriodic, pdims); \
+ rval = ScdInterface::compute_partition(procs, rank, parData, lDims, locallyPeriodic, pdims);
CHK_ERR1(rval, "Error returned from compute_partition");
for (int i = 0; i < 3; i++)
parData.pDims[i] = pdims[i];
@@ -201,7 +201,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
std::map<std::string, ReadNC::VarData>::iterator vmit;
if (-1 != lCDims[0]) {
if ((vmit = varInfo.find("lon")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("lon", lCDims[0], lCDims[3], ilCVals); \
+ rval = read_coordinate("lon", lCDims[0], lCDims[3], ilCVals);
CHK_ERR1(rval, "Trouble reading 'lon' variable");
}
else {
@@ -211,7 +211,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
if (-1 != lCDims[1]) {
if ((vmit = varInfo.find("lat")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("lat", lCDims[1], lCDims[4], jlCVals); \
+ rval = read_coordinate("lat", lCDims[1], lCDims[4], jlCVals);
CHK_ERR1(rval, "Trouble reading 'lat' variable");
}
else {
@@ -233,7 +233,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
ilVals[i] = ilVals[i - 1] + dif;
}
else {
- rval = read_coordinate("slon", lDims[0], lDims[3], ilVals); \
+ rval = read_coordinate("slon", lDims[0], lDims[3], ilVals);
CHK_ERR1(rval, "Trouble reading 'slon' variable");
}
}
@@ -246,7 +246,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
if ((vmit = varInfo.find("slat")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
if (!isParallel || ((gDims[4] - gDims[1]) == (lDims[4] - lDims[1]))) {
std::vector<double> dummyVar(lDims[4] - lDims[1] - 1);
- rval = read_coordinate("slat", lDims[1], lDims[4] - 2, dummyVar); \
+ rval = read_coordinate("slat", lDims[1], lDims[4] - 2, dummyVar);
CHK_ERR1(rval, "Trouble reading 'slat' variable");
// Copy the correct piece
jlVals[0] = -90.0;
@@ -260,7 +260,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
// Need to read one less then available and read it into a dummy var
if (lDims[1] == gDims[1]) {
std::vector<double> dummyVar(lDims[4] - lDims[1]);
- rval = read_coordinate("slat", lDims[1], lDims[4] - 1, dummyVar); \
+ rval = read_coordinate("slat", lDims[1], lDims[4] - 1, dummyVar);
CHK_ERR1(rval, "Trouble reading 'slat' variable");
// Copy the correct piece
jlVals[0] = -90.0;
@@ -270,7 +270,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
// Or if it's the last row
else if (lDims[4] == gDims[4]) {
std::vector<double> dummyVar(lDims[4] - lDims[1]);
- rval = read_coordinate("slat", lDims[1] - 1, lDims[4] - 2, dummyVar); \
+ rval = read_coordinate("slat", lDims[1] - 1, lDims[4] - 2, dummyVar);
CHK_ERR1(rval, "Trouble reading 'slat' variable");
// Copy the correct piece
std::size_t i = 0;
@@ -280,7 +280,7 @@ ErrorCode NCHelperFV::init_mesh_vals()
}
// It's in the middle
else {
- rval = read_coordinate("slat", lDims[1] - 1, lDims[4] - 1, jlVals); \
+ rval = read_coordinate("slat", lDims[1] - 1, lDims[4] - 1, jlVals);
CHK_ERR1(rval, "Trouble reading 'slat' variable");
}
}
@@ -293,11 +293,11 @@ ErrorCode NCHelperFV::init_mesh_vals()
// Store time coordinate values in tVals
if (nTimeSteps > 0) {
if ((vmit = varInfo.find("time")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("time", 0, nTimeSteps - 1, tVals); \
+ rval = read_coordinate("time", 0, nTimeSteps - 1, tVals);
CHK_ERR1(rval, "Trouble reading 'time' variable");
}
else if ((vmit = varInfo.find("t")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("t", 0, nTimeSteps - 1, tVals); \
+ rval = read_coordinate("t", 0, nTimeSteps - 1, tVals);
CHK_ERR1(rval, "Trouble reading 't' variable");
}
else {
@@ -365,9 +365,9 @@ ErrorCode NCHelperFV::init_mesh_vals()
std::stringstream ss_tag_name;
ss_tag_name << ijdimNames[i] << "_LOC_MINMAX";
tag_name = ss_tag_name.str();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]); \
+ rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -406,9 +406,9 @@ ErrorCode NCHelperFV::init_mesh_vals()
std::stringstream ss_tag_name;
ss_tag_name << ijdimNames[i] << "_LOC_VALS";
tag_name = ss_tag_name.str();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_DOUBLE, tagh, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 0, MB_TYPE_DOUBLE, tagh, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_by_ptr(tagh, &_fileSet, 1, &val, &val_len); \
+ rval = mbImpl->tag_set_by_ptr(tagh, &_fileSet, 1, &val, &val_len);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
@@ -436,16 +436,16 @@ ErrorCode NCHelperFV::init_mesh_vals()
std::stringstream ss_tag_name;
ss_tag_name << ijdimNames[i] << "_GLOBAL_MINMAX";
tag_name = ss_tag_name.str();
- rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle(tag_name.c_str(), 2, MB_TYPE_INTEGER, tagh, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1_STR(rval, "Trouble creating conventional tag " << tag_name);
- rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]); \
+ rval = mbImpl->tag_set_data(tagh, &_fileSet, 1, &val[0]);
CHK_ERR1_STR(rval, "Trouble setting data for conventional tag " << tag_name);
if (MB_SUCCESS == rval)
dbgOut.tprintf(2, "Conventional tag %s is created.\n", tag_name.c_str());
}
// Hack: create dummy variables, if needed, for dimensions with no corresponding coordinate variables
- rval = create_dummy_variables(); \
+ rval = create_dummy_variables();
CHK_ERR1(rval, "Failed to create dummy variables");
return MB_SUCCESS;
diff --git a/src/io/NCHelperHOMME.cpp b/src/io/NCHelperHOMME.cpp
index 7f650fd..72d9773 100644
--- a/src/io/NCHelperHOMME.cpp
+++ b/src/io/NCHelperHOMME.cpp
@@ -165,11 +165,11 @@ ErrorCode NCHelperHOMME::init_mesh_vals()
}
else {
if ((vmit = varInfo.find("time")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("time", 0, nTimeSteps - 1, tVals); \
+ rval = read_coordinate("time", 0, nTimeSteps - 1, tVals);
CHK_ERR1(rval, "Trouble reading 'time' variable");
}
else if ((vmit = varInfo.find("t")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
- rval = read_coordinate("t", 0, nTimeSteps - 1, tVals); \
+ rval = read_coordinate("t", 0, nTimeSteps - 1, tVals);
CHK_ERR1(rval, "Trouble reading 't' variable");
}
else {
@@ -196,7 +196,7 @@ ErrorCode NCHelperHOMME::init_mesh_vals()
}
// Hack: create dummy variables for dimensions (like ncol) with no corresponding coordinate variables
- rval = create_dummy_variables(); \
+ rval = create_dummy_variables();
CHK_ERR1(rval, "Failed to create dummy variables");
return MB_SUCCESS;
@@ -220,14 +220,14 @@ ErrorCode NCHelperHOMME::check_existing_mesh()
// Get all vertices from current file set (it is the input set in no_mesh scenario)
Range local_verts;
- ErrorCode rval = mbImpl->get_entities_by_dimension(_fileSet, 0, local_verts); \
+ ErrorCode rval = mbImpl->get_entities_by_dimension(_fileSet, 0, local_verts);
CHK_ERR1(rval, "Trouble getting local vertices in current file set");
if (!local_verts.empty()) {
std::vector<int> gids(local_verts.size());
// !IMPORTANT : this has to be the GLOBAL_ID tag
- rval = mbImpl->tag_get_data(mGlobalIdTag, local_verts, &gids[0]); \
+ rval = mbImpl->tag_get_data(mGlobalIdTag, local_verts, &gids[0]);
CHK_ERR1(rval, "Trouble getting local gid values of vertices");
// Restore localGidVerts
@@ -300,7 +300,7 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
std::vector<std::string> conn_names;
std::vector<int> conn_vals;
- rval = _readNC->get_dimensions(connectId, conn_names, conn_vals); \
+ rval = _readNC->get_dimensions(connectId, conn_names, conn_vals);
CHK_ERR1(rval, "Failed to get dimensions for connectivity");
// Read connectivity into temporary variable
@@ -383,20 +383,20 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
rval = _readNC->readMeshIface->get_element_connect(num_coarse_quads, 4,
MBQUAD, 0, start_quad, conn_arr,
// Might have to create gather mesh later
- (create_gathers ? num_coarse_quads + num_quads : num_coarse_quads)); \
+ (create_gathers ? num_coarse_quads + num_quads : num_coarse_quads));
CHK_ERR1(rval, "Failed to create local quads");
tmp_range.insert(start_quad, start_quad + num_coarse_quads - 1);
std::copy(&tmp_conn[start_idx], &tmp_conn[start_idx + 4 * num_fine_quads], conn_arr);
std::copy(conn_arr, conn_arr + 4 * num_fine_quads, range_inserter(localGidVerts));
}
else {
- rval = smt.create_spectral_elems(&tmp_conn[0], num_fine_quads, 2, tmp_range, start_idx, &localGidVerts); \
+ rval = smt.create_spectral_elems(&tmp_conn[0], num_fine_quads, 2, tmp_range, start_idx, &localGidVerts);
CHK_ERR1(rval, "Failed to create spectral elements");
int count, v_per_e;
- rval = mbImpl->connect_iterate(tmp_range.begin(), tmp_range.end(), conn_arr, v_per_e, count); \
+ rval = mbImpl->connect_iterate(tmp_range.begin(), tmp_range.end(), conn_arr, v_per_e, count);
CHK_ERR1(rval, "Failed to get connectivity of spectral elements.");
rval = mbImpl->tag_iterate(smt.spectral_vertices_tag(true), tmp_range.begin(), tmp_range.end(),
- count, (void*&)sv_ptr); \
+ count, (void*&)sv_ptr);
CHK_ERR1(rval, "Failed to get fine connectivity of spectral elements");
}
@@ -405,7 +405,7 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
std::vector<double*> arrays;
rval = _readNC->readMeshIface->get_node_coords(3, nLocalVertices, 0, start_vertex, arrays,
// Might have to create gather mesh later
- (create_gathers ? nLocalVertices + nVertices : nLocalVertices)); \
+ (create_gathers ? nLocalVertices + nVertices : nLocalVertices));
CHK_ERR1(rval, "Failed to create local vertices");
// Set vertex coordinates
@@ -437,7 +437,7 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
Range vert_range(start_vertex, start_vertex + nLocalVertices - 1);
void* data;
int count;
- rval = mbImpl->tag_iterate(mGlobalIdTag, vert_range.begin(), vert_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, vert_range.begin(), vert_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate global id tag on local vertices");
assert(count == nLocalVertices);
int* gid_data = (int*) data;
@@ -445,7 +445,7 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
// Duplicate global id data, which will be used to resolve sharing
if (mpFileIdTag) {
- rval = mbImpl->tag_iterate(*mpFileIdTag, vert_range.begin(), vert_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(*mpFileIdTag, vert_range.begin(), vert_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate file id tag on local vertices");
assert(count == nLocalVertices);
gid_data = (int*) data;
@@ -478,20 +478,20 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
// Mark the set with the spectral order
Tag sporder;
- rval = mbImpl->tag_get_handle("SPECTRAL_ORDER", 1, MB_TYPE_INTEGER, sporder, MB_TAG_CREAT | MB_TAG_SPARSE); \
+ rval = mbImpl->tag_get_handle("SPECTRAL_ORDER", 1, MB_TYPE_INTEGER, sporder, MB_TAG_CREAT | MB_TAG_SPARSE);
CHK_ERR1(rval, "Failed to get SPECTRAL_ORDER tag");
- rval = mbImpl->tag_set_data(sporder, &_fileSet, 1, &_spectralOrder); \
+ rval = mbImpl->tag_set_data(sporder, &_fileSet, 1, &_spectralOrder);
CHK_ERR1(rval, "Failed to set data for SPECTRAL_ORDER tag");
if (create_gathers) {
EntityHandle gather_set;
- rval = _readNC->readMeshIface->create_gather_set(gather_set); \
+ rval = _readNC->readMeshIface->create_gather_set(gather_set);
CHK_ERR1(rval, "Failed to create gather set");
// Create vertices
arrays.clear();
// Don't need to specify allocation number here, because we know enough verts were created before
- rval = _readNC->readMeshIface->get_node_coords(3, nVertices, 0, start_vertex, arrays); \
+ rval = _readNC->readMeshIface->get_node_coords(3, nVertices, 0, start_vertex, arrays);
CHK_ERR1(rval, "Failed to create gather set vertices");
xptr = arrays[0];
@@ -509,7 +509,7 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
// Get ptr to gid memory for vertices
Range gather_set_verts_range(start_vertex, start_vertex + nVertices - 1);
- rval = mbImpl->tag_iterate(mGlobalIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate global id tag on gather set vertices");
assert(count == nVertices);
gid_data = (int*) data;
@@ -517,7 +517,7 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
gid_data[j - 1] = j;
// Set the file id tag too, it should be bigger something not interfering with global id
if (mpFileIdTag) {
- rval = mbImpl->tag_iterate(*mpFileIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(*mpFileIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate file id tag on gather set vertices");
assert(count == nVertices);
gid_data = (int*) data;
@@ -525,20 +525,20 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
gid_data[j - 1] = nVertices + j; // bigger than global id tag
}
- rval = mbImpl->add_entities(gather_set, gather_set_verts_range); \
+ rval = mbImpl->add_entities(gather_set, gather_set_verts_range);
CHK_ERR1(rval, "Failed to add vertices to the gather set");
// Create quads
Range gather_set_quads_range;
// Don't need to specify allocation number here, because we know enough quads were created before
rval = _readNC->readMeshIface->get_element_connect(num_quads, 4,
- MBQUAD, 0, start_quad, conn_arr); \
+ MBQUAD, 0, start_quad, conn_arr);
CHK_ERR1(rval, "Failed to create gather set quads");
gather_set_quads_range.insert(start_quad, start_quad + num_quads - 1);
std::copy(&tmp_conn[0], &tmp_conn[4 * num_quads], conn_arr);
for (i = 0; i != 4 * num_quads; i++)
conn_arr[i] += start_vertex - 1; // Connectivity array is shifted by where the gather verts start
- rval = mbImpl->add_entities(gather_set, gather_set_quads_range); \
+ rval = mbImpl->add_entities(gather_set, gather_set_quads_range);
CHK_ERR1(rval, "Failed to add quads to the gather set");
}
@@ -557,7 +557,7 @@ ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset_allocate(std::vector<ReadN
// Get vertices in set
Range verts;
- rval = mbImpl->get_entities_by_dimension(_fileSet, 0, verts); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 0, verts);
CHK_ERR1(rval, "Trouble getting vertices in current file set");
assert("Should only have a single vertex subrange, since they were read in one shot" &&
verts.psize() == 1);
@@ -631,7 +631,7 @@ ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset_async(std::vector<ReadNC::
{
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums); \
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble allocating space to read non-set variables");
// Finally, read into that space
@@ -770,7 +770,7 @@ ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset_async(std::vector<ReadNC::
for (unsigned int i = 0; i < vdatas.size(); i++) {
for (unsigned int t = 0; t < tstep_nums.size(); t++) {
dbgOut.tprintf(2, "Converting variable %s, time step %d\n", vdatas[i].varName.c_str(), tstep_nums[t]);
- rval = convert_variable(vdatas[i], t); \
+ rval = convert_variable(vdatas[i], t);
CHK_ERR1_STR(rval, "Failed to convert non-set variable " << vdatas[i].varName);
}
}
@@ -790,7 +790,7 @@ ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset(std::vector<ReadNC::VarDat
{
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums); \
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble allocating space to read non-set variables");
// Finally, read into that space
@@ -910,7 +910,7 @@ ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset(std::vector<ReadNC::VarDat
for (unsigned int i = 0; i < vdatas.size(); i++) {
for (unsigned int t = 0; t < tstep_nums.size(); t++) {
dbgOut.tprintf(2, "Converting variable %s, time step %d\n", vdatas[i].varName.c_str(), tstep_nums[t]);
- rval = convert_variable(vdatas[i], t); \
+ rval = convert_variable(vdatas[i], t);
CHK_ERR1_STR(rval, "Failed to convert non-set variable " << vdatas[i].varName);
}
}
diff --git a/src/io/NCHelperMPAS.cpp b/src/io/NCHelperMPAS.cpp
index 349e17a..8491b1c 100644
--- a/src/io/NCHelperMPAS.cpp
+++ b/src/io/NCHelperMPAS.cpp
@@ -144,7 +144,7 @@ ErrorCode NCHelperMPAS::init_mesh_vals()
// Note, two possible types for xtime variable: double(Time) or char(Time, StrLen)
if ((vmit = varInfo.find("xtime")) != varInfo.end() && (*vmit).second.varDims.size() == 1) {
// If xtime variable is double type, read time coordinate values to tVals
- rval = read_coordinate("xtime", 0, nTimeSteps - 1, tVals); \
+ rval = read_coordinate("xtime", 0, nTimeSteps - 1, tVals);
CHK_ERR1(rval, "Trouble reading 'xtime' variable");
}
else {
@@ -187,7 +187,7 @@ ErrorCode NCHelperMPAS::init_mesh_vals()
}
// Hack: create dummy variables for dimensions (like nCells) with no corresponding coordinate variables
- rval = create_dummy_variables(); \
+ rval = create_dummy_variables();
CHK_ERR1(rval, "Failed to create dummy variables");
return MB_SUCCESS;
@@ -217,14 +217,14 @@ ErrorCode NCHelperMPAS::check_existing_mesh()
if (localGidVerts.empty()) {
// Get all vertices from tmp_set (it is the input set in no_mesh scenario)
Range local_verts;
- rval = mbImpl->get_entities_by_dimension(_fileSet, 0, local_verts); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 0, local_verts);
CHK_ERR1(rval, "Trouble getting local vertices in current file set");
if (!local_verts.empty()) {
std::vector<int> gids(local_verts.size());
// !IMPORTANT : this has to be the GLOBAL_ID tag
- rval = mbImpl->tag_get_data(mGlobalIdTag, local_verts, &gids[0]); \
+ rval = mbImpl->tag_get_data(mGlobalIdTag, local_verts, &gids[0]);
CHK_ERR1(rval, "Trouble getting local gid values of vertices");
// Restore localGidVerts
@@ -236,14 +236,14 @@ ErrorCode NCHelperMPAS::check_existing_mesh()
if (localGidEdges.empty()) {
// Get all edges from _fileSet (it is the input set in no_mesh scenario)
Range local_edges;
- rval = mbImpl->get_entities_by_dimension(_fileSet, 1, local_edges); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 1, local_edges);
CHK_ERR1(rval, "Trouble getting local edges in current file set");
if (!local_edges.empty()) {
std::vector<int> gids(local_edges.size());
// !IMPORTANT : this has to be the GLOBAL_ID tag
- rval = mbImpl->tag_get_data(mGlobalIdTag, local_edges, &gids[0]); \
+ rval = mbImpl->tag_get_data(mGlobalIdTag, local_edges, &gids[0]);
CHK_ERR1(rval, "Trouble getting local gid values of edges");
// Restore localGidEdges
@@ -262,7 +262,7 @@ ErrorCode NCHelperMPAS::check_existing_mesh()
std::vector<int> gids(local_cells.size());
// !IMPORTANT : this has to be the GLOBAL_ID tag
- rval = mbImpl->tag_get_data(mGlobalIdTag, local_cells, &gids[0]); \
+ rval = mbImpl->tag_get_data(mGlobalIdTag, local_cells, &gids[0]);
CHK_ERR1(rval, "Trouble getting local gid values of cells");
// Restore localGidCells
@@ -323,7 +323,7 @@ ErrorCode NCHelperMPAS::create_mesh(Range& faces)
start_cell_idx++; // 0 based -> 1 based
// Redistribute local cells after trivial partition (e.g. apply Zoltan partition)
- ErrorCode rval = redistribute_local_cells(start_cell_idx); \
+ ErrorCode rval = redistribute_local_cells(start_cell_idx);
CHK_ERR1(rval, "Failed to redistribute local cells after trivial partition");
}
else {
@@ -447,55 +447,55 @@ ErrorCode NCHelperMPAS::create_mesh(Range& faces)
// Create local vertices
EntityHandle start_vertex;
- ErrorCode rval = create_local_vertices(vertices_on_local_cells, start_vertex); \
+ ErrorCode rval = create_local_vertices(vertices_on_local_cells, start_vertex);
CHK_ERR1(rval, "Failed to create local vertices for MPAS mesh");
// Create local edges (unless NO_EDGES read option is set)
if (!noEdges) {
- rval = create_local_edges(start_vertex, num_edges_on_local_cells); \
+ rval = create_local_edges(start_vertex, num_edges_on_local_cells);
CHK_ERR1(rval, "Failed to create local edges for MPAS mesh");
}
// Create local cells, either unpadded or padded
if (noMixedElements) {
- rval = create_padded_local_cells(vertices_on_local_cells, start_vertex, faces); \
+ rval = create_padded_local_cells(vertices_on_local_cells, start_vertex, faces);
CHK_ERR1(rval, "Failed to create padded local cells for MPAS mesh");
}
else {
- rval = create_local_cells(vertices_on_local_cells, num_edges_on_local_cells, start_vertex, faces); \
+ rval = create_local_cells(vertices_on_local_cells, num_edges_on_local_cells, start_vertex, faces);
CHK_ERR1(rval, "Failed to create local cells for MPAS mesh");
}
// Set tag for numCellGroups
Tag numCellGroupsTag = 0;
- rval = mbImpl->tag_get_handle("__NUM_CELL_GROUPS", 1, MB_TYPE_INTEGER, numCellGroupsTag, MB_TAG_SPARSE | MB_TAG_CREAT); \
+ rval = mbImpl->tag_get_handle("__NUM_CELL_GROUPS", 1, MB_TYPE_INTEGER, numCellGroupsTag, MB_TAG_SPARSE | MB_TAG_CREAT);
CHK_ERR1(rval, "Failed to get __NUM_CELL_GROUPS tag");
- rval = mbImpl->tag_set_data(numCellGroupsTag, &_fileSet, 1, &numCellGroups); \
+ rval = mbImpl->tag_set_data(numCellGroupsTag, &_fileSet, 1, &numCellGroups);
CHK_ERR1(rval, "Failed to set data for __NUM_CELL_GROUPS tag");
if (createGatherSet) {
EntityHandle gather_set;
- rval = _readNC->readMeshIface->create_gather_set(gather_set); \
+ rval = _readNC->readMeshIface->create_gather_set(gather_set);
CHK_ERR1(rval, "Failed to create gather set");
// Create gather set vertices
EntityHandle start_gather_set_vertex;
- rval = create_gather_set_vertices(gather_set, start_gather_set_vertex); \
+ rval = create_gather_set_vertices(gather_set, start_gather_set_vertex);
CHK_ERR1(rval, "Failed to create gather set vertices for MPAS mesh");
// Create gather set edges (unless NO_EDGES read option is set)
if (!noEdges) {
- rval = create_gather_set_edges(gather_set, start_gather_set_vertex); \
+ rval = create_gather_set_edges(gather_set, start_gather_set_vertex);
CHK_ERR1(rval, "Failed to create gather set edges for MPAS mesh");
}
// Create gather set cells, either unpadded or padded
if (noMixedElements) {
- rval = create_padded_gather_set_cells(gather_set, start_gather_set_vertex); \
+ rval = create_padded_gather_set_cells(gather_set, start_gather_set_vertex);
CHK_ERR1(rval, "Failed to create padded gather set cells for MPAS mesh");
}
else {
- rval = create_gather_set_cells(gather_set, start_gather_set_vertex); \
+ rval = create_gather_set_cells(gather_set, start_gather_set_vertex);
CHK_ERR1(rval, "Failed to create gather set cells for MPAS mesh");
}
}
@@ -516,7 +516,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_allocate(std::vector<ReadNC
// Get vertices in set
Range verts;
- rval = mbImpl->get_entities_by_dimension(_fileSet, 0, verts); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 0, verts);
CHK_ERR1(rval, "Trouble getting vertices in current file set");
assert("Should only have a single vertex subrange, since they were read in one shot" &&
verts.psize() == 1);
@@ -524,7 +524,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_allocate(std::vector<ReadNC
// Get edges in set (unless NO_EDGES read option is set)
Range edges;
if (!noEdges) {
- rval = mbImpl->get_entities_by_dimension(_fileSet, 1, edges); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 1, edges);
CHK_ERR1(rval, "Trouble getting edges in current file set");
assert("Should only have a single edge subrange, since they were read in one shot" &&
edges.psize() == 1);
@@ -532,7 +532,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_allocate(std::vector<ReadNC
// Get faces in set
Range faces;
- rval = mbImpl->get_entities_by_dimension(_fileSet, 2, faces); \
+ rval = mbImpl->get_entities_by_dimension(_fileSet, 2, faces);
CHK_ERR1(rval, "Trouble getting faces in current file set");
// Note, for MPAS faces.psize() can be more than 1
@@ -540,7 +540,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_allocate(std::vector<ReadNC
bool& isParallel = _readNC->isParallel;
if (isParallel) {
ParallelComm*& myPcomm = _readNC->myPcomm;
- rval = myPcomm->filter_pstatus(faces, PSTATUS_NOT_OWNED, PSTATUS_NOT, -1, &facesOwned); \
+ rval = myPcomm->filter_pstatus(faces, PSTATUS_NOT_OWNED, PSTATUS_NOT, -1, &facesOwned);
CHK_ERR1(rval, "Trouble getting owned faces in current file set");
}
else
@@ -649,7 +649,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_async(std::vector<ReadNC::V
bool& noEdges = _readNC->noEdges;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums); \
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble allocating space to read non-set variables");
// Finally, read into that space
@@ -735,7 +735,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_async(std::vector<ReadNC::V
while (iter != facesOwned.end()) {
int count;
void* ptr;
- rval = mbImpl->tag_iterate(vdatas[i].varTags[t], iter, facesOwned.end(), count, ptr); \
+ rval = mbImpl->tag_iterate(vdatas[i].varTags[t], iter, facesOwned.end(), count, ptr);
CHK_ERR1(rval, "Failed to iterate tag on owned faces");
for (int j = 0; j < count; j++) {
@@ -778,7 +778,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_async(std::vector<ReadNC::V
for (unsigned int t = 0; t < tstep_nums.size(); t++) {
dbgOut.tprintf(2, "Converting variable %s, time step %d\n", vdatas[i].varName.c_str(), tstep_nums[t]);
- rval = convert_variable(vdatas[i], t); \
+ rval = convert_variable(vdatas[i], t);
CHK_ERR1_STR(rval, "Failed to convert non-set variable " << vdatas[i].varName);
}
}
@@ -799,7 +799,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset(std::vector<ReadNC::VarData
bool& noEdges = _readNC->noEdges;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums); \
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
CHK_ERR1(rval, "Trouble allocating space to read non-set variables");
// Finally, read into that space
@@ -872,7 +872,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset(std::vector<ReadNC::VarData
while (iter != facesOwned.end()) {
int count;
void* ptr;
- rval = mbImpl->tag_iterate(vdatas[i].varTags[t], iter, facesOwned.end(), count, ptr); \
+ rval = mbImpl->tag_iterate(vdatas[i].varTags[t], iter, facesOwned.end(), count, ptr);
CHK_ERR1(rval, "Failed to iterate tag on owned faces");
for (int j = 0; j < count; j++) {
@@ -915,7 +915,7 @@ ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset(std::vector<ReadNC::VarData
for (unsigned int t = 0; t < tstep_nums.size(); t++) {
dbgOut.tprintf(2, "Converting variable %s, time step %d\n", vdatas[i].varName.c_str(), tstep_nums[t]);
- rval = convert_variable(vdatas[i], t); \
+ rval = convert_variable(vdatas[i], t);
CHK_ERR1_STR(rval, "Failed to convert non-set variable " << vdatas[i].varName);
}
}
@@ -974,8 +974,8 @@ ErrorCode NCHelperMPAS::redistribute_local_cells(int start_cell_idx)
Interface*& mbImpl = _readNC->mbImpl;
DebugOutput& dbgOut = _readNC->dbgOut;
MBZoltan* mbZTool = new MBZoltan(mbImpl, false, 0, NULL);
- ErrorCode rval = mbZTool->repartition(xCell, yCell, zCell, start_cell_idx, "RCB", localGidCells); \
- delete mbZTool; \
+ ErrorCode rval = mbZTool->repartition(xCell, yCell, zCell, start_cell_idx, "RCB", localGidCells);
+ delete mbZTool;
CHK_ERR1(rval, "Error in Zoltan partitioning");
dbgOut.tprintf(1, "After Zoltan partitioning, localGidCells.psize() = %d\n", (int)localGidCells.psize());
@@ -1014,18 +1014,18 @@ ErrorCode NCHelperMPAS::create_local_vertices(const std::vector<int>& vertices_o
std::vector<double*> arrays;
ErrorCode rval = _readNC->readMeshIface->get_node_coords(3, nLocalVertices, 0, start_vertex, arrays,
// Might have to create gather mesh later
- (createGatherSet ? nLocalVertices + nVertices : nLocalVertices)); \
+ (createGatherSet ? nLocalVertices + nVertices : nLocalVertices));
CHK_ERR1(rval, "Failed to create local vertices");
// Add local vertices to current file set
Range local_verts_range(start_vertex, start_vertex + nLocalVertices - 1);
- rval = _readNC->mbImpl->add_entities(_fileSet, local_verts_range); \
+ rval = _readNC->mbImpl->add_entities(_fileSet, local_verts_range);
CHK_ERR1(rval, "Failed to add local vertices to current file set");
// Get ptr to GID memory for local vertices
int count = 0;
void* data = NULL;
- rval = mbImpl->tag_iterate(mGlobalIdTag, local_verts_range.begin(), local_verts_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, local_verts_range.begin(), local_verts_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate global id tag on local vertices");
assert(count == nLocalVertices);
int* gid_data = (int*) data;
@@ -1033,7 +1033,7 @@ ErrorCode NCHelperMPAS::create_local_vertices(const std::vector<int>& vertices_o
// Duplicate GID data, which will be used to resolve sharing
if (mpFileIdTag) {
- rval = mbImpl->tag_iterate(*mpFileIdTag, local_verts_range.begin(), local_verts_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(*mpFileIdTag, local_verts_range.begin(), local_verts_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate file id tag on local vertices");
assert(count == nLocalVertices);
gid_data = (int*) data;
@@ -1242,18 +1242,18 @@ ErrorCode NCHelperMPAS::create_local_edges(EntityHandle start_vertex, const std:
EntityHandle* conn_arr_edges = NULL;
ErrorCode rval = _readNC->readMeshIface->get_element_connect(nLocalEdges, 2, MBEDGE, 0, start_edge, conn_arr_edges,
// Might have to create gather mesh later
- (createGatherSet ? nLocalEdges + nEdges : nLocalEdges)); \
+ (createGatherSet ? nLocalEdges + nEdges : nLocalEdges));
CHK_ERR1(rval, "Failed to create local edges");
// Add local edges to current file set
Range local_edges_range(start_edge, start_edge + nLocalEdges - 1);
- rval = _readNC->mbImpl->add_entities(_fileSet, local_edges_range); \
+ rval = _readNC->mbImpl->add_entities(_fileSet, local_edges_range);
CHK_ERR1(rval, "Failed to add local edges to current file set");
// Get ptr to GID memory for edges
int count = 0;
void* data = NULL;
- rval = mbImpl->tag_iterate(mGlobalIdTag, local_edges_range.begin(), local_edges_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, local_edges_range.begin(), local_edges_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate global id tag on local edges");
assert(count == nLocalEdges);
int* gid_data = (int*) data;
@@ -1348,19 +1348,19 @@ ErrorCode NCHelperMPAS::create_local_cells(const std::vector<int>& vertices_on_l
// Create local cells for each non-empty cell group
EntityHandle start_element;
ErrorCode rval = _readNC->readMeshIface->get_element_connect(num_group_cells, num_edges_per_cell, MBPOLYGON, 0, start_element,
- conn_arr_local_cells_with_n_edges[num_edges_per_cell], num_group_cells); \
+ conn_arr_local_cells_with_n_edges[num_edges_per_cell], num_group_cells);
CHK_ERR1(rval, "Failed to create local cells");
faces.insert(start_element, start_element + num_group_cells - 1);
// Add local cells to current file set
Range local_cells_range(start_element, start_element + num_group_cells - 1);
- rval = _readNC->mbImpl->add_entities(_fileSet, local_cells_range); \
+ rval = _readNC->mbImpl->add_entities(_fileSet, local_cells_range);
CHK_ERR1(rval, "Failed to add local cells to current file set");
// Get ptr to gid memory for local cells
int count = 0;
void* data = NULL;
- rval = mbImpl->tag_iterate(mGlobalIdTag, local_cells_range.begin(), local_cells_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, local_cells_range.begin(), local_cells_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate global id tag on local cells");
assert(count == num_group_cells);
int* gid_data = (int*) data;
@@ -1404,19 +1404,19 @@ ErrorCode NCHelperMPAS::create_padded_local_cells(const std::vector<int>& vertic
EntityHandle* conn_arr_local_cells = NULL;
ErrorCode rval = _readNC->readMeshIface->get_element_connect(nLocalCells, maxEdgesPerCell, MBPOLYGON, 0, start_element, conn_arr_local_cells,
// Might have to create gather mesh later
- (createGatherSet ? nLocalCells + nCells : nLocalCells)); \
+ (createGatherSet ? nLocalCells + nCells : nLocalCells));
CHK_ERR1(rval, "Failed to create cells");
faces.insert(start_element, start_element + nLocalCells - 1);
// Add local cells to current file set
Range local_cells_range(start_element, start_element + nLocalCells - 1);
- rval = _readNC->mbImpl->add_entities(_fileSet, local_cells_range); \
+ rval = _readNC->mbImpl->add_entities(_fileSet, local_cells_range);
CHK_ERR1(rval, "Failed to add local cells to current file set");
// Get ptr to GID memory for local cells
int count = 0;
void* data = NULL;
- rval = mbImpl->tag_iterate(mGlobalIdTag, local_cells_range.begin(), local_cells_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, local_cells_range.begin(), local_cells_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate global id tag on local cells");
assert(count == nLocalCells);
int* gid_data = (int*) data;
@@ -1446,12 +1446,12 @@ ErrorCode NCHelperMPAS::create_gather_set_vertices(EntityHandle gather_set, Enti
// Create gather set vertices
std::vector<double*> arrays;
// Don't need to specify allocation number here, because we know enough vertices were created before
- ErrorCode rval = _readNC->readMeshIface->get_node_coords(3, nVertices, 0, gather_set_start_vertex, arrays); \
+ ErrorCode rval = _readNC->readMeshIface->get_node_coords(3, nVertices, 0, gather_set_start_vertex, arrays);
CHK_ERR1(rval, "Failed to create gather set vertices");
// Add vertices to the gather set
Range gather_set_verts_range(gather_set_start_vertex, gather_set_start_vertex + nVertices - 1);
- rval = mbImpl->add_entities(gather_set, gather_set_verts_range); \
+ rval = mbImpl->add_entities(gather_set, gather_set_verts_range);
CHK_ERR1(rval, "Failed to add vertices to the gather set");
// Read x coordinates for gather set vertices
@@ -1528,7 +1528,7 @@ ErrorCode NCHelperMPAS::create_gather_set_vertices(EntityHandle gather_set, Enti
// Get ptr to GID memory for gather set vertices
int count = 0;
void* data = NULL;
- rval = mbImpl->tag_iterate(mGlobalIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(mGlobalIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate global id tag on gather set vertices");
assert(count == nVertices);
int* gid_data = (int*) data;
@@ -1537,7 +1537,7 @@ ErrorCode NCHelperMPAS::create_gather_set_vertices(EntityHandle gather_set, Enti
// Set the file id tag too, it should be bigger something not interfering with global id
if (mpFileIdTag) {
- rval = mbImpl->tag_iterate(*mpFileIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data); \
+ rval = mbImpl->tag_iterate(*mpFileIdTag, gather_set_verts_range.begin(), gather_set_verts_range.end(), count, data);
CHK_ERR1(rval, "Failed to iterate file id tag on gather set vertices");
assert(count == nVertices);
gid_data = (int*) data;
@@ -1556,12 +1556,12 @@ ErrorCode NCHelperMPAS::create_gather_set_edges(EntityHandle gather_set, EntityH
EntityHandle start_edge;
EntityHandle* conn_arr_gather_set_edges = NULL;
// Don't need to specify allocation number here, because we know enough edges were created before
- ErrorCode rval = _readNC->readMeshIface->get_element_connect(nEdges, 2, MBEDGE, 0, start_edge, conn_arr_gather_set_edges); \
+ ErrorCode rval = _readNC->readMeshIface->get_element_connect(nEdges, 2, MBEDGE, 0, start_edge, conn_arr_gather_set_edges);
CHK_ERR1(rval, "Failed to create gather set edges");
// Add edges to the gather set
Range gather_set_edges_range(start_edge, start_edge + nEdges - 1);
- rval = mbImpl->add_entities(gather_set, gather_set_edges_range); \
+ rval = mbImpl->add_entities(gather_set, gather_set_edges_range);
CHK_ERR1(rval, "Failed to add edges to the gather set");
// Read vertices on each edge
@@ -1672,12 +1672,12 @@ ErrorCode NCHelperMPAS::create_gather_set_cells(EntityHandle gather_set, EntityH
if (num_group_cells > 0) {
EntityHandle start_element;
ErrorCode rval = _readNC->readMeshIface->get_element_connect(num_group_cells, num_edges_per_cell, MBPOLYGON, 0, start_element,
- conn_arr_gather_set_cells_with_n_edges[num_edges_per_cell], num_group_cells); \
+ conn_arr_gather_set_cells_with_n_edges[num_edges_per_cell], num_group_cells);
CHK_ERR1(rval, "Failed to create gather set cells");
// Add cells to the gather set
Range gather_set_cells_range(start_element, start_element + num_group_cells - 1);
- rval = mbImpl->add_entities(gather_set, gather_set_cells_range); \
+ rval = mbImpl->add_entities(gather_set, gather_set_cells_range);
CHK_ERR1(rval, "Failed to add cells to the gather set");
for (int j = 0; j < num_group_cells; j++) {
@@ -1732,12 +1732,12 @@ ErrorCode NCHelperMPAS::create_padded_gather_set_cells(EntityHandle gather_set,
EntityHandle start_element;
EntityHandle* conn_arr_gather_set_cells = NULL;
// Don't need to specify allocation number here, because we know enough cells were created before
- ErrorCode rval = _readNC->readMeshIface->get_element_connect(nCells, maxEdgesPerCell, MBPOLYGON, 0, start_element, conn_arr_gather_set_cells); \
+ ErrorCode rval = _readNC->readMeshIface->get_element_connect(nCells, maxEdgesPerCell, MBPOLYGON, 0, start_element, conn_arr_gather_set_cells);
CHK_ERR1(rval, "Failed to create cells");
// Add cells to the gather set
Range gather_set_cells_range(start_element, start_element + nCells - 1);
- rval = mbImpl->add_entities(gather_set, gather_set_cells_range); \
+ rval = mbImpl->add_entities(gather_set, gather_set_cells_range);
CHK_ERR1(rval, "Failed to add cells to the gather set");
// Read vertices on each gather set cell (connectivity)
diff --git a/src/io/ReadNC.cpp b/src/io/ReadNC.cpp
index fba9bce..cfda41d 100644
--- a/src/io/ReadNC.cpp
+++ b/src/io/ReadNC.cpp
@@ -50,7 +50,7 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
// is set too, with the same data, duplicated
mpFileIdTag = file_id_tag;
- rval = parse_options(opts, var_names, tstep_nums, tstep_vals); \
+ rval = parse_options(opts, var_names, tstep_nums, tstep_vals);
CHK_ERR1(rval, "Trouble parsing option string");
// Open the file
@@ -71,7 +71,7 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
SET_ERR(MB_FAILURE, "Trouble opening file");
// Read the header (num dimensions, dimensions, num variables, global attribs)
- rval = read_header(); \
+ rval = read_header();
CHK_ERR1(rval, "Trouble reading file header");
// Make sure there's a file set to put things in
@@ -80,7 +80,7 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
SET_ERR(MB_FAILURE, "NOMESH option requires non-NULL file set on input");
}
else if (!file_set || (file_set && *file_set == 0)) {
- rval = mbImpl->create_meshset(MESHSET_SET, tmp_set); \
+ rval = mbImpl->create_meshset(MESHSET_SET, tmp_set);
CHK_ERR1(rval, "Trouble creating file set");
}
else
@@ -102,19 +102,19 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
}
// Initialize mesh values
- rval = myHelper->init_mesh_vals(); \
+ rval = myHelper->init_mesh_vals();
CHK_ERR1(rval, "Trouble initializing mesh values");
// Check existing mesh from last read
if (noMesh && !noVars) {
- rval = myHelper->check_existing_mesh(); \
+ rval = myHelper->check_existing_mesh();
CHK_ERR1(rval, "Trouble checking mesh from last read");
}
// Create mesh vertex/edge/face sequences
Range faces;
if (!noMesh) {
- rval = myHelper->create_mesh(faces); \
+ rval = myHelper->create_mesh(faces);
CHK_ERR1(rval, "Trouble creating mesh");
}
@@ -140,17 +140,17 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
// Create partition set, and populate with elements
if (isParallel) {
EntityHandle partn_set;
- rval = mbImpl->create_meshset(MESHSET_SET, partn_set); \
+ rval = mbImpl->create_meshset(MESHSET_SET, partn_set);
CHK_ERR1(rval, "Trouble creating partition set");
- rval = mbImpl->add_entities(partn_set, faces); \
+ rval = mbImpl->add_entities(partn_set, faces);
CHK_ERR1(rval, "Couldn't add new faces to partition set");
Range verts;
- rval = mbImpl->get_connectivity(faces, verts); \
+ rval = mbImpl->get_connectivity(faces, verts);
CHK_ERR1(rval, "Couldn't get verts of faces");
- rval = mbImpl->add_entities(partn_set, verts); \
+ rval = mbImpl->add_entities(partn_set, verts);
CHK_ERR1(rval, "Couldn't add new verts to partition set");
myPcomm->partition_sets().insert(partn_set);
@@ -164,7 +164,7 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
// Create NC conventional tags when loading header info only
if (noMesh && noVars) {
- rval = myHelper->create_conventional_tags(tstep_nums); \
+ rval = myHelper->create_conventional_tags(tstep_nums);
CHK_ERR1(rval, "Trouble creating NC conventional tags");
}
@@ -284,17 +284,17 @@ ErrorCode ReadNC::read_header()
SET_ERR(MB_FAILURE, "Couldn't get number of global attributes");
// Read attributes into globalAtts
- ErrorCode result = get_attributes(NC_GLOBAL, numgatts, globalAtts); \
+ ErrorCode result = get_attributes(NC_GLOBAL, numgatts, globalAtts);
CHK_ERR1(result, "Trouble getting attributes");
dbgOut.tprintf(1, "Read %u attributes\n", (unsigned int) globalAtts.size());
// Read in dimensions into dimNames and dimLens
- result = get_dimensions(fileId, dimNames, dimLens); \
+ result = get_dimensions(fileId, dimNames, dimLens);
CHK_ERR1(result, "Trouble getting dimensions");
dbgOut.tprintf(1, "Read %u dimensions\n", (unsigned int) dimNames.size());
// Read in variables into varInfo
- result = get_variables(); \
+ result = get_variables();
CHK_ERR1(result, "Trouble getting variables");
dbgOut.tprintf(1, "Read %u variables\n", (unsigned int) varInfo.size());
@@ -416,7 +416,7 @@ ErrorCode ReadNC::get_variables()
dbgOut.tprintf(2, "Variable %s: Id=%d, numAtts=%d, datatype=%d, num_dims=%u\n", data.varName.c_str(), data.varId, data.numAtts,
data.varDataType, (unsigned int) data.varDims.size());
- ErrorCode rval = get_attributes(i, data.numAtts, data.varAtts, " "); \
+ ErrorCode rval = get_attributes(i, data.numAtts, data.varAtts, " ");
CHK_ERR1(rval, "Trouble getting attributes for a variable");
}
Repository URL: https://bitbucket.org/fathomteam/moab/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the moab-dev
mailing list