[MOAB-dev] commit/MOAB: tautges: Rename topological_connectivity, which I never understand, with corners_only, which is easier to understand.
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Sep 11 17:05:21 CDT 2013
1 new commit in MOAB:
https://bitbucket.org/fathomteam/moab/commits/e764eff35734/
Changeset: e764eff35734
Branch: master
User: tautges
Date: 2013-09-12 00:05:14
Summary: Rename topological_connectivity, which I never understand, with corners_only, which is easier to understand.
Also enhance some of the entity listing capability.
Affected #: 3 files
diff --git a/src/Core.cpp b/src/Core.cpp
index ad855ea..476fdca 100644
--- a/src/Core.cpp
+++ b/src/Core.cpp
@@ -1153,11 +1153,11 @@ ErrorCode Core::get_connectivity_by_type(const EntityType type,
ErrorCode Core::get_connectivity(const EntityHandle *entity_handles,
const int num_handles,
Range &connectivity,
- bool topological_connectivity) const
+ bool corners_only) const
{
std::vector<EntityHandle> tmp_connect;
ErrorCode result = get_connectivity(entity_handles, num_handles, tmp_connect,
- topological_connectivity);
+ corners_only);
if (MB_SUCCESS != result) return result;
std::sort( tmp_connect.begin(), tmp_connect.end() );
@@ -1169,7 +1169,7 @@ ErrorCode Core::get_connectivity(const EntityHandle *entity_handles,
ErrorCode Core::get_connectivity(const EntityHandle *entity_handles,
const int num_handles,
std::vector<EntityHandle> &connectivity,
- bool topological_connectivity,
+ bool corners_only,
std::vector<int> *offsets) const
{
connectivity.clear(); // this seems wrong as compared to other API functions,
@@ -1182,7 +1182,7 @@ ErrorCode Core::get_connectivity(const EntityHandle *entity_handles,
int len;
if (offsets) offsets->push_back(0);
for (int i = 0; i < num_handles; ++i) {
- rval = get_connectivity( entity_handles[i], conn, len, topological_connectivity, &tmp_storage );
+ rval = get_connectivity( entity_handles[i], conn, len, corners_only, &tmp_storage );
if (MB_SUCCESS != rval)
return rval;
connectivity.insert( connectivity.end(), conn, conn + len );
@@ -1195,7 +1195,7 @@ ErrorCode Core::get_connectivity(const EntityHandle *entity_handles,
ErrorCode Core::get_connectivity(const EntityHandle entity_handle,
const EntityHandle*& connectivity,
int& number_nodes,
- bool topological_connectivity,
+ bool corners_only,
std::vector<EntityHandle>* storage) const
{
ErrorCode status;
@@ -1222,7 +1222,7 @@ ErrorCode Core::get_connectivity(const EntityHandle entity_handle,
return static_cast<const ElementSequence*>(seq)->get_connectivity(entity_handle,
connectivity,
number_nodes,
- topological_connectivity,
+ corners_only,
storage);
}
@@ -2896,9 +2896,11 @@ ErrorCode Core::list_entity(const EntityHandle entity) const
if (multiple != 0)
std::cout << " (MULTIPLE = " << multiple << ")" << std::endl;
+ result = print_entity_tags(std::string(), entity, MB_TAG_DENSE);
+
std::cout << std::endl;
- return MB_SUCCESS;
+ return result;
}
ErrorCode Core::convert_entities( const EntityHandle meshset,
@@ -3598,16 +3600,21 @@ void Core::print(const EntityHandle ms_handle, const char *prefix,
}
// print all sparse tags
+ print_entity_tags(indent_prefix, ms_handle, MB_TAG_SPARSE);
+}
+
+ErrorCode Core::print_entity_tags(std::string indent_prefix, const EntityHandle handle, TagType tp) const
+{
std::vector<Tag> set_tags;
- ErrorCode result = this->tag_get_tags_on_entity(ms_handle, set_tags);
- std::cout << indent_prefix << "Sparse tags:" << std::endl;
+ ErrorCode result = this->tag_get_tags_on_entity(handle, set_tags);
+ std::cout << indent_prefix << (tp == MB_TAG_SPARSE ? "Sparse tags:" : "Dense tags:") << std::endl;
indent_prefix += " ";
for (std::vector<Tag>::iterator vit = set_tags.begin();
vit != set_tags.end(); vit++) {
TagType this_type;
result = this->tag_get_type(*vit, this_type);
- if (MB_SUCCESS != result || MB_TAG_SPARSE != this_type) continue;
+ if (MB_SUCCESS != result || tp != this_type) continue;
DataType this_data_type;
result = this->tag_get_data_type(*vit, this_data_type);
int this_size;
@@ -3622,7 +3629,7 @@ void Core::print(const EntityHandle ms_handle, const char *prefix,
if (MB_SUCCESS != result) continue;
switch (this_data_type) {
case MB_TYPE_INTEGER:
- result = this->tag_get_data(*vit, &ms_handle, 1, &int_vals[0]);
+ result = this->tag_get_data(*vit, &handle, 1, &int_vals[0]);
if (MB_SUCCESS != result) continue;
std::cout << indent_prefix << tag_name << " = ";
if (this_size < 10)
@@ -3631,7 +3638,7 @@ void Core::print(const EntityHandle ms_handle, const char *prefix,
std::cout << std::endl;
break;
case MB_TYPE_DOUBLE:
- result = this->tag_get_data(*vit, &ms_handle, 1, &dbl_vals[0]);
+ result = this->tag_get_data(*vit, &handle, 1, &dbl_vals[0]);
if (MB_SUCCESS != result) continue;
std::cout << indent_prefix << tag_name << " = ";
if (this_size < 10)
@@ -3640,7 +3647,7 @@ void Core::print(const EntityHandle ms_handle, const char *prefix,
std::cout << std::endl;
break;
case MB_TYPE_HANDLE:
- result = this->tag_get_data(*vit, &ms_handle, 1, &hdl_vals[0]);
+ result = this->tag_get_data(*vit, &handle, 1, &hdl_vals[0]);
if (MB_SUCCESS != result) continue;
std::cout << indent_prefix << tag_name << " = ";
if (this_size < 10)
@@ -3651,7 +3658,7 @@ void Core::print(const EntityHandle ms_handle, const char *prefix,
case MB_TYPE_OPAQUE:
if (NAME_TAG_SIZE == this_size) {
char dum_tag[NAME_TAG_SIZE];
- result = this->tag_get_data(*vit, &ms_handle, 1, &dum_tag);
+ result = this->tag_get_data(*vit, &handle, 1, &dum_tag);
if (MB_SUCCESS != result) continue;
// insert NULL just in case there isn't one
dum_tag[NAME_TAG_SIZE-1] = '\0';
@@ -3662,6 +3669,8 @@ void Core::print(const EntityHandle ms_handle, const char *prefix,
break;
}
}
+
+ return MB_SUCCESS;
}
ErrorCode Core::check_adjacencies()
diff --git a/src/moab/Core.hpp b/src/moab/Core.hpp
index efa17e3..4bb86c8 100644
--- a/src/moab/Core.hpp
+++ b/src/moab/Core.hpp
@@ -221,7 +221,7 @@ public:
\param entity_handle EntityHandle to get connectivity of.
\param connectivity Vector in which connectivity of <em>entity_handle</em> is returned.
Should contain MeshVertices.
- \param topological_connectivity If true, higher order nodes are ignored.
+ \param corners_only If true, higher order nodes are ignored.
Example: \code
std::vector<EntityHandle> conn;
@@ -229,7 +229,7 @@ public:
virtual ErrorCode get_connectivity(const EntityHandle *entity_handles,
const int num_handles,
std::vector<EntityHandle> &connectivity,
- bool topological_connectivity = false,
+ bool corners_only = false,
std::vector<int> *offsets = NULL) const;
//! Gets the connectivity for a vector of elements
@@ -238,14 +238,14 @@ public:
virtual ErrorCode get_connectivity(const EntityHandle *entity_handles,
const int num_handles,
Range &connectivity,
- bool topological_connectivity = false) const;
+ bool corners_only = false) const;
//! Gets the connectivity for elements
/** Same as vector-based version except range is returned (unordered!)
*/
virtual ErrorCode get_connectivity( const Range& entity_handles,
Range &connectivity,
- bool topological_connectivity = false) const;
+ bool corners_only = false) const;
//! Gets a pointer to constant connectivity data of <em>entity_handle</em>
/** Sets <em>number_nodes</em> equal to the number of nodes of the <em>
@@ -273,7 +273,7 @@ public:
virtual ErrorCode get_connectivity( const EntityHandle entity_handle,
const EntityHandle *&connectivity,
int &num_nodes,
- bool topological_connectivity = false,
+ bool corners_only = false,
std::vector<EntityHandle>* storage = 0
) const;
@@ -1134,6 +1134,8 @@ public:
void print(const EntityHandle handle, const char *prefix,
bool first_call = true) const;
+ ErrorCode print_entity_tags(std::string indent_prefix, const EntityHandle handle, TagType tp) const;
+
virtual ErrorCode get_last_error(std::string& info) const;
virtual std::string get_error_string(const ErrorCode code) const;
diff --git a/src/moab/Interface.hpp b/src/moab/Interface.hpp
index 52be804..b6bb3e5 100644
--- a/src/moab/Interface.hpp
+++ b/src/moab/Interface.hpp
@@ -509,14 +509,14 @@ public:
virtual ErrorCode get_connectivity(const EntityHandle *entity_handles,
const int num_handles,
Range &connectivity,
- bool topological_connectivity = false) const =0;
+ bool corners_only = false) const =0;
//! Gets the connectivity for elements
/** Same as vector-based version except range is returned (unordered!)
*/
virtual ErrorCode get_connectivity( const Range& entity_handles,
Range &connectivity,
- bool topological_connectivity = false) const =0;
+ bool corners_only = false) const =0;
//! Gets the connectivity for a vector of elements
/** Corner vertices or all vertices (including higher-order nodes, if any) are returned.
@@ -527,14 +527,14 @@ public:
\param entity_handles Vector of element handles to get connectivity of.
\param num_handles Number of entity handles in <em>entity_handles</em>
\param connectivity Vector in which connectivity of <em>entity_handles</em> is returned.
- \param topological_connectivity If true, higher order nodes are ignored.
+ \param corners_only If true, higher order nodes are ignored.
\param offsets If non-NULL, offsets->[i] stores the index of the start of entity i's connectivity,
with the last value in offsets one beyond the last entry
*/
virtual ErrorCode get_connectivity(const EntityHandle *entity_handles,
const int num_handles,
std::vector<EntityHandle> &connectivity,
- bool topological_connectivity = false,
+ bool corners_only = false,
std::vector<int> *offsets = NULL) const =0;
//! Gets a pointer to constant connectivity data of <em>entity_handle</em>
@@ -561,7 +561,7 @@ public:
\param entity_handle EntityHandle to get connectivity of.
\param connectivity Array in which connectivity of <em>entity_handle</em> is returned.
\param num_nodes Number of MeshVertices in array <em>connectivity</em>.
- \param topological_connectivity If true, num_nodes will be set to number of corner vertices
+ \param corners_only If true, num_nodes will be set to number of corner vertices
for that element type.
\param storage Some elements (e.g. structured mesh) may not have an
explicit connectivity list. This function will normally
@@ -574,7 +574,7 @@ public:
virtual ErrorCode get_connectivity(const EntityHandle entity_handle,
const EntityHandle *&connectivity,
int &num_nodes,
- bool topological_connectivity = false,
+ bool corners_only = false,
std::vector<EntityHandle>* storage = 0
) const =0;
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