Describe Improvements

src/describe.cpp

@@ -1,6 +1,27 @@
 #include <Omega_h_element.hpp>
 #include <Omega_h_file.hpp>
+#include <Omega_h_tag.hpp>
+#include <Omega_h_array_ops.hpp>
 
+template <typename T>
+void printTagInfo(Omega_h::Mesh mesh, std::ostringstream& oss, int dim, int tag, std::string type) {
+    auto tagbase = mesh.get_tag(dim, tag);
+    auto array = Omega_h::as<T>(tagbase)->array();
+
+    Omega_h::Real min = get_min(array);
+    Omega_h::Real max = get_max(array);
+
+    oss << "(" << tagbase->name().c_str() << ", " << dim << ", " << type << ")\n";
+    oss << "\tNum Components: " << tagbase->ncomps() << "\n";
+    oss << "\tMin, Max: " << min << ", " << max << "\n\n";
+}
+
+template <typename T>
+int getNumEq(Omega_h::Mesh mesh, std::string tagname, int dim, int value) {
+    auto array = mesh.get_array<T>(dim, tagname);
+    auto each_eq_to = Omega_h::each_eq_to<T>(array, value);
+    return Omega_h::get_sum(each_eq_to);
+}
 
 int main(int argc, char** argv)
 {
@@ -9,7 +30,7 @@ int main(int argc, char** argv)
     Omega_h::Mesh mesh = Omega_h::read_mesh_file(argv[1], lib.world());
 
     auto verbose = false;
-    if (argc == 3) verbose = (std::string(argv[2]) == "on");
+    if (argc >= 3) verbose = (std::string(argv[2]) == "on");
 
     const int rank = comm->rank();
 
@@ -34,22 +55,18 @@ int main(int argc, char** argv)
         for(int dim=0; dim < mesh.dim(); dim++)
             oss << "(" << dim << ", " << counts[dim] << ", " << imb[dim] << ")\n";
 
-        oss << "\nTags by Dimension: (Dim, Tag, Size per Entity)\n";
+        oss << "\nTag Properties by Dimension: (Name, Dim, Type)\n";
         for (int dim=0; dim < mesh.dim(); dim++)
         for (int tag=0; tag < mesh.ntags(dim); tag++) {
             auto tagbase = mesh.get_tag(dim, tag);
-            int size;
             if (tagbase->type() == OMEGA_H_I8)
-                size = mesh.get_tag<Omega_h::I8>(dim, tagbase->name())->array().size();
+                printTagInfo<Omega_h::I8>(mesh, oss, dim, tag, "I8");
             if (tagbase->type() == OMEGA_H_I32)
-                size = mesh.get_tag<Omega_h::I32>(dim, tagbase->name())->array().size();
+                printTagInfo<Omega_h::I32>(mesh, oss, dim, tag, "I32");
             if (tagbase->type() == OMEGA_H_I64)
-                size = mesh.get_tag<Omega_h::I64>(dim, tagbase->name())->array().size();
+                printTagInfo<Omega_h::I64>(mesh, oss, dim, tag, "I64");
             if (tagbase->type() == OMEGA_H_F64)
-                size = mesh.get_tag<Omega_h::Real>(dim, tagbase->name())->array().size();
-
-            size /= mesh.nents(dim);
-            oss << "(" << dim << ", " << tagbase->name().c_str() << ", " << size << ")\n";
+                printTagInfo<Omega_h::Real>(mesh, oss, dim, tag, "F64");
         }
 
         std::cout << oss.str();
@@ -72,5 +89,26 @@ int main(int argc, char** argv)
                                         << counts[3] << ")\n";
         std::cout << oss.str();
     }
+
+    if (argc > 3) {
+        std::string name = std::string(argv[3]);
+        int dim = atoi(argv[4]);
+        int value = atoi(argv[5]);
+        auto tagbase = mesh.get_tagbase(dim, name);
+        int numEq = 0;
+        if (tagbase->type() == OMEGA_H_I8)
+            numEq = getNumEq<Omega_h::I8>(mesh, name, dim, value);
+        if (tagbase->type() == OMEGA_H_I32)
+            numEq = getNumEq<Omega_h::I32>(mesh, name, dim, value);
+        if (tagbase->type() == OMEGA_H_I64)
+            numEq = getNumEq<Omega_h::I64>(mesh, name, dim, value);
+        if (tagbase->type() == OMEGA_H_F64)
+            numEq = getNumEq<Omega_h::Real>(mesh, name, dim, value);
+
+        if (!rank) std::cout << "\nInput: (" << name << " " << dim << " " << value <<"), Output: (Rank, Num Entities Equal to Value)\n";
+        comm->barrier();
+        std::cout << "(" << rank << ", " << numEq << ")\n";
+        return 0;
+    }
     return 0;
 }