Skip to content

Commit 1835a53

Browse files
committed
EXODUS: Update field-metadata test
1 parent 3cc8621 commit 1835a53

File tree

3 files changed

+22
-12
lines changed

3 files changed

+22
-12
lines changed

packages/seacas/libraries/exodus/test/testrd-field-metadata.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright(C) 1999-2024 National Technology & Engineering Solutions
2+
* Copyright(C) 1999-2025 National Technology & Engineering Solutions
33
* of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
44
* NTESS, the U.S. Government retains certain rights in this software.
55
*
@@ -290,9 +290,8 @@ int main(int argc, char **argv)
290290
}
291291
{
292292
int fld_cnt = ex_get_field_metadata_count(exoid, EX_ELEM_BLOCK, 11);
293-
assert(fld_cnt == 3);
294-
ex_field fields[3] = {{.entity_id = 11, .entity_type = EX_ELEM_BLOCK},
295-
{.entity_id = 11, .entity_type = EX_ELEM_BLOCK},
293+
assert(fld_cnt == 2);
294+
ex_field fields[2] = {{.entity_id = 11, .entity_type = EX_ELEM_BLOCK},
296295
{.entity_id = 11, .entity_type = EX_ELEM_BLOCK}};
297296
EXCHECK(ex_get_field_metadata(exoid, fields));
298297

@@ -303,15 +302,25 @@ int main(int argc, char **argv)
303302
}
304303
}
305304

305+
{
306+
int fld_cnt = ex_get_field_metadata_count(exoid, EX_ELEM_BLOCK, 12);
307+
assert(fld_cnt == 1);
308+
ex_field fields[1] = {{.entity_id = 12, .entity_type = EX_ELEM_BLOCK}};
309+
EXCHECK(ex_get_field_metadata(exoid, fields));
310+
311+
for (int i = 0; i < fld_cnt; i++) {
312+
get_field_cardinality(&fields[i], basis, bas_cnt, quad, quad_cnt);
313+
print_field_metadata(&fields[i]);
314+
print_full_field_names(&fields[i]);
315+
}
316+
}
317+
306318
// Now, deallocate any memory allocated on the `basis` struct.
307319
EXCHECK(ex_initialize_basis_struct(basis, bas_cnt, -1));
308320
EXCHECK(ex_initialize_quadrature_struct(quad, quad_cnt, -1));
309321
free(basis);
310322
free(quad);
311323

312-
int fld_cnt = ex_get_field_metadata_count(exoid, EX_ELEM_BLOCK, 12);
313-
assert(fld_cnt == 0);
314-
315324
int error = ex_close(exoid);
316325
printf("\nafter ex_close, error = %3d\n", error);
317326
return 0;

packages/seacas/libraries/exodus/test/testrd-field-metadata.dmp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ Field Metadata: Name: `Curl`, Nesting: 1
105105
Component 6, Full name = Curl@5
106106
Component 7, Full name = Curl@6
107107
Component 8, Full name = Curl@7
108+
after ex_get_field_metadata(exoid, fields), error = 0
108109

109110
Field Metadata: Name: `Species`, Nesting: 2
110111
Nesting level: 0, Type: EX_FIELD_TYPE_USER_DEFINED, Cardinality: 4, Separator: "_"

packages/seacas/libraries/exodus/test/testwt-field-metadata.dmp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
connect2:Field@Gradient@separator = "-$" ;
2424
connect2:Field@Gradient@type = 8, 3 ;
2525
connect2:Field@Gradient@type_name = ",HGRAD_QUAD_C2_FEM" ;
26-
connect2:Field@Species@cardinality = 4, 0 ;
27-
connect2:Field@Species@separator = "_-" ;
28-
connect2:Field@Species@suffices = "h2o,gas,ch4,methane" ;
29-
connect2:Field@Species@type = 1, 4 ;
30-
connect2:Field@Species@type_name = ",1x2x1" ;
26+
connect3:Field@Species@cardinality = 4, 0 ;
27+
connect3:Field@Species@separator = "_-" ;
28+
connect3:Field@Species@suffices = "h2o,gas,ch4,methane" ;
29+
connect3:Field@Species@type = 1, 4 ;
30+
connect3:Field@Species@type_name = ",1x2x1" ;
3131
coor_names:Field@Disp@separator = "" ;
3232
coor_names:Field@Disp@type = 8 ;
3333
coor_names:Field@Velocity@separator = "%" ;

0 commit comments

Comments
 (0)