merge develo

Author: JustinPrivitera

src/libs/blueprint/conduit_blueprint_mesh_matset_accessor.cpp

@@ -124,73 +124,69 @@ MatsetAccessor::MatsetAccessor(const Node &matset,
 }   
 
 //---------------------------------------------------------------------------//
-MatsetAccessor::MatsetAccessor(const MatsetAccessor &m_acc)
-: m_get_mat_id(m_acc.m_get_mat_id),
-  m_get_mat_order_id(m_acc.m_get_mat_order_id),
-  m_get_elem_id(m_acc.m_get_elem_id),
-  m_get_vol_frac(m_acc.m_get_vol_frac),
-  m_get_mset_val(m_acc.m_get_mset_val),
-  m_get_mass_frac(m_acc.m_get_mass_frac),
-  m_get_nmats_for_elem(m_acc.m_get_nmats_for_elem),
-  m_get_nelems_for_mat(m_acc.m_get_nelems_for_mat),
-  m_get_nspec_for_mat(m_acc.m_get_nspec_for_mat),
-  m_is_uni_buffer(m_acc.m_is_uni_buffer),
-  m_is_element_dominant(m_acc.m_is_element_dominant),
-  m_num_elems(m_acc.m_num_elems),
-  m_num_mats(m_acc.m_num_mats),
-  m_has_field(m_acc.m_has_field),
-  m_has_specset(m_acc.m_has_specset),
-  m_nmatspec(m_acc.m_nmatspec),
-  m_multi_vol_fracs(m_acc.m_multi_vol_fracs),
-  m_multi_mset_vals(m_acc.m_multi_mset_vals),
-  m_multi_mat_idx_map(m_acc.m_multi_mat_idx_map),
-  m_multi_mass_fracs(m_acc.m_multi_mass_fracs),
-  m_sbm_elem_ids(m_acc.m_sbm_elem_ids),
-  m_sbe_material_ids(m_acc.m_sbe_material_ids),
-  m_sbe_mat_order_ids(m_acc.m_sbe_mat_order_ids),
-  m_sbe_vol_fracs(m_acc.m_sbe_vol_fracs),
-  m_sbe_mset_vals(m_acc.m_sbe_mset_vals),
-  m_sbe_o2m_idx(m_acc.m_sbe_o2m_idx),
-  m_sbe_mass_fracs(m_acc.m_sbe_mass_fracs),
-  m_sbe_specset_o2m_idx(m_acc.m_sbe_specset_o2m_idx)
+MatsetAccessor::MatsetAccessor(const MatsetAccessor &other_matset_accessor)
+: m_get_mat_id(other_matset_accessor.m_get_mat_id),
+  m_get_mat_order_id(other_matset_accessor.m_get_mat_order_id),
+  m_get_elem_id(other_matset_accessor.m_get_elem_id),
+  m_get_vol_frac(other_matset_accessor.m_get_vol_frac),
+  m_get_mset_val(other_matset_accessor.m_get_mset_val),
+  m_get_mass_frac(other_matset_accessor.m_get_mass_frac),
+  m_get_nmats_for_elem(other_matset_accessor.m_get_nmats_for_elem),
+  m_get_nelems_for_mat(other_matset_accessor.m_get_nelems_for_mat),
+  m_get_nspec_for_mat(other_matset_accessor.m_get_nspec_for_mat),
+  m_is_uni_buffer(other_matset_accessor.m_is_uni_buffer),
+  m_is_element_dominant(other_matset_accessor.m_is_element_dominant),
+  m_num_elems(other_matset_accessor.m_num_elems),
+  m_num_mats(other_matset_accessor.m_num_mats),
+  m_has_field(other_matset_accessor.m_has_field),
+  m_has_specset(other_matset_accessor.m_has_specset),
+  m_internal_data(other_matset_accessor.m_internal_data),
+  m_multi_vol_fracs(other_matset_accessor.m_multi_vol_fracs),
+  m_multi_mset_vals(other_matset_accessor.m_multi_mset_vals),
+  m_multi_mass_fracs(other_matset_accessor.m_multi_mass_fracs),
+  m_sbm_elem_ids(other_matset_accessor.m_sbm_elem_ids),
+  m_sbe_material_ids(other_matset_accessor.m_sbe_material_ids),
+  m_sbe_vol_fracs(other_matset_accessor.m_sbe_vol_fracs),
+  m_sbe_mset_vals(other_matset_accessor.m_sbe_mset_vals),
+  m_sbe_o2m_idx(other_matset_accessor.m_sbe_o2m_idx),
+  m_sbe_mass_fracs(other_matset_accessor.m_sbe_mass_fracs),
+  m_sbe_specset_o2m_idx(other_matset_accessor.m_sbe_specset_o2m_idx)
 {
     rebind_internal_accessors();
 }
 
 //---------------------------------------------------------------------------//
 MatsetAccessor &
