[MOAB-dev] commit/MOAB: danwu: Renamed a few member functions of NCHelper classes (e.g. read_variable_setup => read_variables_setup).
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Jun 12 15:55:08 CDT 2014
1 new commit in MOAB:
https://bitbucket.org/fathomteam/moab/commits/849eec7915e8/
Changeset: 849eec7915e8
Branch: master
User: danwu
Date: 2014-06-12 22:53:37
Summary: Renamed a few member functions of NCHelper classes (e.g. read_variable_setup => read_variables_setup).
Affected #: 8 files
diff --git a/src/io/NCHelper.cpp b/src/io/NCHelper.cpp
index 950d20c..9e982f3 100644
--- a/src/io/NCHelper.cpp
+++ b/src/io/NCHelper.cpp
@@ -380,7 +380,7 @@ ErrorCode NCHelper::update_time_tag_vals()
return MB_SUCCESS;
}
-ErrorCode NCHelper::read_variable_setup(std::vector<std::string>& var_names, std::vector<int>& tstep_nums,
+ErrorCode NCHelper::read_variables_setup(std::vector<std::string>& var_names, std::vector<int>& tstep_nums,
std::vector<ReadNC::VarData>& vdatas, std::vector<ReadNC::VarData>& vsetdatas)
{
std::map<std::string, ReadNC::VarData>& varInfo = _readNC->varInfo;
@@ -464,12 +464,12 @@ ErrorCode NCHelper::read_variable_setup(std::vector<std::string>& var_names, std
return MB_SUCCESS;
}
-ErrorCode NCHelper::read_variable_to_set(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelper::read_variables_to_set(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_variable_to_set_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_variables_to_set_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables to set.");
// Finally, read into that space
@@ -874,7 +874,7 @@ ErrorCode NCHelper::create_dummy_variables()
return MB_SUCCESS;
}
-ErrorCode NCHelper::read_variable_to_set_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelper::read_variables_to_set_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
std::vector<int>& dimLens = _readNC->dimLens;
DebugOutput& dbgOut = _readNC->dbgOut;
@@ -1102,23 +1102,23 @@ ErrorCode ScdNCHelper::read_variables(std::vector<std::string>& var_names, std::
std::vector<ReadNC::VarData> vdatas;
std::vector<ReadNC::VarData> vsetdatas;
- ErrorCode rval = read_variable_setup(var_names, tstep_nums, vdatas, vsetdatas);
+ ErrorCode rval = read_variables_setup(var_names, tstep_nums, vdatas, vsetdatas);
ERRORR(rval, "Trouble setting up read variable.");
if (!vsetdatas.empty()) {
- rval = read_variable_to_set(vsetdatas, tstep_nums);
+ rval = read_variables_to_set(vsetdatas, tstep_nums);
ERRORR(rval, "Trouble read variables to set.");
}
if (!vdatas.empty()) {
- rval = read_scd_variable_to_nonset(vdatas, tstep_nums);
+ rval = read_scd_variables_to_nonset(vdatas, tstep_nums);
ERRORR(rval, "Trouble read variables to entities verts/edges/faces.");
}
return MB_SUCCESS;
}
-ErrorCode ScdNCHelper::read_scd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode ScdNCHelper::read_scd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
std::vector<int>& dimLens = _readNC->dimLens;
@@ -1244,11 +1244,11 @@ ErrorCode ScdNCHelper::read_scd_variable_to_nonset_allocate(std::vector<ReadNC::
return rval;
}
-ErrorCode ScdNCHelper::read_scd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode ScdNCHelper::read_scd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_scd_variable_to_nonset_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_scd_variables_to_nonset_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables.");
// Finally, read into that space
@@ -1434,21 +1434,21 @@ ErrorCode UcdNCHelper::read_variables(std::vector<std::string>& var_names, std::
std::vector<ReadNC::VarData> vdatas;
std::vector<ReadNC::VarData> vsetdatas;
- ErrorCode rval = read_variable_setup(var_names, tstep_nums, vdatas, vsetdatas);
+ ErrorCode rval = read_variables_setup(var_names, tstep_nums, vdatas, vsetdatas);
ERRORR(rval, "Trouble setting up read variable.");
if (!vsetdatas.empty()) {
- rval = read_variable_to_set(vsetdatas, tstep_nums);
+ rval = read_variables_to_set(vsetdatas, tstep_nums);
ERRORR(rval, "Trouble read variables to set.");
}
if (!vdatas.empty()) {
#ifdef PNETCDF_FILE
// With pnetcdf support, we will use async read
- rval = read_ucd_variable_to_nonset_async(vdatas, tstep_nums);
+ rval = read_ucd_variables_to_nonset_async(vdatas, tstep_nums);
#else
// Without pnetcdf support, we will use old read
- rval = read_ucd_variable_to_nonset(vdatas, tstep_nums);
+ rval = read_ucd_variables_to_nonset(vdatas, tstep_nums);
#endif
ERRORR(rval, "Trouble read variables to entities verts/edges/faces.");
}
diff --git a/src/io/NCHelper.hpp b/src/io/NCHelper.hpp
index d134249..5b3b93c 100644
--- a/src/io/NCHelper.hpp
+++ b/src/io/NCHelper.hpp
@@ -40,13 +40,13 @@ public:
protected:
//! Separate set and non-set variables (common to scd mesh and ucd mesh)
- ErrorCode read_variable_setup(std::vector<std::string>& var_names,
+ ErrorCode read_variables_setup(std::vector<std::string>& var_names,
std::vector<int>& tstep_nums,
std::vector<ReadNC::VarData>& vdatas,
std::vector<ReadNC::VarData>& vsetdatas);
//! Read set variables (common to scd mesh and ucd mesh)
- ErrorCode read_variable_to_set(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums);
+ ErrorCode read_variables_to_set(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums);
//! Convert variables in place
ErrorCode convert_variable(ReadNC::VarData& var_data, int tstep_num);
@@ -72,8 +72,8 @@ protected:
ErrorCode create_dummy_variables();
private:
- //! Used by read_variable_to_set()
- ErrorCode read_variable_to_set_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums);
+ //! Used by read_variables_to_set()
+ ErrorCode read_variables_to_set_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums);
protected:
//! Allow NCHelper to directly access members of ReadNC
@@ -129,9 +129,9 @@ private:
virtual ErrorCode read_variables(std::vector<std::string>& var_names, std::vector<int>& tstep_nums);
//! Read non-set variables for scd mesh
- ErrorCode read_scd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
+ ErrorCode read_scd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
- ErrorCode read_scd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas,
+ ErrorCode read_scd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
//! Create COORDS tag for quads coordinate
@@ -197,13 +197,13 @@ private:
std::vector<int> &tstep_nums);
//! Read non-set variables for ucd mesh (implemented differently in child classes)
- virtual ErrorCode read_ucd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
+ virtual ErrorCode read_ucd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums) = 0;
#ifdef PNETCDF_FILE
- virtual ErrorCode read_ucd_variable_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
+ virtual ErrorCode read_ucd_variables_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums) = 0;
#else
- virtual ErrorCode read_ucd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas,
+ virtual ErrorCode read_ucd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums) = 0;
#endif
diff --git a/src/io/NCHelperGCRM.cpp b/src/io/NCHelperGCRM.cpp
index 13103a8..25ed53c 100644
--- a/src/io/NCHelperGCRM.cpp
+++ b/src/io/NCHelperGCRM.cpp
@@ -403,7 +403,7 @@ ErrorCode NCHelperGCRM::create_mesh(Range& faces)
return MB_SUCCESS;
}
-ErrorCode NCHelperGCRM::read_ucd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperGCRM::read_ucd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
std::vector<int>& dimLens = _readNC->dimLens;
@@ -536,12 +536,12 @@ ErrorCode NCHelperGCRM::read_ucd_variable_to_nonset_allocate(std::vector<ReadNC:
}
#ifdef PNETCDF_FILE
-ErrorCode NCHelperGCRM::read_ucd_variable_to_nonset_async(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperGCRM::read_ucd_variables_to_nonset_async(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
bool& noEdges = _readNC->noEdges;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variable_to_nonset_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables.");
// Finally, read into that space
@@ -656,13 +656,13 @@ ErrorCode NCHelperGCRM::read_ucd_variable_to_nonset_async(std::vector<ReadNC::Va
return rval;
}
#else
-ErrorCode NCHelperGCRM::read_ucd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperGCRM::read_ucd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
bool& noEdges = _readNC->noEdges;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variable_to_nonset_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables.");
// Finally, read into that space
diff --git a/src/io/NCHelperGCRM.hpp b/src/io/NCHelperGCRM.hpp
index 160e538..2887e86 100644
--- a/src/io/NCHelperGCRM.hpp
+++ b/src/io/NCHelperGCRM.hpp
@@ -30,16 +30,16 @@ private:
//! Implementation of NCHelper::get_mesh_type_name()
virtual std::string get_mesh_type_name() { return "GCRM"; }
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset_allocate()
- virtual ErrorCode read_ucd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset_allocate()
+ virtual ErrorCode read_ucd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#ifdef PNETCDF_FILE
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset_async()
- virtual ErrorCode read_ucd_variable_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset_async()
+ virtual ErrorCode read_ucd_variables_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#else
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset()
- virtual ErrorCode read_ucd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset()
+ virtual ErrorCode read_ucd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#endif
diff --git a/src/io/NCHelperHOMME.cpp b/src/io/NCHelperHOMME.cpp
index a296314..4aade2f 100644
--- a/src/io/NCHelperHOMME.cpp
+++ b/src/io/NCHelperHOMME.cpp
@@ -557,7 +557,7 @@ ErrorCode NCHelperHOMME::create_mesh(Range& faces)
return MB_SUCCESS;
}
-ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
std::vector<int>& dimLens = _readNC->dimLens;
@@ -640,11 +640,11 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_allocate(std::vector<ReadNC
}
#ifdef PNETCDF_FILE
-ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_async(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset_async(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variable_to_nonset_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables.");
// Finally, read into that space
@@ -802,11 +802,11 @@ ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset_async(std::vector<ReadNC::V
return rval;
}
#else
-ErrorCode NCHelperHOMME::read_ucd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperHOMME::read_ucd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variable_to_nonset_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables.");
// Finally, read into that space
diff --git a/src/io/NCHelperHOMME.hpp b/src/io/NCHelperHOMME.hpp
index a6d50f0..4c383bb 100644
--- a/src/io/NCHelperHOMME.hpp
+++ b/src/io/NCHelperHOMME.hpp
@@ -30,16 +30,16 @@ private:
//! Implementation of NCHelper::get_mesh_type_name()
virtual std::string get_mesh_type_name() { return "CAM_SE"; }
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset_allocate()
- virtual ErrorCode read_ucd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset_allocate()
+ virtual ErrorCode read_ucd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#ifdef PNETCDF_FILE
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset_async()
- virtual ErrorCode read_ucd_variable_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset_async()
+ virtual ErrorCode read_ucd_variables_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#else
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset()
- virtual ErrorCode read_ucd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset()
+ virtual ErrorCode read_ucd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#endif
diff --git a/src/io/NCHelperMPAS.cpp b/src/io/NCHelperMPAS.cpp
index b453b82..ace33a2 100644
--- a/src/io/NCHelperMPAS.cpp
+++ b/src/io/NCHelperMPAS.cpp
@@ -515,7 +515,7 @@ ErrorCode NCHelperMPAS::create_mesh(Range& faces)
return MB_SUCCESS;
}
-ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
std::vector<int>& dimLens = _readNC->dimLens;
@@ -654,13 +654,13 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_allocate(std::vector<ReadNC:
}
#ifdef PNETCDF_FILE
-ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_async(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset_async(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
bool& noEdges = _readNC->noEdges;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variable_to_nonset_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables.");
// Finally, read into that space
@@ -811,13 +811,13 @@ ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset_async(std::vector<ReadNC::Va
return rval;
}
#else
-ErrorCode NCHelperMPAS::read_ucd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
+ErrorCode NCHelperMPAS::read_ucd_variables_to_nonset(std::vector<ReadNC::VarData>& vdatas, std::vector<int>& tstep_nums)
{
Interface*& mbImpl = _readNC->mbImpl;
bool& noEdges = _readNC->noEdges;
DebugOutput& dbgOut = _readNC->dbgOut;
- ErrorCode rval = read_ucd_variable_to_nonset_allocate(vdatas, tstep_nums);
+ ErrorCode rval = read_ucd_variables_to_nonset_allocate(vdatas, tstep_nums);
ERRORR(rval, "Trouble allocating read variables.");
// Finally, read into that space
diff --git a/src/io/NCHelperMPAS.hpp b/src/io/NCHelperMPAS.hpp
index 6c6dc99..9db8d4a 100644
--- a/src/io/NCHelperMPAS.hpp
+++ b/src/io/NCHelperMPAS.hpp
@@ -30,15 +30,15 @@ private:
//! Implementation of NCHelper::get_mesh_type_name()
virtual std::string get_mesh_type_name() { return "MPAS"; }
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset_allocate()
- virtual ErrorCode read_ucd_variable_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset_allocate()
+ virtual ErrorCode read_ucd_variables_to_nonset_allocate(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#ifdef PNETCDF_FILE
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset_async()
- virtual ErrorCode read_ucd_variable_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset_async()
+ virtual ErrorCode read_ucd_variables_to_nonset_async(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#else
- //! Implementation of UcdNCHelper::read_ucd_variable_to_nonset()
+ //! Implementation of UcdNCHelper::read_ucd_variables_to_nonset()
virtual ErrorCode read_ucd_variable_to_nonset(std::vector<ReadNC::VarData>& vdatas,
std::vector<int>& tstep_nums);
#endif
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