banned

Author: JustinPrivitera

src/libs/blueprint/conduit_blueprint_mesh.cpp

@@ -6694,7 +6694,9 @@ mesh::matset::verify(const Node &matset,
 
                 if(mat.dtype().is_object())
                 {
-                    vfs_res &= verify_o2mrelation_field(protocol, vfs, vfs_info, mat_name);
+                    log::error(info, protocol,
+                        "material volume fractions must be a scalar array, not an object with children");
+                    res &= false;
                 }
                 else
                 {
@@ -6723,24 +6725,24 @@ mesh::matset::verify(const Node &matset,
 
         res &= verify_matset_material_map(protocol,matset,info);
 
-        // for cases where vfs are an object, we expect the material_map child
-        // names to be a subset of the volume_fractions child names
+        // for cases where vfs are an object, we expect the volume_fractions child
+        // names to be a subset of the material_map child names
         if(matset.has_child("volume_fractions") &&
            matset["volume_fractions"].dtype().is_object())
         {
-            NodeConstIterator itr =  matset["material_map"].children();
+            NodeConstIterator itr =  matset["volume_fractions"].children();
             while(itr.has_next())
             {
                 itr.next();
                 std::string curr_name = itr.name();
-                if(!matset["volume_fractions"].has_child(curr_name))
+                if(!matset["material_map"].has_child(curr_name))
                 {
                     std::ostringstream oss;
-                    oss << "'material_map' hierarchy must be a subset of "
-                           "'volume_fractions'. "
-                           " 'volume_fractions' is missing child '"
+                    oss << "'volume_fractions' material names must be a subset of "
+                           "'material_map'. "
+                           " 'material_map' is missing child '"
                            << curr_name
-                           <<"' which exists in 'material_map`" ;
+                           <<"' which exists in 'volume_fractions`" ;
                     log::error(info, protocol,oss.str());
                     res &= false;
                 }

src/tests/blueprint/t_blueprint_mesh_verify.cpp

@@ -1107,28 +1107,14 @@ TEST(conduit_blueprint_mesh_verify, matset_general)
                 n.reset();
                 n["topology"].set("mesh");
 
-                n["volume_fractions"]["m1"]["values"].set(DataType::float64(8));
-                n["volume_fractions"]["m1"]["indices"].set(DataType::uint32(5));
+                n["volume_fractions"]["m1"].set(DataType::float64(8));
                 CHECK_MESH(verify_matset,n,info,true);
                 CHECK_MATSET(n,is_multi_buffer,is_element_dominant);
 
-                n["volume_fractions"]["m2"]["indices"].set(DataType::uint32(5));
-                CHECK_MESH(verify_matset,n,info,false);
-                n["volume_fractions"]["m2"]["values"].set(DataType::float64(10));
-                CHECK_MESH(verify_matset,n,info,true);
-                CHECK_MATSET(n,is_multi_buffer,is_element_dominant);
-
-                n["volume_fractions"]["m3"]["sizes"].set(DataType::uint32(3));
-                n["volume_fractions"]["m3"]["values"].set(DataType::float64(30));
+                n["volume_fractions"]["m4"]["indices"].set(DataType::uint32(5));
                 CHECK_MESH(verify_matset,n,info,false);
-                n["volume_fractions"]["m3"]["offsets"].set(DataType::uint32(3));
-                CHECK_MESH(verify_matset,n,info,true);
-                CHECK_MATSET(n,is_multi_buffer,is_element_dominant);
-
                 n["volume_fractions"]["m4"]["test"]["values"].set(DataType::uint32(3));
                 CHECK_MESH(verify_matset,n,info,false);
-                n["volume_fractions"]["m4"]["indices"].set(DataType::uint32(5));
-                CHECK_MESH(verify_matset,n,info,false);
 
                 // make sure we are in good shape for opt material_map checks
                 n["volume_fractions"].remove("m4");
@@ -1143,6 +1129,7 @@ TEST(conduit_blueprint_mesh_verify, matset_general)
                 n["material_map/m1"] = 0;
                 n["material_map/m2"] = 1;
                 n["material_map/m3"] = 2;
+                n["material_map/m4"] = 4;
 
                 CHECK_MESH(verify_matset,n,info,true);
 
@@ -1162,23 +1149,6 @@ TEST(conduit_blueprint_mesh_verify, matset_general)
                 n["material_map/m2"] = "bananas";
                 n["material_map/m3"] = "mangoes";
                 CHECK_MESH(verify_matset,n,info,false);
-
-                // material_map ents don't match vfs
-                // (more mat map ents than vfs)
-                n["material_map"].reset();
-                n["material_map/m1"] = 0;
-                n["material_map/m2"] = 1;
-                n["material_map/m3"] = 2;
-                n["material_map/m4"] = 4;
-
-                CHECK_MESH(verify_matset,n,info,false);
-
-                // material_map ents are subset of vfs
-                // (should be true)
-                n["material_map"].reset();
-                n["material_map/m1"] = 0;
-                n["material_map/m3"] = 2;
-                CHECK_MESH(verify_matset,n,info,true);
             }
 
             { // Element ID Tests //