diff --git a/packages/seacas/applications/exodiff/exoII_read.C b/packages/seacas/applications/exodiff/exoII_read.C index b55bd3ec70..ba97684ac0 100644 --- a/packages/seacas/applications/exodiff/exoII_read.C +++ b/packages/seacas/applications/exodiff/exoII_read.C @@ -965,6 +965,7 @@ template void ExoII_Read::Get_Init_Data() num_side_sets = info.num_side_sets; num_edge_blocks = info.num_edge_blk; num_face_blocks = info.num_face_blk; + num_assemblies = info.num_assembly; title = info.title; if (err > 0 && !interFace.quiet_flag) { diff --git a/packages/seacas/applications/exodiff/exoII_read.h b/packages/seacas/applications/exodiff/exoII_read.h index 3cef8ec061..31038805b8 100644 --- a/packages/seacas/applications/exodiff/exoII_read.h +++ b/packages/seacas/applications/exodiff/exoII_read.h @@ -60,6 +60,7 @@ template class ExoII_Read size_t Num_Elements() const { return num_elmts; } size_t Num_Faces() const { return num_faces; } size_t Num_Edges() const { return num_edges; } + size_t Num_Assemblies() const { return num_assemblies; } size_t Num_Node_Sets() const { return num_node_sets; } size_t Num_Side_Sets() const { return num_side_sets; } size_t Num_Edge_Blocks() const { return num_edge_blocks; } @@ -204,6 +205,7 @@ template class ExoII_Read size_t num_side_sets{0}; size_t num_edge_blocks{0}; size_t num_face_blocks{0}; + size_t num_assemblies{0}; float db_version{0.0}; float api_version{0.0}; int io_word_size{0}; // Note: The "compute word size" is always 8. diff --git a/packages/seacas/applications/exodiff/exodiff.C b/packages/seacas/applications/exodiff/exodiff.C index 6398c0d50f..7342fc84c9 100644 --- a/packages/seacas/applications/exodiff/exodiff.C +++ b/packages/seacas/applications/exodiff/exodiff.C @@ -56,15 +56,15 @@ struct TimeInterp std::string Date() { - time_t calendar_time = time(nullptr); + time_t calendar_time = time(nullptr); #if defined __NVCC__ char tbuf[32]; - struct tm *local_time = localtime(&calendar_time); + struct tm *local_time = localtime(&calendar_time); strftime(tbuf, 32, "%Y/%m/%d %H:%M:%S %Z", local_time); std::string time_string(tbuf); #else - auto const local_time = fmt::localtime(calendar_time); - auto time_string = fmt::format("{:%Y/%m/%d %H:%M:%S %Z}", local_time); + auto const local_time = fmt::localtime(calendar_time); + auto time_string = fmt::format("{:%Y/%m/%d %H:%M:%S %Z}", local_time); #endif return time_string; } @@ -300,7 +300,7 @@ namespace { "{0} Title: {2}\n" "{0} Dim = {3}, Nodes = {5}, Elements = {6}, Faces = {20}, Edges = {21}\n" "{0} Element Blocks = {4}, Face Blocks = {10}, Edge Blocks = {9}, Nodesets = {7}, " - "Sidesets = {8}\n" + "Sidesets = {8}, Assemblies = {22}\n" "{0} Vars: Global = {11}, Nodal = {12}, Element = {13}, Face = {17}, Edge = {18}, " "Nodeset = {14}, Sideset = {15}, Times = {16}\n\n", prefix, fi.realpath(), file.Title(), file.Dimension(), file.Num_Element_Blocks(), @@ -308,7 +308,7 @@ namespace { file.Num_Edge_Blocks(), file.Num_Face_Blocks(), file.Num_Global_Vars(), file.Num_Nodal_Vars(), file.Num_Element_Vars(), file.Num_NS_Vars(), file.Num_SS_Vars(), file.Num_Times(), file.Num_FB_Vars(), file.Num_EB_Vars(), count, file.Num_Faces(), - file.Num_Edges()); + file.Num_Edges(), file.Num_Assemblies()); } void initialize(std::vector &mm_entity, size_t size, const ToleranceType &ttype) diff --git a/packages/seacas/applications/exodiff/map.C b/packages/seacas/applications/exodiff/map.C index 2c29f7d4a1..297ba7057d 100644 --- a/packages/seacas/applications/exodiff/map.C +++ b/packages/seacas/applications/exodiff/map.C @@ -619,7 +619,7 @@ namespace { } else { Error(fmt::format("Unable to match {0} {1} in first file with {0} in second file.\n", type, - file1_id_map[id1[i]])); + fmt::group_digits(file1_id_map[id1[i]]))); } }