diff --git a/packages/seacas/libraries/exodus/test/testall.in b/packages/seacas/libraries/exodus/test/testall.in index 889cf15434..aae1e4a0a5 100755 --- a/packages/seacas/libraries/exodus/test/testall.in +++ b/packages/seacas/libraries/exodus/test/testall.in @@ -357,7 +357,7 @@ echo "begin testwt-field-metadata" >> test.output ${PREFIX} ${BINDIR}/testwt-field-metadata${SUFFIX} >> test.output ret_status=$((ret_status+$?)) # Filter out the "maximum_name_length" attribute. Moves around in ncdump output for nc4 vs nc3 -${NCDUMP} -d5,5 test-field-metadata.exo | grep @ |sort | ${DIFF} - ${SRCDIR}/testwt-field-metadata.dmp | tee testwt-field-metadata.res +${NCDUMP} -d5,5 test-field-metadata.exo | grep @ |sort -bdf | ${DIFF} - ${SRCDIR}/testwt-field-metadata.dmp | tee testwt-field-metadata.res ret_status=$((ret_status+${PIPESTATUS[0]}+${PIPESTATUS[3]})) echo "end testwt-field-metadata, status = $ret_status" >> test.output diff --git a/packages/seacas/libraries/exodus/test/testwt-field-metadata.dmp b/packages/seacas/libraries/exodus/test/testwt-field-metadata.dmp index 37e75ddeb6..9f353a79fa 100644 --- a/packages/seacas/libraries/exodus/test/testwt-field-metadata.dmp +++ b/packages/seacas/libraries/exodus/test/testwt-field-metadata.dmp @@ -13,16 +13,6 @@ :Basis@TESTING_SECOND_BASIS@subc_ordinal = 0, 1, 2 ; :Basis@TESTING_SECOND_BASIS@xi = -1., 1., 1. ; :Basis@TESTING_SECOND_BASIS@zeta = 1., -1., 1. ; - :Quad@1x2x1@cardinality = 2 ; - :Quad@1x2x1@eta = 0.5, -0.5 ; - :Quad@1x2x1@weight = 1., 1. ; - :Quad@1x2x1@xi = -0.5, 0.5 ; - :Quad@1x2x1@zeta = -0.5, 0.5 ; - :Quad@2x2x2@cardinality = 8 ; - :Quad@2x2x2@eta = -0.57735, -0.57735, 0.57735, 0.57735, -0.57735, -0.57735, 0.57735, 0.57735 ; - :Quad@2x2x2@weight = 1., 1., 1., 1., 1., 1., 1., 1. ; - :Quad@2x2x2@xi = -0.57735, 0.57735, -0.57735, 0.57735, -0.57735, 0.57735, -0.57735, 0.57735 ; - :Quad@2x2x2@zeta = -0.57735, -0.57735, -0.57735, -0.57735, 0.57735, 0.57735, 0.57735, 0.57735 ; connect1:Field@Disp@separator = "" ; connect1:Field@Disp@type = 8 ; connect1:Field@Velocity@separator = "%" ; @@ -50,3 +40,13 @@ "Curl@6", "Curl@7", "Curl@8", + :Quad@1x2x1@cardinality = 2 ; + :Quad@1x2x1@eta = 0.5, -0.5 ; + :Quad@1x2x1@weight = 1., 1. ; + :Quad@1x2x1@xi = -0.5, 0.5 ; + :Quad@1x2x1@zeta = -0.5, 0.5 ; + :Quad@2x2x2@cardinality = 8 ; + :Quad@2x2x2@eta = -0.57735, -0.57735, 0.57735, 0.57735, -0.57735, -0.57735, 0.57735, 0.57735 ; + :Quad@2x2x2@weight = 1., 1., 1., 1., 1., 1., 1., 1. ; + :Quad@2x2x2@xi = -0.57735, 0.57735, -0.57735, 0.57735, -0.57735, 0.57735, -0.57735, 0.57735 ; + :Quad@2x2x2@zeta = -0.57735, -0.57735, -0.57735, -0.57735, 0.57735, 0.57735, 0.57735, 0.57735 ;