From bff2adcf00d164eea3b9ad6afd18ac2cdca259b3 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 May 2024 17:54:21 -0600 Subject: [PATCH] EXODUS: Reorder unit test and update output --- .../exodus/test/testrd-field-metadata.c | 54 +++++++++---------- .../exodus/test/testrd-field-metadata.dmp | 53 +++++++++--------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/packages/seacas/libraries/exodus/test/testrd-field-metadata.c b/packages/seacas/libraries/exodus/test/testrd-field-metadata.c index ff8af2dbf5..3be0aec4c0 100644 --- a/packages/seacas/libraries/exodus/test/testrd-field-metadata.c +++ b/packages/seacas/libraries/exodus/test/testrd-field-metadata.c @@ -239,33 +239,6 @@ int main(int argc, char **argv) exit(1); } - /* Check for nodal fields... */ - { - int fld_cnt = ex_get_field_metadata_count(exoid, EX_NODAL, 0); - assert(fld_cnt == 2); - ex_field fields[2] = {{.entity_type = EX_NODAL}, {.entity_type = EX_NODAL}}; - EXCHECK(ex_get_field_metadata(exoid, fields)); - - for (int i = 0; i < fld_cnt; i++) { - get_field_cardinality(&fields[i], NULL, 0, NULL, 0); - print_field_metadata(&fields[i]); - print_full_field_names(&fields[i]); - } - } - - { - int fld_cnt = ex_get_field_metadata_count(exoid, EX_ELEM_BLOCK, 10); - assert(fld_cnt == 2); - ex_field fields[2] = {{.entity_id = 10, .entity_type = EX_ELEM_BLOCK}, - {.entity_id = 10, .entity_type = EX_ELEM_BLOCK}}; - EXCHECK(ex_get_field_metadata(exoid, fields)); - - for (int i = 0; i < fld_cnt; i++) { - get_field_cardinality(&fields[i], NULL, 0, NULL, 0); - print_field_metadata(&fields[i]); - print_full_field_names(&fields[i]); - } - } // ------------------------------------------------------------------------ int quad_cnt = ex_get_quadrature_metadata_count(exoid); assert(quad_cnt == 2); @@ -294,6 +267,33 @@ int main(int argc, char **argv) EXCHECK(ex_get_basis_metadata(exoid, basis, bas_cnt)); print_basis_metadata(basis, 2); + /* Check for nodal fields... */ + { + int fld_cnt = ex_get_field_metadata_count(exoid, EX_NODAL, 0); + assert(fld_cnt == 2); + ex_field fields[2] = {{.entity_type = EX_NODAL}, {.entity_type = EX_NODAL}}; + EXCHECK(ex_get_field_metadata(exoid, fields)); + + for (int i = 0; i < fld_cnt; i++) { + get_field_cardinality(&fields[i], NULL, 0, NULL, 0); + print_field_metadata(&fields[i]); + print_full_field_names(&fields[i]); + } + } + + { + int fld_cnt = ex_get_field_metadata_count(exoid, EX_ELEM_BLOCK, 10); + assert(fld_cnt == 2); + ex_field fields[2] = {{.entity_id = 10, .entity_type = EX_ELEM_BLOCK}, + {.entity_id = 10, .entity_type = EX_ELEM_BLOCK}}; + EXCHECK(ex_get_field_metadata(exoid, fields)); + + for (int i = 0; i < fld_cnt; i++) { + get_field_cardinality(&fields[i], NULL, 0, NULL, 0); + print_field_metadata(&fields[i]); + print_full_field_names(&fields[i]); + } + } { int fld_cnt = ex_get_field_metadata_count(exoid, EX_ELEM_BLOCK, 11); assert(fld_cnt == 3); diff --git a/packages/seacas/libraries/exodus/test/testrd-field-metadata.dmp b/packages/seacas/libraries/exodus/test/testrd-field-metadata.dmp index 891b83ff6b..eb19e2a65c 100644 --- a/packages/seacas/libraries/exodus/test/testrd-field-metadata.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-field-metadata.dmp @@ -1,31 +1,5 @@ after ex_open -after ex_get_field_metadata(exoid, fields), error = 0 - -Field Metadata: Name: `Disp`, Nesting: 1 - Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: " " - Component 1, Full name = DispX - Component 2, Full name = DispY - Component 3, Full name = DispZ - -Field Metadata: Name: `Velocity`, Nesting: 1 - Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: "%" - Component 1, Full name = Velocity%X - Component 2, Full name = Velocity%Y - Component 3, Full name = Velocity%Z -after ex_get_field_metadata(exoid, fields), error = 0 - -Field Metadata: Name: `Disp`, Nesting: 1 - Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: " " - Component 1, Full name = DispX - Component 2, Full name = DispY - Component 3, Full name = DispZ - -Field Metadata: Name: `Velocity`, Nesting: 1 - Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: "%" - Component 1, Full name = Velocity%X - Component 2, Full name = Velocity%Y - Component 3, Full name = Velocity%Z after ex_initialize_quadrature_struct(quad, quad_cnt, 0), error = 0 after ex_get_quadrature_metadata(exoid, quad, quad_cnt), error = 0 after ex_initialize_quadrature_struct(quad, quad_cnt, 1), error = 0 @@ -70,6 +44,32 @@ ordinal, subc: _dim _ordinal _dof_ordinal _num_dof xi eta zeta 2 0 2 0 1 1.000 1.000 1.000 after ex_get_field_metadata(exoid, fields), error = 0 +Field Metadata: Name: `Disp`, Nesting: 1 + Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: " " + Component 1, Full name = DispX + Component 2, Full name = DispY + Component 3, Full name = DispZ + +Field Metadata: Name: `Velocity`, Nesting: 1 + Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: "%" + Component 1, Full name = Velocity%X + Component 2, Full name = Velocity%Y + Component 3, Full name = Velocity%Z +after ex_get_field_metadata(exoid, fields), error = 0 + +Field Metadata: Name: `Disp`, Nesting: 1 + Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: " " + Component 1, Full name = DispX + Component 2, Full name = DispY + Component 3, Full name = DispZ + +Field Metadata: Name: `Velocity`, Nesting: 1 + Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: "%" + Component 1, Full name = Velocity%X + Component 2, Full name = Velocity%Y + Component 3, Full name = Velocity%Z +after ex_get_field_metadata(exoid, fields), error = 0 + Field Metadata: Name: `Gradient`, Nesting: 2 Nesting level: 0, Type: EX_VECTOR_3D, Cardinality: 3, Separator: "-" Nesting level: 1, Type: EX_BASIS (HGRAD_QUAD_C2_FEM), Cardinality: 9, Separator: "$" @@ -126,5 +126,6 @@ Field Metadata: Name: `Species`, Nesting: 2 Component 3 2, Full name = Species_ch4-1 Component 4 2, Full name = Species_methane-1 after ex_initialize_basis_struct(basis, bas_cnt, -1), error = 0 +after ex_initialize_quadrature_struct(quad, quad_cnt, -1), error = 0 after ex_close, error = 0