-MatsetAccessor::operator=(const MatsetAccessor &m_acc)
+MatsetAccessor::operator=(const MatsetAccessor &other_matset_accessor)
 {
-    if (this != &m_acc)
+    if (this != &other_matset_accessor)
     {
-        m_get_mat_id = m_acc.m_get_mat_id;
-        m_get_mat_order_id = m_acc.m_get_mat_order_id;
-        m_get_elem_id = m_acc.m_get_elem_id;
-        m_get_vol_frac = m_acc.m_get_vol_frac;
-        m_get_mset_val = m_acc.m_get_mset_val;
-        m_get_mass_frac = m_acc.m_get_mass_frac;
-        m_get_nmats_for_elem = m_acc.m_get_nmats_for_elem;
-        m_get_nelems_for_mat = m_acc.m_get_nelems_for_mat;
-        m_get_nspec_for_mat = m_acc.m_get_nspec_for_mat;
-        m_is_uni_buffer = m_acc.m_is_uni_buffer;
-        m_is_element_dominant = m_acc.m_is_element_dominant;
-        m_num_elems = m_acc.m_num_elems;
-        m_num_mats = m_acc.m_num_mats;
-        m_has_field = m_acc.m_has_field;
-        m_has_specset = m_acc.m_has_specset;
-        m_nmatspec = m_acc.m_nmatspec;
-        m_multi_vol_fracs = m_acc.m_multi_vol_fracs;
-        m_multi_mset_vals = m_acc.m_multi_mset_vals;
-        m_multi_mat_idx_map = m_acc.m_multi_mat_idx_map;
-        m_multi_mass_fracs = m_acc.m_multi_mass_fracs;
-        m_sbm_elem_ids = m_acc.m_sbm_elem_ids;
-        m_sbe_material_ids = m_acc.m_sbe_material_ids;
-        m_sbe_mat_order_ids = m_acc.m_sbe_mat_order_ids;
-        m_sbe_vol_fracs = m_acc.m_sbe_vol_fracs;
-        m_sbe_mset_vals = m_acc.m_sbe_mset_vals;
-        m_sbe_o2m_idx = m_acc.m_sbe_o2m_idx;
-        m_sbe_mass_fracs = m_acc.m_sbe_mass_fracs;
-        m_sbe_specset_o2m_idx = m_acc.m_sbe_specset_o2m_idx;
+        m_get_mat_id = other_matset_accessor.m_get_mat_id;
+        m_get_mat_order_id = other_matset_accessor.m_get_mat_order_id;
+        m_get_elem_id = other_matset_accessor.m_get_elem_id;
+        m_get_vol_frac = other_matset_accessor.m_get_vol_frac;
+        m_get_mset_val = other_matset_accessor.m_get_mset_val;
+        m_get_mass_frac = other_matset_accessor.m_get_mass_frac;
+        m_get_nmats_for_elem = other_matset_accessor.m_get_nmats_for_elem;
+        m_get_nelems_for_mat = other_matset_accessor.m_get_nelems_for_mat;
+        m_get_nspec_for_mat = other_matset_accessor.m_get_nspec_for_mat;
+        m_is_uni_buffer = other_matset_accessor.m_is_uni_buffer;
+        m_is_element_dominant = other_matset_accessor.m_is_element_dominant;
+        m_num_elems = other_matset_accessor.m_num_elems;
+        m_num_mats = other_matset_accessor.m_num_mats;
+        m_has_field = other_matset_accessor.m_has_field;
+        m_has_specset = other_matset_accessor.m_has_specset;
+        m_internal_data = other_matset_accessor.m_internal_data;
+        m_multi_vol_fracs = other_matset_accessor.m_multi_vol_fracs;
+        m_multi_mset_vals = other_matset_accessor.m_multi_mset_vals;
+        m_multi_mass_fracs = other_matset_accessor.m_multi_mass_fracs;
+        m_sbm_elem_ids = other_matset_accessor.m_sbm_elem_ids;
+        m_sbe_material_ids = other_matset_accessor.m_sbe_material_ids;
+        m_sbe_vol_fracs = other_matset_accessor.m_sbe_vol_fracs;
+        m_sbe_mset_vals = other_matset_accessor.m_sbe_mset_vals;
+        m_sbe_o2m_idx = other_matset_accessor.m_sbe_o2m_idx;
+        m_sbe_mass_fracs = other_matset_accessor.m_sbe_mass_fracs;
+        m_sbe_specset_o2m_idx = other_matset_accessor.m_sbe_specset_o2m_idx;
         rebind_internal_accessors();
     }
     return *this;
@@ -201,21 +197,21 @@ void
 MatsetAccessor::rebind_internal_accessors()
 {
     // Rebind accessors that point into Nodes owned by this accessor instance.
-    if (m_nmatspec.has_child("nmatspec"))
+    if (m_internal_data.has_child("nmatspec"))
     {
-        m_nmatspec_acc = m_nmatspec["nmatspec"].value();
+        m_internal_nmatspec = m_internal_data["nmatspec"].value();
     }
-    if (m_nmatspec.has_child("nmatspec_offsets"))
+    if (m_internal_data.has_child("nmatspec_offsets"))
     {
-        m_nmatspec_offsets_acc = m_nmatspec["nmatspec_offsets"].value();
+        m_internal_nmatspec_offsets = m_internal_data["nmatspec_offsets"].value();
     }
-    if (! m_multi_mat_idx_map.dtype().is_empty())
+    if (m_internal_data.has_child("multi_mat_idx_map"))
     {
-        m_multi_mat_idx_map_acc = m_multi_mat_idx_map.value();
+        m_internal_multi_mat_idx_map = m_internal_data["multi_mat_idx_map"].value();
     }
-    if (! m_sbe_mat_order_ids.dtype().is_empty())
+    if (m_internal_data.has_child("sbe_mat_order_ids"))
     {
-        m_sbe_mat_order_ids_acc = m_sbe_mat_order_ids.value();
+        m_internal_sbe_mat_order_ids = m_internal_data["sbe_mat_order_ids"].value();
     }
 }
 
@@ -278,8 +274,8 @@ MatsetAccessor::init(const Node &matset,
             // save material order ids
             //
             const index_t num_vol_fracs = matset["volume_fractions"].dtype().number_of_elements();
-            m_sbe_mat_order_ids.set(DataType::index_t(num_vol_fracs));
-            m_sbe_mat_order_ids_acc = m_sbe_mat_order_ids.value();
+            m_internal_data["sbe_mat_order_ids"].set(DataType::index_t(num_vol_fracs));
+            m_internal_sbe_mat_order_ids = m_internal_data["sbe_mat_order_ids"].value();
             // create a map from material id to material order id
             std::map<index_t, index_t> mat_id_to_order_id;
             for (index_t mat_idx = 0; mat_idx < m_num_mats; mat_idx ++)
@@ -292,7 +288,7 @@ MatsetAccessor::init(const Node &matset,
             {
                 const index_t mat_id = m_sbe_material_ids[vf_elem];
                 const index_t mat_order_id = mat_id_to_order_id.at(mat_id);
-                m_sbe_mat_order_ids_acc.set(vf_elem, mat_order_id);
+                m_internal_sbe_mat_order_ids.set(vf_elem, mat_order_id);
             }
 
             if (nullptr != field)
@@ -473,10 +469,10 @@ MatsetAccessor::init(const Node &matset,
                 // We pay a price at the start when creating these arrays, but we enable quick
                 // access of species mass fraction data.
 
-                m_nmatspec["nmatspec"].set(DataType::index_t(num_vol_fracs));
-                m_nmatspec_acc = m_nmatspec["nmatspec"].value();
-                m_nmatspec["nmatspec_offsets"].set(DataType::index_t(num_vol_fracs));
-                m_nmatspec_offsets_acc = m_nmatspec["nmatspec_offsets"].value();
+                m_internal_data["nmatspec"].set(DataType::index_t(num_vol_fracs));
+                m_internal_nmatspec = m_internal_data["nmatspec"].value();
+                m_internal_data["nmatspec_offsets"].set(DataType::index_t(num_vol_fracs));
+                m_internal_nmatspec_offsets = m_internal_data["nmatspec_offsets"].value();
 
                 // create a map from material id to nmatspec
                 std::map<index_t, index_t> mat_id_to_nmatspec;
@@ -506,8 +502,8 @@ MatsetAccessor::init(const Node &matset,
                         const index_t mat_id = m_sbe_material_ids[data_index];
                         const index_t nmatspec_for_mat = mat_id_to_nmatspec.at(mat_id);
 
-                        m_nmatspec_acc.set(data_index, nmatspec_for_mat);
-                        m_nmatspec_offsets_acc.set(data_index, nmatspec_offset);
+                        m_internal_nmatspec.set(data_index, nmatspec_for_mat);
+                        m_internal_nmatspec_offsets.set(data_index, nmatspec_offset);
                         nmatspec_offset += nmatspec_for_mat;
                     }
                 }
@@ -543,16 +539,16 @@ MatsetAccessor::init(const Node &matset,
         // we save an indirection array from material order id (the order materials appear
         // in the matset) to actual material id. Not all material sets are numbered from
         // 0 to N-1, so we must support this case.
-        m_multi_mat_idx_map.set(DataType::index_t(m_num_mats));
-        m_multi_mat_idx_map_acc = m_multi_mat_idx_map.value();
+        m_internal_data["multi_mat_idx_map"].set(DataType::index_t(m_num_mats));
+        m_internal_multi_mat_idx_map = m_internal_data["multi_mat_idx_map"].value();
 
         if (nullptr != specset)
         {
             // number of material species map
             // we save an array from the material order id (the order materials appear
             // in the matset) to the number of species for that material.
-            m_nmatspec["nmatspec"].set(DataType::index_t(m_num_mats));
-            m_nmatspec_acc = m_nmatspec["nmatspec"].value();
+            m_internal_data["nmatspec"].set(DataType::index_t(m_num_mats));
+            m_internal_nmatspec = m_internal_data["nmatspec"].value();
 
             // we save an additional offsets array so we can quickly get the index
             // of our desired species array since we are flattening:
@@ -570,8 +566,8 @@ MatsetAccessor::init(const Node &matset,
             //    [3, 2]
             // and the nmatspec offsets array is
             //    [0, 3]
-            m_nmatspec["nmatspec_offsets"].set(DataType::index_t(m_num_mats));
-            m_nmatspec_offsets_acc = m_nmatspec["nmatspec_offsets"].value();
+            m_internal_data["nmatspec_offsets"].set(DataType::index_t(m_num_mats));
+            m_internal_nmatspec_offsets = m_internal_data["nmatspec_offsets"].value();
         }
 
         index_t nmatspec_offset = 0;
@@ -586,7 +582,7 @@ MatsetAccessor::init(const Node &matset,
             const index_t mat_id = matmap_entry.to_index_t();
 
             // save material map entry
-            m_multi_mat_idx_map_acc.set(mat_idx, mat_id);
+            m_internal_multi_mat_idx_map.set(mat_idx, mat_id);
 
             // save volume fraction array
             m_multi_vol_fracs.push_back(matset["volume_fractions"][matname].value());
@@ -605,10 +601,10 @@ MatsetAccessor::init(const Node &matset,
                 {
                     nmatspec = (*specset)["matset_values"][matname].number_of_children();
                 }
-                m_nmatspec_acc.set(mat_idx, nmatspec);
+                m_internal_nmatspec.set(mat_idx, nmatspec);
 
                 // save nmatspec offset value
-                m_nmatspec_offsets_acc.set(mat_idx, nmatspec_offset);
+                m_internal_nmatspec_offsets.set(mat_idx, nmatspec_offset);
                 nmatspec_offset += nmatspec;
 
                 for (index_t spec_idx = 0; spec_idx < nmatspec; spec_idx ++)
@@ -672,7 +668,7 @@ index_t
 MatsetAccessor::get_full_mat_id(const index_t elem_idx, const index_t mat_idx) const
 {
     (void) elem_idx;
-    return m_multi_mat_idx_map_acc[mat_idx];
+    return m_internal_multi_mat_idx_map[mat_idx];
 }
 
 //-----------------------------------------------------------------------------
@@ -711,7 +707,7 @@ MatsetAccessor::get_full_mass_frac(const index_t elem_idx,
                                    const index_t mat_idx,
                                    const index_t spec_idx) const
 {
-    const index_t spec_data_index = m_nmatspec_offsets_acc[mat_idx] + spec_idx;
+    const index_t spec_data_index = m_internal_nmatspec_offsets[mat_idx] + spec_idx;
     return m_multi_mass_fracs[spec_data_index][elem_idx];
 }
 
@@ -720,7 +716,7 @@ index_t
 MatsetAccessor::get_full_nspec_for_mat(const index_t elem_idx, const index_t mat_idx) const
 {
     (void) elem_idx;
-    return m_nmatspec_acc[mat_idx];
+    return m_internal_nmatspec[mat_idx];
 }
 
 //-----------------------------------------------------------------------------
@@ -733,7 +729,7 @@ index_t
 MatsetAccessor::get_sbm_mat_id(const index_t elem_idx, const index_t mat_idx) const
 {
     (void) elem_idx;
-    return m_multi_mat_idx_map_acc[mat_idx];
+    return m_internal_multi_mat_idx_map[mat_idx];
 }
 
 //-----------------------------------------------------------------------------
@@ -771,7 +767,7 @@ MatsetAccessor::get_sbm_mass_frac(const index_t elem_idx,
                                   const index_t mat_idx,
                                   const index_t spec_idx) const
 {
-    const index_t spec_data_index = m_nmatspec_offsets_acc[mat_idx] + spec_idx;
+    const index_t spec_data_index = m_internal_nmatspec_offsets[mat_idx] + spec_idx;
     return m_multi_mass_fracs[spec_data_index][elem_idx];
 }
 
@@ -787,7 +783,7 @@ index_t
 MatsetAccessor::get_sbm_nspec_for_mat(const index_t elem_idx, const index_t mat_idx) const
 {
     (void) elem_idx;
-    return m_nmatspec_acc[mat_idx];
+    return m_internal_nmatspec[mat_idx];
 }
 
 //-----------------------------------------------------------------------------
@@ -808,7 +804,7 @@ index_t
 MatsetAccessor::get_sbe_mat_order_id(const index_t elem_idx, const index_t mat_idx) const
 {
     const index_t data_index = m_sbe_o2m_idx.index(elem_idx, mat_idx);
-    return m_sbe_mat_order_ids_acc[data_index];
+    return m_internal_sbe_mat_order_ids[data_index];
 }
 
 //-----------------------------------------------------------------------------
@@ -842,7 +838,7 @@ MatsetAccessor::get_sbe_mass_frac(const index_t elem_idx,
                                   const index_t spec_idx) const
 {
     const index_t data_index = m_sbe_o2m_idx.index(elem_idx, mat_idx);
-    const index_t nmatspec_offset = m_nmatspec_offsets_acc[data_index];
+    const index_t nmatspec_offset = m_internal_nmatspec_offsets[data_index];
 
     // We need an index that is between 0 and the number of species in this element.
     // The way to calculate this is to add out num material species offset
@@ -872,7 +868,7 @@ index_t
 MatsetAccessor::get_sbe_nspec_for_mat(const index_t elem_idx, const index_t mat_idx) const
 {
     const index_t data_index = m_sbe_o2m_idx.index(elem_idx, mat_idx);
-    return m_nmatspec_acc[data_index];
+    return m_internal_nmatspec[data_index];
 }
 
 //-----------------------------------------------------------------------------

src/libs/blueprint/conduit_blueprint_mesh_matset_accessor.hpp

@@ -353,24 +353,22 @@ using GetNMatSpecPtr     = index_t (MatsetAccessor::*)(index_t, index_t) const;
 
     // universal members
     // these are members that are useful for all layout types
-    Node m_nmatspec;
-    index_t_accessor m_nmatspec_acc;
-    index_t_accessor m_nmatspec_offsets_acc;
+    Node m_internal_data;
+    index_t_accessor m_internal_nmatspec; // points to internal data
+    index_t_accessor m_internal_nmatspec_offsets; // points to internal data
 
     // multi-buffer (full AND sparse by material) members
     std::vector<float64_accessor> m_multi_vol_fracs;
     std::vector<float64_accessor> m_multi_mset_vals;
-    Node m_multi_mat_idx_map; // multi-buffer material index map
-    index_t_accessor m_multi_mat_idx_map_acc;
+    index_t_accessor m_internal_multi_mat_idx_map; // points to internal data
     std::vector<float64_accessor> m_multi_mass_fracs;
 
     // multi-buffer material dominant (sparse by material) members
     std::vector<index_t_accessor> m_sbm_elem_ids;
 
     // uni-buffer element-dominant (sparse by element) members
     index_t_accessor m_sbe_material_ids;
-    Node m_sbe_mat_order_ids;
-    index_t_accessor m_sbe_mat_order_ids_acc;
+    index_t_accessor m_internal_sbe_mat_order_ids; // points to internal data
     float64_accessor m_sbe_vol_fracs;
     float64_accessor m_sbe_mset_vals;
     o2mrelation::O2MIndex m_sbe_o2m_idx;