[MOAB-dev] commit/MOAB: danwu: Rename VarData::readDims to readStarts to better indicate its meaning
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Jul 29 16:36:14 CDT 2013
1 new commit in MOAB:
https://bitbucket.org/fathomteam/moab/commits/5341d191cdb3/
Changeset: 5341d191cdb3
Branch: master
User: danwu
Date: 2013-07-29 23:35:49
Summary: Rename VarData::readDims to readStarts to better indicate its meaning
Affected #: 4 files
diff --git a/src/io/NCHelper.cpp b/src/io/NCHelper.cpp
index 7d1a6c3..d28c824 100644
--- a/src/io/NCHelper.cpp
+++ b/src/io/NCHelper.cpp
@@ -83,12 +83,12 @@ ErrorCode NCHelper::read_variable_to_set_allocate(std::vector<ReadNC::VarData>&
{
if (vdatas[i].varDims.size() != 1)
{
- vdatas[i].readDims[t].push_back(tstep_nums[t]);
+ vdatas[i].readStarts[t].push_back(tstep_nums[t]);
vdatas[i].readCounts[t].push_back(1);
}
else
{
- vdatas[i].readDims[t].push_back(0);
+ vdatas[i].readStarts[t].push_back(0);
vdatas[i].readCounts[t].push_back(tstep_nums.size());
}
}
@@ -96,14 +96,14 @@ ErrorCode NCHelper::read_variable_to_set_allocate(std::vector<ReadNC::VarData>&
// Set up other dimensions and counts
if (vdatas[i].varDims.empty()) {
// Scalar variable
- vdatas[i].readDims[t].push_back(0);
+ vdatas[i].readStarts[t].push_back(0);
vdatas[i].readCounts[t].push_back(1);
}
else {
for (unsigned int idx = 0; idx != vdatas[i].varDims.size(); idx++){
if (tDim != vdatas[i].varDims[idx]){
// Push other variable dimensions, except time, which was already pushed
- vdatas[i].readDims[t].push_back(0);
+ vdatas[i].readStarts[t].push_back(0);
vdatas[i].readCounts[t].push_back(dimVals[vdatas[i].varDims[idx]]);
}
}
@@ -158,28 +158,28 @@ ErrorCode NCHelper::read_variable_to_set(EntityHandle file_set, std::vector<Read
switch (vdatas[i].varDataType) {
case NC_BYTE:
case NC_CHAR:
- success = NCFUNCAG(_vara_text)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_text)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
(char*) data NCREQ);
ERRORS(success, "Failed to read char data.");
break;
case NC_DOUBLE:
- success = NCFUNCAG(_vara_double)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_double)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
(double*) data NCREQ);
ERRORS(success, "Failed to read double data.");
break;
case NC_FLOAT: {
- success = NCFUNCAG(_vara_float)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_float)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
(float*) data NCREQ);
ERRORS(success, "Failed to read float data.");
break;
}
case NC_INT:
- success = NCFUNCAG(_vara_int)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_int)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
(int*) data NCREQ);
ERRORS(success, "Failed to read int data.");
break;
case NC_SHORT:
- success = NCFUNCAG(_vara_short)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_short)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
(short*) data NCREQ);
ERRORS(success, "Failed to read short data.");
break;
@@ -545,7 +545,7 @@ ErrorCode ScdNCHelper::read_scd_variable_setup(std::vector<std::string>& var_nam
for (unsigned int i = 0; i < vdatas.size(); i++) {
vdatas[i].varTags.resize(tstep_nums.size(), 0);
vdatas[i].varDatas.resize(tstep_nums.size());
- vdatas[i].readDims.resize(tstep_nums.size());
+ vdatas[i].readStarts.resize(tstep_nums.size());
vdatas[i].readCounts.resize(tstep_nums.size());
}
for (unsigned int i = 0; i < vsetdatas.size(); i++) {
@@ -553,13 +553,13 @@ ErrorCode ScdNCHelper::read_scd_variable_setup(std::vector<std::string>& var_nam
&& (vsetdatas[i].varDims.size() != 1)) {
vsetdatas[i].varTags.resize(tstep_nums.size(), 0);
vsetdatas[i].varDatas.resize(tstep_nums.size());
- vsetdatas[i].readDims.resize(tstep_nums.size());
+ vsetdatas[i].readStarts.resize(tstep_nums.size());
vsetdatas[i].readCounts.resize(tstep_nums.size());
}
else {
vsetdatas[i].varTags.resize(1, 0);
vsetdatas[i].varDatas.resize(1);
- vsetdatas[i].readDims.resize(1);
+ vsetdatas[i].readStarts.resize(1);
vsetdatas[i].readCounts.resize(1);
}
}
@@ -647,12 +647,12 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset_allocate(EntityHandle file_se
// Set up the dimensions and counts
// First time
- vdatas[i].readDims[t].push_back(tstep_nums[t]);
+ vdatas[i].readStarts[t].push_back(tstep_nums[t]);
vdatas[i].readCounts[t].push_back(1);
// then z/y/x
if (vdatas[i].numLev != 1) {
- vdatas[i].readDims[t].push_back(0);
+ vdatas[i].readStarts[t].push_back(0);
vdatas[i].readCounts[t].push_back(vdatas[i].numLev);
}
@@ -660,11 +660,11 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset_allocate(EntityHandle file_se
case ReadNC::ENTLOCVERT:
// vertices
// only structured mesh has j parameter that multiplies i to get total # vertices
- vdatas[i].readDims[t].push_back(lDims[1]);
+ vdatas[i].readStarts[t].push_back(lDims[1]);
vdatas[i].readCounts[t].push_back(lDims[4] - lDims[1] + 1);
- vdatas[i].readDims[t].push_back(lDims[0]);
+ vdatas[i].readStarts[t].push_back(lDims[0]);
vdatas[i].readCounts[t].push_back(lDims[3] - lDims[0] + 1);
- assert(vdatas[i].readDims[t].size() == vdatas[i].varDims.size());
+ assert(vdatas[i].readStarts[t].size() == vdatas[i].varDims.size());
range = &verts;
break;
case ReadNC::ENTLOCNSEDGE:
@@ -675,11 +675,11 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset_allocate(EntityHandle file_se
break;
case ReadNC::ENTLOCFACE:
// faces
- vdatas[i].readDims[t].push_back(lCDims[1]);
- vdatas[i].readDims[t].push_back(lCDims[0]);
+ vdatas[i].readStarts[t].push_back(lCDims[1]);
+ vdatas[i].readStarts[t].push_back(lCDims[0]);
vdatas[i].readCounts[t].push_back(lCDims[4] - lCDims[1] + 1);
vdatas[i].readCounts[t].push_back(lCDims[3] - lCDims[0] + 1);
- assert(vdatas[i].readDims[t].size() == vdatas[i].varDims.size());
+ assert(vdatas[i].readStarts[t].size() == vdatas[i].varDims.size());
#ifdef USE_MPI
range = &faces_owned;
#else
@@ -737,7 +737,7 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset(EntityHandle file_set, std::v
case NC_BYTE:
case NC_CHAR: {
std::vector<char> tmpchardata(sz);
- success = NCFUNCAG(_vara_text)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_text)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpchardata[0] NCREQ);
if (vdatas[i].numLev != 1)
// switch from k varying slowest to k varying fastest
@@ -751,7 +751,7 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset(EntityHandle file_set, std::v
}
case NC_DOUBLE: {
std::vector<double> tmpdoubledata(sz);
- success = NCFUNCAG(_vara_double)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_double)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpdoubledata[0] NCREQ);
if (vdatas[i].numLev != 1)
// switch from k varying slowest to k varying fastest
@@ -765,7 +765,7 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset(EntityHandle file_set, std::v
}
case NC_FLOAT: {
std::vector<float> tmpfloatdata(sz);
- success = NCFUNCAG(_vara_float)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_float)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpfloatdata[0] NCREQ);
if (vdatas[i].numLev != 1)
// Switch from k varying slowest to k varying fastest
@@ -779,7 +779,7 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset(EntityHandle file_set, std::v
}
case NC_INT: {
std::vector<int> tmpintdata(sz);
- success = NCFUNCAG(_vara_int)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_int)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpintdata[0] NCREQ);
if (vdatas[i].numLev != 1)
// Switch from k varying slowest to k varying fastest
@@ -793,7 +793,7 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset(EntityHandle file_set, std::v
}
case NC_SHORT: {
std::vector<short> tmpshortdata(sz);
- success = NCFUNCAG(_vara_short)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_short)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpshortdata[0] NCREQ);
if (vdatas[i].numLev != 1)
// Switch from k varying slowest to k varying fastest
diff --git a/src/io/NCHelperHOMME.cpp b/src/io/NCHelperHOMME.cpp
index d6659eb..058dfaf 100644
--- a/src/io/NCHelperHOMME.cpp
+++ b/src/io/NCHelperHOMME.cpp
@@ -582,7 +582,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_setup(std::vector<std::string>& var_n
for (unsigned int i = 0; i < vdatas.size(); i++) {
vdatas[i].varTags.resize(tstep_nums.size(), 0);
vdatas[i].varDatas.resize(tstep_nums.size());
- vdatas[i].readDims.resize(tstep_nums.size());
+ vdatas[i].readStarts.resize(tstep_nums.size());
vdatas[i].readCounts.resize(tstep_nums.size());
}
for (unsigned int i = 0; i < vsetdatas.size(); i++) {
@@ -590,13 +590,13 @@ ErrorCode NCHelperHOMME::read_ucd_variable_setup(std::vector<std::string>& var_n
&& (vsetdatas[i].varDims.size() != 1)) {
vsetdatas[i].varTags.resize(tstep_nums.size(), 0);
vsetdatas[i].varDatas.resize(tstep_nums.size());
- vsetdatas[i].readDims.resize(tstep_nums.size());
+ vsetdatas[i].readStarts.resize(tstep_nums.size());
vsetdatas[i].readCounts.resize(tstep_nums.size());
}
else {
vsetdatas[i].varTags.resize(1, 0);
vsetdatas[i].varDatas.resize(1);
- vsetdatas[i].readDims.resize(1);
+ vsetdatas[i].readStarts.resize(1);
vsetdatas[i].readCounts.resize(1);
}
}
@@ -657,12 +657,12 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_allocate(EntityHandle file_
// Set up the dimensions and counts
// First: time
- vdatas[i].readDims[t].push_back(tstep_nums[t]);
+ vdatas[i].readStarts[t].push_back(tstep_nums[t]);
vdatas[i].readCounts[t].push_back(1);
// Next: numLev
if (vdatas[i].numLev != 1) {
- vdatas[i].readDims[t].push_back(0);
+ vdatas[i].readStarts[t].push_back(0);
vdatas[i].readCounts[t].push_back(vdatas[i].numLev);
}
@@ -672,9 +672,9 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_allocate(EntityHandle file_
// vertices
// we will start from the first localGid, actually; we will reset that
// later on, anyway, in a loop
- vdatas[i].readDims[t].push_back(localGid[0] - 1);
+ vdatas[i].readStarts[t].push_back(localGid[0] - 1);
vdatas[i].readCounts[t].push_back(localGid.size());
- assert(vdatas[i].readDims[t].size() == vdatas[i].varDims.size());
+ assert(vdatas[i].readStarts[t].size() == vdatas[i].varDims.size());
range = &verts;
break;
default:
@@ -744,7 +744,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_async(EntityHandle file_set
// localGid range;
// basically, we have to give a different point
// for data to start, for every subrange :(
- size_t nbDims = vdatas[i].readDims[t].size();
+ size_t nbDims = vdatas[i].readStarts[t].size();
// assume that the last dimension is for the ncol,
// node varying variable
@@ -755,13 +755,13 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_async(EntityHandle file_set
pair_iter++, ic++) {
EntityHandle starth = pair_iter->first;
EntityHandle endh = pair_iter->second; // inclusive
- vdatas[i].readDims[t][nbDims - 1] = (NCDF_SIZE) (starth - 1);
+ vdatas[i].readStarts[t][nbDims - 1] = (NCDF_SIZE) (starth - 1);
vdatas[i].readCounts[t][nbDims - 1] = (NCDF_SIZE) (endh - starth + 1);
// do a partial read, in each subrange
// wait outside this loop
success = NCFUNCAG2(_vara_double)(_fileId, vdatas[i].varId,
- &(vdatas[i].readDims[t][0]), &(vdatas[i].readCounts[t][0]),
+ &(vdatas[i].readStarts[t][0]), &(vdatas[i].readCounts[t][0]),
&(tmpdoubledata[indexInDoubleArray]) NCREQ2);
ERRORS(success, "Failed to read double data in loop");
// we need to increment the index in double array for the
@@ -791,7 +791,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_async(EntityHandle file_set
// localGid range;
// basically, we have to give a different point
// for data to start, for every subrange :(
- size_t nbDims = vdatas[i].readDims[t].size();
+ size_t nbDims = vdatas[i].readStarts[t].size();
// assume that the last dimension is for the ncol,
// node varying variable
@@ -802,13 +802,13 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_async(EntityHandle file_set
pair_iter++, ic++) {
EntityHandle starth = pair_iter->first;
EntityHandle endh = pair_iter->second; // inclusive
- vdatas[i].readDims[t][nbDims - 1] = (NCDF_SIZE) (starth - 1);
+ vdatas[i].readStarts[t][nbDims - 1] = (NCDF_SIZE) (starth - 1);
vdatas[i].readCounts[t][nbDims - 1] = (NCDF_SIZE) (endh - starth + 1);
// do a partial read, in each subrange
// wait outside this loop
success = NCFUNCAG2(_vara_float)(_fileId, vdatas[i].varId,
- &(vdatas[i].readDims[t][0]), &(vdatas[i].readCounts[t][0]),
+ &(vdatas[i].readStarts[t][0]), &(vdatas[i].readCounts[t][0]),
&(tmpfloatdata[indexInFloatArray]) NCREQ2);
ERRORS(success, "Failed to read float data in loop");
// we need to increment the index in float array for the
@@ -889,7 +889,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(EntityHandle file_set, std:
case NC_BYTE:
case NC_CHAR: {
std::vector<char> tmpchardata(sz);
- success = NCFUNCAG(_vara_text)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_text)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpchardata[0] NCREQ);
if (vdatas[i].numLev != 1)
// switch from k varying slowest to k varying fastest
@@ -910,7 +910,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(EntityHandle file_set, std:
// localGid range;
// basically, we have to give a different point
// for data to start, for every subrange :(
- size_t nbDims = vdatas[i].readDims[t].size();
+ size_t nbDims = vdatas[i].readStarts[t].size();
// Assume that the last dimension is for the ncol
size_t indexInDoubleArray = 0;
@@ -920,11 +920,11 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(EntityHandle file_set, std:
pair_iter++, ic++) {
EntityHandle starth = pair_iter->first;
EntityHandle endh = pair_iter->second; // Inclusive
- vdatas[i].readDims[t][nbDims - 1] = (NCDF_SIZE) (starth - 1);
+ vdatas[i].readStarts[t][nbDims - 1] = (NCDF_SIZE) (starth - 1);
vdatas[i].readCounts[t][nbDims - 1] = (NCDF_SIZE) (endh - starth + 1);
success = NCFUNCAG(_vara_double)(_fileId, vdatas[i].varId,
- &(vdatas[i].readDims[t][0]), &(vdatas[i].readCounts[t][0]),
+ &(vdatas[i].readStarts[t][0]), &(vdatas[i].readCounts[t][0]),
&(tmpdoubledata[indexInDoubleArray]) NCREQ);
ERRORS(success, "Failed to read float data in loop");
// We need to increment the index in double array for the
@@ -951,7 +951,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(EntityHandle file_set, std:
// localGid range;
// basically, we have to give a different point
// for data to start, for every subrange :(
- size_t nbDims = vdatas[i].readDims[t].size();
+ size_t nbDims = vdatas[i].readStarts[t].size();
// Assume that the last dimension is for the ncol
size_t indexInFloatArray = 0;
@@ -961,11 +961,11 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(EntityHandle file_set, std:
pair_iter++, ic++) {
EntityHandle starth = pair_iter->first;
EntityHandle endh = pair_iter->second; // Inclusive
- vdatas[i].readDims[t][nbDims-1] = (NCDF_SIZE) (starth - 1);
+ vdatas[i].readStarts[t][nbDims-1] = (NCDF_SIZE) (starth - 1);
vdatas[i].readCounts[t][nbDims-1] = (NCDF_SIZE) (endh - starth + 1);
success = NCFUNCAG(_vara_float)(_fileId, vdatas[i].varId,
- &(vdatas[i].readDims[t][0]), &(vdatas[i].readCounts[t][0]),
+ &(vdatas[i].readStarts[t][0]), &(vdatas[i].readCounts[t][0]),
&(tmpfloatdata[indexInFloatArray]) NCREQ);
ERRORS(success, "Failed to read float data in loop");
// We need to increment the index in float array for the
@@ -986,7 +986,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(EntityHandle file_set, std:
}
case NC_INT: {
std::vector<int> tmpintdata(sz);
- success = NCFUNCAG(_vara_int)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_int)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpintdata[0] NCREQ);
if (vdatas[i].numLev != 1)
// Switch from k varying slowest to k varying fastest
@@ -1000,7 +1000,7 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(EntityHandle file_set, std:
}
case NC_SHORT: {
std::vector<short> tmpshortdata(sz);
- success = NCFUNCAG(_vara_short)(_fileId, vdatas[i].varId, &vdatas[i].readDims[t][0], &vdatas[i].readCounts[t][0],
+ success = NCFUNCAG(_vara_short)(_fileId, vdatas[i].varId, &vdatas[i].readStarts[t][0], &vdatas[i].readCounts[t][0],
&tmpshortdata[0] NCREQ);
if (vdatas[i].numLev != 1)
// Switch from k varying slowest to k varying fastest
diff --git a/src/io/NCHelperMPAS.cpp b/src/io/NCHelperMPAS.cpp
index 24b7241..3fa43c0 100644
--- a/src/io/NCHelperMPAS.cpp
+++ b/src/io/NCHelperMPAS.cpp
@@ -155,10 +155,10 @@ ErrorCode NCHelperMPAS::init_mesh_vals(const FileOptions& opts, EntityHandle fil
int verticesOnEdgeVarId;
int success = NCFUNC(inq_varid)(_fileId, "verticesOnEdge", &verticesOnEdgeVarId);
ERRORS(success, "Failed to get variable id of verticesOnEdge.");
- NCDF_SIZE tmp_dims[2] = {0, 0};
+ NCDF_SIZE tmp_starts[2] = {0, 0};
NCDF_SIZE tmp_counts[2] = {static_cast<size_t>(nEdges), 2};
verticesOnEdge.resize(nEdges * 2);
- success = NCFUNCAG(_vara_int)(_fileId, verticesOnEdgeVarId, tmp_dims, tmp_counts, &verticesOnEdge[0] NCREQ);
+ success = NCFUNCAG(_vara_int)(_fileId, verticesOnEdgeVarId, tmp_starts, tmp_counts, &verticesOnEdge[0] NCREQ);
ERRORS(success, "Failed to read variable values of verticesOnEdge.");
// Determine the entity location type of a variable
@@ -559,7 +559,7 @@ ErrorCode NCHelperMPAS::read_ucd_variable_setup(std::vector<std::string>& var_na
for (unsigned int i = 0; i < vdatas.size(); i++) {
vdatas[i].varTags.resize(tstep_nums.size(), 0);
vdatas[i].varDatas.resize(tstep_nums.size());
- vdatas[i].readDims.resize(tstep_nums.size());
+ vdatas[i].readStarts.resize(tstep_nums.size());
vdatas[i].readCounts.resize(tstep_nums.size());
}
for (unsigned int i = 0; i < vsetdatas.size(); i++) {
@@ -567,13 +567,13 @@ ErrorCode NCHelperMPAS::read_ucd_variable_setup(std::vector<std::string>& var_na
&& (vsetdatas[i].varDims.size() != 1)) {
vsetdatas[i].varTags.resize(tstep_nums.size(), 0);
vsetdatas[i].varDatas.resize(tstep_nums.size());
- vsetdatas[i].readDims.resize(tstep_nums.size());
+ vsetdatas[i].readStarts.resize(tstep_nums.size());
vsetdatas[i].readCounts.resize(tstep_nums.size());
}
else {
vsetdatas[i].varTags.resize(1, 0);
vsetdatas[i].varDatas.resize(1);
- vsetdatas[i].readDims.resize(1);
+ vsetdatas[i].readStarts.resize(1);
vsetdatas[i].readCounts.resize(1);
}
}
@@ -655,26 +655,26 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_allocate(EntityHandle file_s
// Set up the dimensions and counts
// First: Time
- vdatas[i].readDims[t].push_back(tstep_nums[t]);
+ vdatas[i].readStarts[t].push_back(tstep_nums[t]);
vdatas[i].readCounts[t].push_back(1);
// Next: nCells or nEdges or nVertices
switch (vdatas[i].entLoc) {
case ReadNC::ENTLOCVERT:
// vertices
- vdatas[i].readDims[t].push_back(localGidVerts[0] - 1);
+ vdatas[i].readStarts[t].push_back(localGidVerts[0] - 1);
vdatas[i].readCounts[t].push_back(nLocalVertices);
range = &verts;
break;
case ReadNC::ENTLOCFACE:
// faces
- vdatas[i].readDims[t].push_back(localGidCells[0] - 1);
+ vdatas[i].readStarts[t].push_back(localGidCells[0] - 1);
vdatas[i].readCounts[t].push_back(nLocalCells);
range = &facesOwned;
break;
case ReadNC::ENTLOCEDGE:
// edges
- vdatas[i].readDims[t].push_back(localGidEdges[0] - 1);
+ vdatas[i].readStarts[t].push_back(localGidEdges[0] - 1);
vdatas[i].readCounts[t].push_back(nLocalEdges);
range = &edges;
break;
@@ -684,9 +684,9 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_allocate(EntityHandle file_s
}
// Last, numLev, even if it is 1
- vdatas[i].readDims[t].push_back(0);
+ vdatas[i].readStarts[t].push_back(0);
vdatas[i].readCounts[t].push_back(vdatas[i].numLev);
- assert(vdatas[i].readDims[t].size() == vdatas[i].varDims.size());
+ assert(vdatas[i].readStarts[t].size() == vdatas[i].varDims.size());
// Get ptr to tag space
if (vdatas[i].entLoc == ReadNC::ENTLOCFACE && numCellGroups > 1)
@@ -766,7 +766,7 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_async(EntityHandle file_set,
// localGid range;
// basically, we have to give a different point
// for data to start, for every subrange :(
- size_t nbDims = vdatas[i].readDims[t].size();
+ size_t nbDims = vdatas[i].readStarts[t].size();
// Assume that the last dimension is for the nVertLevels
size_t indexInDoubleArray = 0;
@@ -776,13 +776,13 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_async(EntityHandle file_set,
pair_iter++, ic++) {
EntityHandle starth = pair_iter->first;
EntityHandle endh = pair_iter->second; // inclusive
- vdatas[i].readDims[t][nbDims - 2] = (NCDF_SIZE) (starth - 1);
+ vdatas[i].readStarts[t][nbDims - 2] = (NCDF_SIZE) (starth - 1);
vdatas[i].readCounts[t][nbDims - 2] = (NCDF_SIZE) (endh - starth + 1);
// do a partial read, in each subrange
// wait outside this loop
success = NCFUNCAG2(_vara_double)(_fileId, vdatas[i].varId,
- &(vdatas[i].readDims[t][0]), &(vdatas[i].readCounts[t][0]),
+ &(vdatas[i].readStarts[t][0]), &(vdatas[i].readCounts[t][0]),
&(tmpdoubledata[indexInDoubleArray]) NCREQ2);
ERRORS(success, "Failed to read double data in loop");
// we need to increment the index in double array for the
@@ -909,7 +909,7 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset(EntityHandle file_set, std::
// localGid range;
// basically, we have to give a different point
// for data to start, for every subrange :(
- size_t nbDims = vdatas[i].readDims[t].size();
+ size_t nbDims = vdatas[i].readStarts[t].size();
// Assume that the last dimension is for the nVertLevels
size_t indexInDoubleArray = 0;
@@ -919,11 +919,11 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset(EntityHandle file_set, std::
pair_iter++, ic++) {
EntityHandle starth = pair_iter->first;
EntityHandle endh = pair_iter->second; // Inclusive
- vdatas[i].readDims[t][nbDims - 2] = (NCDF_SIZE) (starth - 1);
+ vdatas[i].readStarts[t][nbDims - 2] = (NCDF_SIZE) (starth - 1);
vdatas[i].readCounts[t][nbDims - 2] = (NCDF_SIZE) (endh - starth + 1);
success = NCFUNCAG(_vara_double)(_fileId, vdatas[i].varId,
- &(vdatas[i].readDims[t][0]), &(vdatas[i].readCounts[t][0]),
+ &(vdatas[i].readStarts[t][0]), &(vdatas[i].readCounts[t][0]),
&(tmpdoubledata[indexInDoubleArray]) NCREQ);
ERRORS(success, "Failed to read double data in loop");
// We need to increment the index in double array for the
diff --git a/src/io/ReadNC.hpp b/src/io/ReadNC.hpp
index abe690f..4efabab 100644
--- a/src/io/ReadNC.hpp
+++ b/src/io/ReadNC.hpp
@@ -127,7 +127,7 @@ private:
std::string varName;
std::vector<Tag> varTags; // One tag for each time step, varTags[t]
std::vector<void*> varDatas;
- std::vector<std::vector<NCDF_SIZE> > readDims; // Start value for this [t][dim]
+ std::vector<std::vector<NCDF_SIZE> > readStarts; // Start value for this [t][dim]
std::vector<std::vector<NCDF_SIZE> > readCounts; // Number of data values for this [t][dim]
int entLoc;
int numLev;
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