From 3cfeae1b4f2db74979b0631299c0013b16e4dc4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 17:08:57 -0600 Subject: [PATCH 01/11] Bump sphinx from 8.1.1 to 8.1.3 in /cmake/tribits/doc/sphinx (#523) Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 8.1.1 to 8.1.3. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v8.1.1...v8.1.3) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cmake/tribits/doc/sphinx/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/tribits/doc/sphinx/requirements.txt b/cmake/tribits/doc/sphinx/requirements.txt index afb53d606a..bfbfd38692 100644 --- a/cmake/tribits/doc/sphinx/requirements.txt +++ b/cmake/tribits/doc/sphinx/requirements.txt @@ -1,2 +1,2 @@ -Sphinx==8.1.1 +Sphinx==8.1.3 sphinx-rtd-theme==3.0.1 From c76d9b46f598113439849214e2edbaa73cbc719a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 17:09:10 -0600 Subject: [PATCH 02/11] Bump github/codeql-action from 3.26.12 to 3.26.13 (#524) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.12 to 3.26.13. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/c36620d31ac7c881962c3d9dd939c40ec9434f2b...f779452ac5af1c261dce0346a8f964149f49322b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index df6b0a1a63..ad8ec69445 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,7 +50,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 + uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -60,7 +60,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 + uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -73,6 +73,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 + uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index efc95c8739..aee178c8d3 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -71,6 +71,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 + uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 with: sarif_file: results.sarif From a967b6124a9bd5a1a15fd80a68120238a88c0900 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 17:09:33 -0600 Subject: [PATCH 03/11] Bump ubuntu from `b359f10` to `ab64a83` in /docker/seacas (#525) Bumps ubuntu from `b359f10` to `ab64a83`. --- updated-dependencies: - dependency-name: ubuntu dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Greg Sjaardema --- docker/seacas/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/seacas/Dockerfile b/docker/seacas/Dockerfile index 43798cd953..3610a7c43f 100644 --- a/docker/seacas/Dockerfile +++ b/docker/seacas/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:24.04@sha256:b359f1067efa76f37863778f7b6d0e8d911e3ee8efa807ad01fbf5dc1ef9006b +FROM ubuntu:24.04@sha256:ab64a8382e935382638764d8719362bb50ee418d944c1f3d26e0c99fae49a345 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install --no-install-recommends -y \ From 35af4cbfa7589dd22ba434c608d399b8a79998ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 17:09:44 -0600 Subject: [PATCH 04/11] Bump ubuntu from `b359f10` to `ab64a83` in /docker/exodus (#526) Bumps ubuntu from `b359f10` to `ab64a83`. --- updated-dependencies: - dependency-name: ubuntu dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker/exodus/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/exodus/Dockerfile b/docker/exodus/Dockerfile index ac54ec9228..e5a85a6842 100644 --- a/docker/exodus/Dockerfile +++ b/docker/exodus/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:24.04@sha256:b359f1067efa76f37863778f7b6d0e8d911e3ee8efa807ad01fbf5dc1ef9006b +FROM ubuntu:24.04@sha256:ab64a8382e935382638764d8719362bb50ee418d944c1f3d26e0c99fae49a345 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install --no-install-recommends -y \ From 266e1fcb8c411df7629628caa425a8d0c5411fc3 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 15 Oct 2024 14:08:14 -0600 Subject: [PATCH 05/11] CI: Add harden runner to clang-format --- .github/workflows/clang-format.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index b7ca3cd126..64457d9e88 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -29,6 +29,11 @@ jobs: permissions: contents: write # In order to allow EndBug/add-and-commit to commit changes steps: + - name: Harden Runner + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 + with: + egress-policy: audit + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - name: Fix C++ and C formatting issues detected by clang-format From 48b283256b80102b5ca26eb74afab6ef5b6727c2 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 16 Oct 2024 07:56:14 -0600 Subject: [PATCH 06/11] CI: Try different trailing whitespace [ci skip] --- .github/workflows/trailing.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/trailing.yml b/.github/workflows/trailing.yml index 61a71ff42b..de1108494a 100644 --- a/.github/workflows/trailing.yml +++ b/.github/workflows/trailing.yml @@ -13,4 +13,14 @@ jobs: egress-policy: audit - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - - uses: harupy/find-trailing-whitespace@56310d70ae8fd21afec8d4307d2d9ab6c15e7c5d # master + - name: Find Trailing Whitespace + run: | + set +e + lines=$(git grep --cached -In '[[:blank:]]$') + if [ ! -z "$lines" ]; then + echo -e "\n The following lines contain trailing whitespace: \n" + echo -e "${lines}" + echo -e "\nFailed.\n" + exit 1 + fi + exit 0 \ No newline at end of file From 295b2bd4252ee34a1d53ca897573e981250eea18 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 16 Oct 2024 08:25:29 -0600 Subject: [PATCH 07/11] Delete trailing whitespace --- .../seacas/applications/aprepro/test.inp_app | 6 +- .../applications/aprepro/test_standard.out | 48 +-- packages/seacas/applications/blot/grpcom.blk | 4 +- packages/seacas/applications/blot/mshcol.f | 4 +- .../seacas/applications/conjoin/Conjoin.C | 3 + .../seacas/applications/explore/exp_comand.f | 2 +- .../seacas/applications/explore/exp_dbsbel.f | 4 +- .../seacas/applications/explore/exp_preb1.f | 8 +- .../seacas/applications/explore/exp_prelem.f | 4 +- .../seacas/applications/explore/exp_rmixint.f | 4 +- .../seacas/applications/gjoin/gj_munnps.f | 4 +- .../seacas/applications/grepos/gp_attrot.blk | 4 +- .../seacas/applications/grepos/gp_mapvar.f | 2 +- .../seacas/applications/mapvar-kd/mapvar-kd.f | 4 +- packages/seacas/applications/mapvar/mapvar.f | 4 +- .../applications/numbers/nu_multi_cavity.f | 8 +- .../libraries/aprepro_lib/CMakeLists.txt | 2 +- .../seacas/libraries/aprepro_lib/aprepro.ll | 4 +- .../seacas/libraries/aprepro_lib/test.inp_app | 6 +- .../libraries/aprepro_lib/test_standard.out | 48 +-- .../libraries/exoIIv2for32/test/testrd.dmp | 122 +++---- .../libraries/exoIIv2for32/test/testrdd.dmp | 122 +++---- .../exoIIv2for32/test/testrddi64.dmp | 122 +++---- .../libraries/exodus/include/exodusII.h | 10 +- packages/seacas/libraries/exodus/test/makedmp | 11 +- .../seacas/libraries/exodus/test/testall.in1 | 4 +- .../libraries/exodus/test/testrd-assembly.dmp | 8 +- .../libraries/exodus/test/testrd-blob.dmp | 6 +- .../exodus/test/testrd-long-name.dmp | 54 +-- .../libraries/exodus/test/testrd-nfaced.dmp | 42 +-- .../libraries/exodus/test/testrd-nm32.dmp | 54 +-- .../libraries/exodus/test/testrd-nsided.dmp | 68 ++-- .../libraries/exodus/test/testrd-oned.dmp | 56 +-- .../seacas/libraries/exodus/test/testrd.dmp | 54 +-- .../seacas/libraries/exodus/test/testrd1.dmp | 128 +++---- .../libraries/exodus/test/testrd_nc.dmp | 54 +-- .../libraries/exodus/test/testrd_ss.dmp | 16 +- .../libraries/exodus/test/testrd_zeroe.dmp | 24 +- .../libraries/exodus/test/testrd_zeron.dmp | 6 +- .../seacas/libraries/exodus/test/testrdd.dmp | 50 +-- .../libraries/exodus/test/testwt-blob.dmp | 48 +-- .../libraries/exodus/test/update_all_tests | 16 +- .../libraries/exodus_for/src/addrwrap.F | 4 +- .../libraries/exodus_for/test/test-nsided.dmp | 12 +- .../seacas/libraries/exodus_for/test/test.dmp | 62 ++-- .../libraries/exodus_for/test/test1.dmp | 84 ++--- .../libraries/exodus_for/test/test2-1.dmp | 62 ++-- .../libraries/exodus_for/test/test2-2.dmp | 62 ++-- .../libraries/exodus_for/test/testcp_ss.dmp | 6 +- .../libraries/exodus_for/test/testcpnl.dmp | 6 +- .../libraries/exodus_for/test/testpart.f90 | 2 +- .../libraries/exodus_for/test/testrd.dmp | 122 +++---- .../libraries/exodus_for/test/testrd1.dmp | 92 ++--- .../libraries/exodus_for/test/testrd_nsid.dmp | 14 +- .../libraries/exodus_for/test/testrdd.dmp | 80 ++--- .../ioss/src/Ioss_BasisVariableType.h | 10 +- .../seacas/libraries/ioss/src/Ioss_Doxygen.h | 16 +- ...actoriAppendLocationAttributesOperation.py | 6 +- .../Operation/PhactoriCSVExportOperation.py | 4 +- .../Operation/PhactoriCalculatorOperation.py | 4 +- .../Operation/PhactoriCellEdgeAngleMetrics.py | 6 +- .../Operation/PhactoriCellSizeOperation.py | 4 +- .../PhactoriDataArtifactMetaDataControl.py | 7 +- .../PhactoriExtractBlockOperation.py | 6 +- .../PhactoriExtractComponentOperation.py | 4 +- .../PhactoriExtractStructuredMultiBlock.py | 26 +- .../Operation/PhactoriFindCellEdgeLengths.py | 4 +- .../Operation/PhactoriFollowSurfaceSide1.py | 8 +- .../PhactoriGeometricCellSampler1.py | 20 +- .../Operation/PhactoriGlyphOperation.py | 4 +- .../Operation/PhactoriGroupOperation.py | 4 +- .../PhactoriIntegrateVariablesOperation.py | 4 +- .../PhactoriMarkCellSurfaceStatus2.py | 4 +- .../Operation/PhactoriMpiUtilities.py | 4 +- .../Operation/PhactoriOperationBlock.py | 12 +- .../PhactoriParallelGeometryUtilities.py | 2 +- .../PhactoriParaviewMultiBlockRecursion.py | 4 +- .../PhactoriPointSourceFromJsonList.py | 5 +- .../PhactoriPointSourceGeometrySampler1.py | 7 +- .../PhactoriPointSourceNearbyCorrelator.py | 12 +- .../Operation/PhactoriRepresentationBlock.py | 5 +- .../Operation/PhactoriResampleWithDataset.py | 6 +- .../Operation/PhactoriSampledCellInfo.py | 8 +- .../Operation/PhactoriSegmentCellSampler3.py | 24 +- .../PhactoriSliceWithPlaneOperation.py | 5 +- .../PhactoriStreamTracerOperation.py | 8 +- ...PhactoriStreamTracerSeedSourceOperation.py | 6 +- .../PhactoriStructuredGridSampler.py | 7 +- .../Operation/PhactoriThresholdOperation.py | 5 +- .../Operation/PhactoriVtkCellOperations.py | 14 +- .../Operation/test_PhactoriCameraBlock.py | 7 +- ...est_PhactoriCreateSegmentsNormalToCells.py | 14 +- .../test_PhactoriGeometricCellSampler1.py | 6 +- .../test_PhactoriPointSourceFromJsonList.py | 10 +- .../Operation/test_PhactoriSegment.py | 6 +- .../test_PhactoriSegmentCellSampler3.py | 26 +- .../test_PhactoriVtkCellOperations.py | 14 +- .../phactori/PhactoriCombineToOneFile.py | 6 +- .../catalyst/phactori/PhactoriDriver.py | 336 +++++++++--------- .../phactori/PhactoriDriver_modular.py | 24 +- .../catalyst/phactori/phactori.py | 168 +++++---- 101 files changed, 1362 insertions(+), 1386 deletions(-) diff --git a/packages/seacas/applications/aprepro/test.inp_app b/packages/seacas/applications/aprepro/test.inp_app index e89ca173fb..e31d49fc29 100644 --- a/packages/seacas/applications/aprepro/test.inp_app +++ b/packages/seacas/applications/aprepro/test.inp_app @@ -180,7 +180,7 @@ $ Test int and [] (shortcut for int) $ Test looping - print sin, cos from 0 to 90 by 5 {Loop(19, _angle, 0, 5)} -{_angle} {_sa=sind(_angle)} {_ca=cosd(_angle)} {hypot(_sa, _ca)} +{_angle} {_sa=sind(_angle)} {_ca=cosd(_angle)} {hypot(_sa, _ca)} {EndLoop} $$$$ Test formatting and string concatenation @@ -200,12 +200,12 @@ $$$$ Test string rescanning and executing Original String: {Test} Rescanned String: -{rescan(Test)} +{rescan(Test)} Original String: {Test2} Print Value of variable T = {T} Rescanned String: -{rescan(Test2)} +{rescan(Test2)} Print Value of variable T = {T} Original String: {t1 = "atan2(0,-1)"} diff --git a/packages/seacas/applications/aprepro/test_standard.out b/packages/seacas/applications/aprepro/test_standard.out index 547666f429..6135b19709 100644 --- a/packages/seacas/applications/aprepro/test_standard.out +++ b/packages/seacas/applications/aprepro/test_standard.out @@ -3,7 +3,7 @@ $ Test number representations 1 1 1 1 1 1 1 1 1 1 - + Test assign statements: 5 5 $ Should print 5 5 10 10 $ Should print 10 10 @@ -51,8 +51,8 @@ $ Test ifndef - else lines This line should be echoed (6) This line should be echoed. (7) $ Lines a, b, c, d, 1, 4, 6, 7 should be echoed -$ Check line counting -- should be on line 78: - +$ Check line counting -- should be on line 78: + $ ======================================================================== $ Test string if lines This line should be echoed ("greg") @@ -89,25 +89,25 @@ $ Test int and [] (shortcut for int) 5 -5 $ Test looping - print sin, cos from 0 to 90 by 5 -0 0 1 1 -5 0.08715574275 0.9961946981 1 -10 0.1736481777 0.984807753 1 -15 0.2588190451 0.9659258263 1 -20 0.3420201433 0.9396926208 1 -25 0.4226182617 0.906307787 1 -30 0.5 0.8660254038 1 -35 0.5735764364 0.8191520443 1 -40 0.6427876097 0.7660444431 1 -45 0.7071067812 0.7071067812 1 -50 0.7660444431 0.6427876097 1 -55 0.8191520443 0.5735764364 1 -60 0.8660254038 0.5 1 -65 0.906307787 0.4226182617 1 -70 0.9396926208 0.3420201433 1 -75 0.9659258263 0.2588190451 1 -80 0.984807753 0.1736481777 1 -85 0.9961946981 0.08715574275 1 -90 1 6.123233996e-17 1 +0 0 1 1 +5 0.08715574275 0.9961946981 1 +10 0.1736481777 0.984807753 1 +15 0.2588190451 0.9659258263 1 +20 0.3420201433 0.9396926208 1 +25 0.4226182617 0.906307787 1 +30 0.5 0.8660254038 1 +35 0.5735764364 0.8191520443 1 +40 0.6427876097 0.7660444431 1 +45 0.7071067812 0.7071067812 1 +50 0.7660444431 0.6427876097 1 +55 0.8191520443 0.5735764364 1 +60 0.8660254038 0.5 1 +65 0.906307787 0.4226182617 1 +70 0.9396926208 0.3420201433 1 +75 0.9659258263 0.2588190451 1 +80 0.984807753 0.1736481777 1 +85 0.9961946981 0.08715574275 1 +90 1 6.123233996e-17 1 $$$$ Test formatting and string concatenation %.10g @@ -142,12 +142,12 @@ Original String: Rescanned String: This is line 1: 3.141592654 This is line 2: 0.7071067812 - This is line 3: 0.7071067812 + This is line 3: 0.7071067812 Original String: This has an embedded string: {T = "This is a string"} Print Value of variable T = 0 Rescanned String: -This has an embedded string: This is a string +This has an embedded string: This is a string Print Value of variable T = This is a string Original String: atan2(0,-1) diff --git a/packages/seacas/applications/blot/grpcom.blk b/packages/seacas/applications/blot/grpcom.blk index e1da60206b..dac995747e 100644 --- a/packages/seacas/applications/blot/grpcom.blk +++ b/packages/seacas/applications/blot/grpcom.blk @@ -1,4 +1,4 @@ -C Copyright(C) 1999-2020 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C @@ -7,7 +7,7 @@ C See packages/seacas/LICENSE for details COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2) CHARACTER*3 DEVNAM CHARACTER*8 DEVCOD - COMMON /GRPCOM/ ICURDV, + COMMON /GRPCOM/ ICURDV, & NSNAP(2), IFONT(2), & MAXCOL(2), NUMCOL(0:1,2), MAPALT(2), MAPUSE(2), & ISHARD, DEVOK(2), TALKOK(2), SOFTCH(2), AUTOPL(2) diff --git a/packages/seacas/applications/blot/mshcol.f b/packages/seacas/applications/blot/mshcol.f index 25edee6dac..2663c50544 100644 --- a/packages/seacas/applications/blot/mshcol.f +++ b/packages/seacas/applications/blot/mshcol.f @@ -1,4 +1,4 @@ -C Copyright(C) 1999-2020 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C @@ -53,7 +53,7 @@ SUBROUTINE MSHCOL (FNCT, IELB, MLNTYP, WIDLIN, BLKCOL, include 'dbnums.blk' include 'linthc.blk' - + CHARACTER*(*) FNCT INTEGER MLNTYP(-1:1) LOGICAL WIDLIN diff --git a/packages/seacas/applications/conjoin/Conjoin.C b/packages/seacas/applications/conjoin/Conjoin.C index 3e7a692950..cf5930106a 100644 --- a/packages/seacas/applications/conjoin/Conjoin.C +++ b/packages/seacas/applications/conjoin/Conjoin.C @@ -1535,6 +1535,9 @@ namespace { global->elementCount = goffset; global_element_map.resize(goffset); + if (goffest == 0) { + return; + } size_t max_id = global_element_map[global->elementCount - 1].first; bool is_contiguous = max_id == global_element_map.size(); diff --git a/packages/seacas/applications/explore/exp_comand.f b/packages/seacas/applications/explore/exp_comand.f index d9ce8cb288..0324234b2a 100644 --- a/packages/seacas/applications/explore/exp_comand.f +++ b/packages/seacas/applications/explore/exp_comand.f @@ -170,7 +170,7 @@ SUBROUTINE COMAND (A, IA, EXODUS, DBNAME, QAREC, INFO, 4 'GVARS ', 'NVARS ', 'EVARS ', 'NSVARS ', 'SSVARS ', 5 ' ' / DATA LISTBL / - 1 'TITLE ', 'VARS ', 'QAINFO ', 'QA', 'INFORMATION', + 1 'TITLE ', 'VARS ', 'QAINFO ', 'QA', 'INFORMATION', 2 'COORDINA', 'MAP ', 'NMAP ', 'NODEMAP ', 3 'BLOCKS ', 'MATERIAL', 'LINK ', 'CONNECTI', 'ATTRIBUT', 4 'NSETS ', 'NNODES ', 'NFACTORS', 'INVCON ', diff --git a/packages/seacas/applications/explore/exp_dbsbel.f b/packages/seacas/applications/explore/exp_dbsbel.f index 7fdf59d59a..4f4895fa17 100644 --- a/packages/seacas/applications/explore/exp_dbsbel.f +++ b/packages/seacas/applications/explore/exp_dbsbel.f @@ -1,7 +1,7 @@ -C Copyright(C) 1999-2020, 2023 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2023, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBSBEL (NELBLK, NUMEL, LENE, INEL, NLISEL, LISEL, ADD) diff --git a/packages/seacas/applications/explore/exp_preb1.f b/packages/seacas/applications/explore/exp_preb1.f index a2eb8706e1..9a20654fbe 100644 --- a/packages/seacas/applications/explore/exp_preb1.f +++ b/packages/seacas/applications/explore/exp_preb1.f @@ -1,7 +1,7 @@ -C Copyright(C) 1999-2020, 2023 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2023, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PREB1 (OPTION, NOUT, IEL0, NLISEL, LISEL, @@ -157,9 +157,9 @@ SUBROUTINE PREB1 (OPTION, NOUT, IEL0, NLISEL, LISEL, end do end if end if - + RETURN - + 10000 FORMAT (1X, ' Blk Index Global ID ', A, ' ', A) 10001 FORMAT (1X, ' Blk Index Local ID ', A, ' ', A) 10010 FORMAT (1X, I11, I11, 5X, 8I11, :, /, diff --git a/packages/seacas/applications/explore/exp_prelem.f b/packages/seacas/applications/explore/exp_prelem.f index 8d1b17ebf3..49601e03a7 100644 --- a/packages/seacas/applications/explore/exp_prelem.f +++ b/packages/seacas/applications/explore/exp_prelem.f @@ -1,4 +1,4 @@ -C Copyright(C) 1999-2020, 2023 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2023, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C @@ -75,7 +75,7 @@ SUBROUTINE PRELEM (OPTION, NOUT, IF (NLISEL(IELB) .GT. 0) THEN IX0 = LENE(IELB-1) - IXB = LENE(IELB) - LENE(IELB-1) + IXB = LENE(IELB) - LENE(IELB-1) DO IX = 1, IXB IEL = LISEL(IX0+IX) IF (iel .eq. 0) cycle diff --git a/packages/seacas/applications/explore/exp_rmixint.f b/packages/seacas/applications/explore/exp_rmixint.f index e124532300..c9ce38b659 100644 --- a/packages/seacas/applications/explore/exp_rmixint.f +++ b/packages/seacas/applications/explore/exp_rmixint.f @@ -1,7 +1,7 @@ -C Copyright(C) 1999-2020, 2023 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2023, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gjoin/gj_munnps.f b/packages/seacas/applications/gjoin/gj_munnps.f index 42db35fd46..8111bd1912 100644 --- a/packages/seacas/applications/gjoin/gj_munnps.f +++ b/packages/seacas/applications/gjoin/gj_munnps.f @@ -1,4 +1,4 @@ -C Copyright(C) 1999-2020 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C @@ -51,7 +51,7 @@ SUBROUTINE MUNNPS (NUMNPS, ISTAT, LNPSNL, INTEGER NODSCR(*) character*(namlen) namns(*) character*(namlen) namsc(*) - + IF (NUMNPS .LE. 0) RETURN JNPS = 0 diff --git a/packages/seacas/applications/grepos/gp_attrot.blk b/packages/seacas/applications/grepos/gp_attrot.blk index 66821cdd46..4c2c0cc211 100644 --- a/packages/seacas/applications/grepos/gp_attrot.blk +++ b/packages/seacas/applications/grepos/gp_attrot.blk @@ -1,11 +1,11 @@ -C Copyright(C) 1999-2020 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- - COMMON /ATTROT/ ATTIND, ATTBLK, + COMMON /ATTROT/ ATTIND, ATTBLK, * ROTATT(3,3), REVATT, ROTALL, ROTTYP INTEGER ATTBLK, ATTIND LOGICAL REVATT diff --git a/packages/seacas/applications/grepos/gp_mapvar.f b/packages/seacas/applications/grepos/gp_mapvar.f index d55dd4d391..6abb7e341e 100644 --- a/packages/seacas/applications/grepos/gp_mapvar.f +++ b/packages/seacas/applications/grepos/gp_mapvar.f @@ -46,7 +46,7 @@ subroutine mapvar(nold, nnew, nvar, map, vars, scr) if (isseq) then return end if - + do 30 ivar = 1, nvar do 10 i = 1, nnew scr(i) = vars(map(i) + nold * (ivar-1) ) diff --git a/packages/seacas/applications/mapvar-kd/mapvar-kd.f b/packages/seacas/applications/mapvar-kd/mapvar-kd.f index 48e1f183f3..122c16880f 100644 --- a/packages/seacas/applications/mapvar-kd/mapvar-kd.f +++ b/packages/seacas/applications/mapvar-kd/mapvar-kd.f @@ -1,4 +1,4 @@ -C Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2022, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C @@ -516,7 +516,7 @@ PROGRAM MAPVAR ICOMPL = 1 IF (IM .GT. 1)THEN C ... Get the block b id from the previous time through... -C `IA(NMAP)` is the root of the `MP(1:3,1:MBLK)` array. +C `IA(NMAP)` is the root of the `MP(1:3,1:MBLK)` array. C ida idb isc ida ida idb isc C Memory ordering (1,1), (2,1), (3,1), (1,2), (2,2), (3,2), ..., (3,3)- C +0 +1 +2 +3 +4 +5 diff --git a/packages/seacas/applications/mapvar/mapvar.f b/packages/seacas/applications/mapvar/mapvar.f index f8d2ca2550..53117046c4 100644 --- a/packages/seacas/applications/mapvar/mapvar.f +++ b/packages/seacas/applications/mapvar/mapvar.f @@ -1,4 +1,4 @@ -C Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2022, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C @@ -638,7 +638,7 @@ PROGRAM MAPVAR ICOMPL = 1 IF (IM .GT. 1)THEN C ... Get the block b id from the previous time through... -C `IA(NMAP)` is the root of the `MP(1:3,1:MBLK)` array. +C `IA(NMAP)` is the root of the `MP(1:3,1:MBLK)` array. C ida idb isc ida ida idb isc C Memory ordering (1,1), (2,1), (3,1), (1,2), (2,2), (3,2), ..., (3,3)- C +0 +1 +2 +3 +4 +5 diff --git a/packages/seacas/applications/numbers/nu_multi_cavity.f b/packages/seacas/applications/numbers/nu_multi_cavity.f index 1bc6e4c7db..3c8c3bf4a3 100644 --- a/packages/seacas/applications/numbers/nu_multi_cavity.f +++ b/packages/seacas/applications/numbers/nu_multi_cavity.f @@ -1,14 +1,14 @@ -C Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2022, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C C See packages/seacas/LICENSE for details C ... Each cavity is a single sideset id, but calculates volume of each cavity -C simultaneously and then outputs all data at the end. Only reads the +C simultaneously and then outputs all data at the end. Only reads the C displacements a single time for all cavities instead of once per cavity - SUBROUTINE MULTI_CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, + SUBROUTINE MULTI_CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, * IPNESS, LTEESS, LTNESS, FACESS, DISP, NUMNP, NDIM, NUMESS, * TIME, ITMSEL, TITLE, CENT, CENTER) @@ -128,4 +128,4 @@ SUBROUTINE MULTI_CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, RETURN END - + diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt index 13fcf791dd..207c5cbe41 100644 --- a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt +++ b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt @@ -113,7 +113,7 @@ if (${PACKAGE_NAME}_ENABLE_TESTS) TRIBITS_ADD_ADVANCED_TEST( aprepro_lib_unit_test TEST_0 EXEC aprepro_lib_test - ARGS -o test.output ${CMAKE_CURRENT_SOURCE_DIR}/test.inp_app + ARGS -o test.output ${CMAKE_CURRENT_SOURCE_DIR}/test.inp_app NOEXEPREFIX NOEXESUFFIX PASS_ANY TEST_1 CMND diff ARGS -w diff --git a/packages/seacas/libraries/aprepro_lib/aprepro.ll b/packages/seacas/libraries/aprepro_lib/aprepro.ll index c8b48ae338..4acbf23cf2 100644 --- a/packages/seacas/libraries/aprepro_lib/aprepro.ll +++ b/packages/seacas/libraries/aprepro_lib/aprepro.ll @@ -28,7 +28,7 @@ s"}/* -*- Mode: c++ -*- */ #include "apr_tokenize.h" #include "fmt/format.h" #include "fmt/ostream.h" - + #define YY_NO_UNISTD_H /* import the parser's token type into a local typedef */ @@ -1087,7 +1087,7 @@ integer {D}+({E})? std::string new_string("}"); auto ins = new std::istringstream(new_string); // Declare an input string stream. yyFlexLexer::yypush_buffer_state(yyFlexLexer::yy_create_buffer(ins, new_string.size())); - + if (aprepro.ap_options.debugging) { std::cerr << "DEBUG IMPORT: " << string << "\n"; } diff --git a/packages/seacas/libraries/aprepro_lib/test.inp_app b/packages/seacas/libraries/aprepro_lib/test.inp_app index f7cca4b1e2..6d5d4e7158 100644 --- a/packages/seacas/libraries/aprepro_lib/test.inp_app +++ b/packages/seacas/libraries/aprepro_lib/test.inp_app @@ -180,7 +180,7 @@ $ Test int and [] (shortcut for int) $ Test looping - print sin, cos from 0 to 90 by 5 {Loop(19, _angle, 0, 5)} -{_angle} {_sa=sind(_angle)} {_ca=cosd(_angle)} {hypot(_sa, _ca)} +{_angle} {_sa=sind(_angle)} {_ca=cosd(_angle)} {hypot(_sa, _ca)} {EndLoop} $$$$ Test formatting and string concatenation @@ -205,12 +205,12 @@ $$$$ Test string rescanning and executing Original String: {Test} Rescanned String: -{rescan(Test)} +{rescan(Test)} Original String: {Test2} Print Value of variable T = {T} Rescanned String: -{rescan(Test2)} +{rescan(Test2)} Print Value of variable T = {T} Original String: {t1 = "atan2(0,-1)"} diff --git a/packages/seacas/libraries/aprepro_lib/test_standard.out b/packages/seacas/libraries/aprepro_lib/test_standard.out index 0bb760ff0a..ea024e8300 100644 --- a/packages/seacas/libraries/aprepro_lib/test_standard.out +++ b/packages/seacas/libraries/aprepro_lib/test_standard.out @@ -51,8 +51,8 @@ $ Test ifndef - else lines This line should be echoed (6) This line should be echoed. (7) $ Lines a, b, c, d, 1, 4, 6, 7 should be echoed -$ Check line counting -- should be on line 78: - +$ Check line counting -- should be on line 78: + $ ======================================================================== $ Test string if lines This line should be echoed ("greg") @@ -89,25 +89,25 @@ $ Test int and [] (shortcut for int) 5 -5 $ Test looping - print sin, cos from 0 to 90 by 5 -0 0 1 1 -5 0.08715574275 0.9961946981 1 -10 0.1736481777 0.984807753 1 -15 0.2588190451 0.9659258263 1 -20 0.3420201433 0.9396926208 1 -25 0.4226182617 0.906307787 1 -30 0.5 0.8660254038 1 -35 0.5735764364 0.8191520443 1 -40 0.6427876097 0.7660444431 1 -45 0.7071067812 0.7071067812 1 -50 0.7660444431 0.6427876097 1 -55 0.8191520443 0.5735764364 1 -60 0.8660254038 0.5 1 -65 0.906307787 0.4226182617 1 -70 0.9396926208 0.3420201433 1 -75 0.9659258263 0.2588190451 1 -80 0.984807753 0.1736481777 1 -85 0.9961946981 0.08715574275 1 -90 1 6.123233996e-17 1 +0 0 1 1 +5 0.08715574275 0.9961946981 1 +10 0.1736481777 0.984807753 1 +15 0.2588190451 0.9659258263 1 +20 0.3420201433 0.9396926208 1 +25 0.4226182617 0.906307787 1 +30 0.5 0.8660254038 1 +35 0.5735764364 0.8191520443 1 +40 0.6427876097 0.7660444431 1 +45 0.7071067812 0.7071067812 1 +50 0.7660444431 0.6427876097 1 +55 0.8191520443 0.5735764364 1 +60 0.8660254038 0.5 1 +65 0.906307787 0.4226182617 1 +70 0.9396926208 0.3420201433 1 +75 0.9659258263 0.2588190451 1 +80 0.984807753 0.1736481777 1 +85 0.9961946981 0.08715574275 1 +90 1 6.123233996e-17 1 $$$$ Test formatting and string concatenation %.10g @@ -164,12 +164,12 @@ Original String: Rescanned String: This is line 1: 3.141592654 This is line 2: 0.7071067812 - This is line 3: 0.7071067812 + This is line 3: 0.7071067812 Original String: This has an embedded string: {T = "This is a string"} Print Value of variable T = 0 Rescanned String: -This has an embedded string: This is a string +This has an embedded string: This is a string Print Value of variable T = This is a string Original String: atan2(0,-1) @@ -221,7 +221,7 @@ Word 7 of list1 and list2 are 63 and 83 Word 8 of list1 and list2 are 64 and 84 $$$$ Test double brace echo off/on -Nothing further on line: +Nothing further on line: Noecho followed by non-parsing output: This should be echoed Echo, noecho setting variable, then echo that variable: echo++echo $End of test file diff --git a/packages/seacas/libraries/exoIIv2for32/test/testrd.dmp b/packages/seacas/libraries/exoIIv2for32/test/testrd.dmp index 72d596dfb5..cdb62ffcb5 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testrd.dmp +++ b/packages/seacas/libraries/exoIIv2for32/test/testrd.dmp @@ -5,7 +5,7 @@ after exopen, error = 0 after exgini, error = 0 database parameters: -title = This is a test +title = This is a test num_dim = 3 num_nodes = 26 num_elem = 5 @@ -14,7 +14,7 @@ num_node_sets = 2 num_side_sets = 5 after exgcor, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -41,7 +41,7 @@ x coords = 3.0 6.0 0.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -68,7 +68,7 @@ y coords = 2.0 2.0 2.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -97,8 +97,8 @@ z coords = 0.0 after exgcon, error = 0 -x coord name = xcoor -y coord name = ycoor +x coord name = xcoor +y coord name = ycoor after exgmap, error = 0 elem_map(1) = 1 @@ -111,40 +111,40 @@ after exgebi, error = 0 after exgelb, error = 0 element block id = 10 -element type = quad -block name = block_a +element type = quad +block name = block_a num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 11 -element type = quad -block name = block_b +element type = quad +block name = block_b num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 12 -element type = hex -block name = block_c +element type = hex +block name = block_c num_elem_in_block = 1 num_nodes_per_elem = 8 num_attr = 1 after exgelb, error = 0 element block id = 13 -element type = tetra -block name = block_d +element type = tetra +block name = block_d num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 14 -element type = wedge -block name = block_e +element type = wedge +block name = block_e num_elem_in_block = 1 num_nodes_per_elem = 6 num_attr = 1 @@ -209,11 +209,11 @@ connect array for elem block 14 26 after exgnams, error = 0 -element block 1 name: block_a -element block 2 name: block_b -element block 3 name: block_c -element block 4 name: block_d -element block 5 name: block_e +element block 1 name: block_a +element block 2 name: block_b +element block 3 name: block_c +element block 4 name: block_d +element block 5 name: block_e after exgeat, error = 0 @@ -249,7 +249,7 @@ after exgnsi, error = 0 after exgnp, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after exgns, error = 0 @@ -271,7 +271,7 @@ dist factors for node set 20 after exgnp, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after exgns, error = 0 @@ -288,8 +288,8 @@ dist factors for node set 21 3.10 after exgnams, error = 0 -node set 1 name: nodeset_a1 -node set 2 name: nodeset_b2 +node set 1 name: nodeset_a1 +node set 2 name: nodeset_b2 There are 3 properties for each node set after exgpn, error = 0 @@ -307,16 +307,16 @@ after EXNSDF = 8 exinq, error = 0 after exgcns, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 1 6 -node_list = +node_list = 100 101 102 @@ -325,7 +325,7 @@ node_list = 200 201 202 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -526,11 +526,11 @@ node list for side set 34 no dist factors for side set 34 after exgnams, error = 0 -side set 1 name: surf_first -side set 2 name: surf_second -side set 3 name: surf_third -side set 4 name: surf_fourth -side set 5 name: surf_fifth +side set 1 name: surf_first +side set 2 name: surf_second +side set 3 name: surf_third +side set 4 name: surf_fourth +side set 5 name: surf_fifth There are 2 properties for each side set after exgpn, error = 0 @@ -555,37 +555,37 @@ after exinq: EXSSDF = 8, error = 0 after exgcss, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 4 5 -num_df_per_set = +num_df_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 1 3 5 12 16 -df_ind = +df_ind = 1 5 9 9 9 -elem_list = +elem_list = 2 2 1 @@ -606,7 +606,7 @@ elem_list = 5 5 5 -side_list = +side_list = 4 2 2 @@ -627,7 +627,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -638,41 +638,41 @@ dist_fact = 31.300 after exgqa, error = 0 -QA records = -testwt -07/07/93 -15:41:33 -FASTQ -fastq -07/07/93 -16:41:33 +QA records = +testwt +07/07/93 +15:41:33 +FASTQ +fastq +07/07/93 +16:41:33 after exginf, error = 0 -info records = - This is the first information record. - This is the second information record. - This is the third information record. +info records = + This is the first information record. + This is the second information record. + This is the third information record. after exgvp, error = 0 after exgvan, error = 0 There are 1 global variables; their names are : -glo_vars +glo_vars after exgvp, error = 0 after exgvan, error = 0 There are 2 nodal variables; their names are : -nod_var0 -nod_var1 +nod_var0 +nod_var1 after exgvp, error = 0 after exgvan, error = 0 There are 3 element variables; their names are : -ele_var0 -ele_var1 -ele_var2 +ele_var0 +ele_var1 +ele_var2 after exgvtt, error = 0 This is the element variable truth table: diff --git a/packages/seacas/libraries/exoIIv2for32/test/testrdd.dmp b/packages/seacas/libraries/exoIIv2for32/test/testrdd.dmp index 72d596dfb5..cdb62ffcb5 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testrdd.dmp +++ b/packages/seacas/libraries/exoIIv2for32/test/testrdd.dmp @@ -5,7 +5,7 @@ after exopen, error = 0 after exgini, error = 0 database parameters: -title = This is a test +title = This is a test num_dim = 3 num_nodes = 26 num_elem = 5 @@ -14,7 +14,7 @@ num_node_sets = 2 num_side_sets = 5 after exgcor, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -41,7 +41,7 @@ x coords = 3.0 6.0 0.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -68,7 +68,7 @@ y coords = 2.0 2.0 2.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -97,8 +97,8 @@ z coords = 0.0 after exgcon, error = 0 -x coord name = xcoor -y coord name = ycoor +x coord name = xcoor +y coord name = ycoor after exgmap, error = 0 elem_map(1) = 1 @@ -111,40 +111,40 @@ after exgebi, error = 0 after exgelb, error = 0 element block id = 10 -element type = quad -block name = block_a +element type = quad +block name = block_a num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 11 -element type = quad -block name = block_b +element type = quad +block name = block_b num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 12 -element type = hex -block name = block_c +element type = hex +block name = block_c num_elem_in_block = 1 num_nodes_per_elem = 8 num_attr = 1 after exgelb, error = 0 element block id = 13 -element type = tetra -block name = block_d +element type = tetra +block name = block_d num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 14 -element type = wedge -block name = block_e +element type = wedge +block name = block_e num_elem_in_block = 1 num_nodes_per_elem = 6 num_attr = 1 @@ -209,11 +209,11 @@ connect array for elem block 14 26 after exgnams, error = 0 -element block 1 name: block_a -element block 2 name: block_b -element block 3 name: block_c -element block 4 name: block_d -element block 5 name: block_e +element block 1 name: block_a +element block 2 name: block_b +element block 3 name: block_c +element block 4 name: block_d +element block 5 name: block_e after exgeat, error = 0 @@ -249,7 +249,7 @@ after exgnsi, error = 0 after exgnp, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after exgns, error = 0 @@ -271,7 +271,7 @@ dist factors for node set 20 after exgnp, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after exgns, error = 0 @@ -288,8 +288,8 @@ dist factors for node set 21 3.10 after exgnams, error = 0 -node set 1 name: nodeset_a1 -node set 2 name: nodeset_b2 +node set 1 name: nodeset_a1 +node set 2 name: nodeset_b2 There are 3 properties for each node set after exgpn, error = 0 @@ -307,16 +307,16 @@ after EXNSDF = 8 exinq, error = 0 after exgcns, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 1 6 -node_list = +node_list = 100 101 102 @@ -325,7 +325,7 @@ node_list = 200 201 202 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -526,11 +526,11 @@ node list for side set 34 no dist factors for side set 34 after exgnams, error = 0 -side set 1 name: surf_first -side set 2 name: surf_second -side set 3 name: surf_third -side set 4 name: surf_fourth -side set 5 name: surf_fifth +side set 1 name: surf_first +side set 2 name: surf_second +side set 3 name: surf_third +side set 4 name: surf_fourth +side set 5 name: surf_fifth There are 2 properties for each side set after exgpn, error = 0 @@ -555,37 +555,37 @@ after exinq: EXSSDF = 8, error = 0 after exgcss, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 4 5 -num_df_per_set = +num_df_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 1 3 5 12 16 -df_ind = +df_ind = 1 5 9 9 9 -elem_list = +elem_list = 2 2 1 @@ -606,7 +606,7 @@ elem_list = 5 5 5 -side_list = +side_list = 4 2 2 @@ -627,7 +627,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -638,41 +638,41 @@ dist_fact = 31.300 after exgqa, error = 0 -QA records = -testwt -07/07/93 -15:41:33 -FASTQ -fastq -07/07/93 -16:41:33 +QA records = +testwt +07/07/93 +15:41:33 +FASTQ +fastq +07/07/93 +16:41:33 after exginf, error = 0 -info records = - This is the first information record. - This is the second information record. - This is the third information record. +info records = + This is the first information record. + This is the second information record. + This is the third information record. after exgvp, error = 0 after exgvan, error = 0 There are 1 global variables; their names are : -glo_vars +glo_vars after exgvp, error = 0 after exgvan, error = 0 There are 2 nodal variables; their names are : -nod_var0 -nod_var1 +nod_var0 +nod_var1 after exgvp, error = 0 after exgvan, error = 0 There are 3 element variables; their names are : -ele_var0 -ele_var1 -ele_var2 +ele_var0 +ele_var1 +ele_var2 after exgvtt, error = 0 This is the element variable truth table: diff --git a/packages/seacas/libraries/exoIIv2for32/test/testrddi64.dmp b/packages/seacas/libraries/exoIIv2for32/test/testrddi64.dmp index 1f99f1f0ba..9d1e72b94d 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testrddi64.dmp +++ b/packages/seacas/libraries/exoIIv2for32/test/testrddi64.dmp @@ -5,7 +5,7 @@ after exopen, error = 0 after exgini, error = 0 database parameters: -title = This is a test +title = This is a test num_dim = 3 num_nodes = 26 num_elem = 5 @@ -14,7 +14,7 @@ num_node_sets = 2 num_side_sets = 5 after exgcor, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -41,7 +41,7 @@ x coords = 3.0 6.0 0.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -68,7 +68,7 @@ y coords = 2.0 2.0 2.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -97,8 +97,8 @@ z coords = 0.0 after exgcon, error = 0 -x coord name = xcoor -y coord name = ycoor +x coord name = xcoor +y coord name = ycoor after exgmap, error = 0 elem_map(1) = 1 @@ -111,40 +111,40 @@ after exgebi, error = 0 after exgelb, error = 0 element block id = 10 -element type = quad -block name = block_a +element type = quad +block name = block_a num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 11 -element type = quad -block name = block_b +element type = quad +block name = block_b num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 12 -element type = hex -block name = block_c +element type = hex +block name = block_c num_elem_in_block = 1 num_nodes_per_elem = 8 num_attr = 1 after exgelb, error = 0 element block id = 13 -element type = tetra -block name = block_d +element type = tetra +block name = block_d num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 14 -element type = wedge -block name = block_e +element type = wedge +block name = block_e num_elem_in_block = 1 num_nodes_per_elem = 6 num_attr = 1 @@ -209,11 +209,11 @@ connect array for elem block 14 26 after exgnams, error = 0 -element block 1 name: block_a -element block 2 name: block_b -element block 3 name: block_c -element block 4 name: block_d -element block 5 name: block_e +element block 1 name: block_a +element block 2 name: block_b +element block 3 name: block_c +element block 4 name: block_d +element block 5 name: block_e after exgeat, error = 0 @@ -249,7 +249,7 @@ after exgnsi, error = 0 after exgnp, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after exgns, error = 0 @@ -271,7 +271,7 @@ dist factors for node set 20 after exgnp, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after exgns, error = 0 @@ -288,8 +288,8 @@ dist factors for node set 21 3.10 after exgnams, error = 0 -node set 1 name: nodeset_a1 -node set 2 name: nodeset_b2 +node set 1 name: nodeset_a1 +node set 2 name: nodeset_b2 There are 3 properties for each node set after exgpn, error = 0 @@ -307,16 +307,16 @@ after EXNSDF = 8 exinq, error = 0 after exgcns, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 1 6 -node_list = +node_list = 100 101 102 @@ -325,7 +325,7 @@ node_list = 200 201 202 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -526,11 +526,11 @@ node list for side set 34 no dist factors for side set 34 after exgnams, error = 0 -side set 1 name: surf_first -side set 2 name: surf_second -side set 3 name: surf_third -side set 4 name: surf_fourth -side set 5 name: surf_fifth +side set 1 name: surf_first +side set 2 name: surf_second +side set 3 name: surf_third +side set 4 name: surf_fourth +side set 5 name: surf_fifth There are 2 properties for each side set after exgpn, error = 0 @@ -555,37 +555,37 @@ after exinq: EXSSDF = 8, error = 0 after exgcss, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 4 5 -num_df_per_set = +num_df_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 1 3 5 12 16 -df_ind = +df_ind = 1 5 9 9 9 -elem_list = +elem_list = 2 2 1 @@ -606,7 +606,7 @@ elem_list = 5 5 5 -side_list = +side_list = 4 2 2 @@ -627,7 +627,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -638,41 +638,41 @@ dist_fact = 31.300 after exgqa, error = 0 -QA records = -testwt -07/07/93 -15:41:33 -FASTQ -fastq -07/07/93 -16:41:33 +QA records = +testwt +07/07/93 +15:41:33 +FASTQ +fastq +07/07/93 +16:41:33 after exginf, error = 0 -info records = - This is the first information record. - This is the second information record. - This is the third information record. +info records = + This is the first information record. + This is the second information record. + This is the third information record. after exgvp, error = 0 after exgvan, error = 0 There are 1 global variables; their names are : -glo_vars +glo_vars after exgvp, error = 0 after exgvan, error = 0 There are 2 nodal variables; their names are : -nod_var0 -nod_var1 +nod_var0 +nod_var1 after exgvp, error = 0 after exgvan, error = 0 There are 3 element variables; their names are : -ele_var0 -ele_var1 -ele_var2 +ele_var0 +ele_var1 +ele_var2 after exgvtt, error = 0 This is the element variable truth table: diff --git a/packages/seacas/libraries/exodus/include/exodusII.h b/packages/seacas/libraries/exodus/include/exodusII.h index 9b0c3b545e..ce7141e40c 100644 --- a/packages/seacas/libraries/exodus/include/exodusII.h +++ b/packages/seacas/libraries/exodus/include/exodusII.h @@ -345,13 +345,13 @@ typedef struct ex_basis /* clang-format off * - * subc_dim: dimension of the subcell associated with the specified DoF ordinal + * subc_dim: dimension of the subcell associated with the specified DoF ordinal * -- 0 node, 1 edge, 2 face, 3 volume [Range: 0..3] * subc_ordinal: ordinal of the subcell relative to its parent cell - * -- 0..n for each ordinal with the same subc dim [Range: <= DoF ordinal] - * subc_dof_ordinal: ordinal of the DoF relative to the subcell - * subc_num_dof: cardinality of the DoF set associated with this subcell. - * xi, eta, mu (ξ, η, ζ): Parametric coordinate location of the DoF + * -- 0..n for each ordinal with the same subc dim [Range: <= DoF ordinal] + * subc_dof_ordinal: ordinal of the DoF relative to the subcell + * subc_num_dof: cardinality of the DoF set associated with this subcell. + * xi, eta, mu (ξ, η, ζ): Parametric coordinate location of the DoF * -- (Only first ndim values are valid) * clang-format on diff --git a/packages/seacas/libraries/exodus/test/makedmp b/packages/seacas/libraries/exodus/test/makedmp index 5f338fccfb..02d09adc02 100644 --- a/packages/seacas/libraries/exodus/test/makedmp +++ b/packages/seacas/libraries/exodus/test/makedmp @@ -1,8 +1,8 @@ #! /usr/bin/env bash -# Copyright(C) 1999-2021 National Technology & Engineering Solutions +# Copyright(C) 1999-2021, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. @@ -234,19 +234,19 @@ echo "begin test_ts_nvar" >> test.output ${PREFIX} ${BINDIR}/test_ts_nvar${SUFFIX} >> test.output echo "end test_ts_nvar" >> test.output ${NCDUMP} -d5,5 test.exo | grep -v version | grep -v _FillValue |grep -v "maximum_name_length" > ${SRCDIR}/test_ts_nvar.dmp - + echo "test_ts_nvar_rd - each thread reads data for a single nodal variable..." echo "begin test_ts_nvar_rd" >> test.output ${PREFIX} ${BINDIR}/test_ts_nvar_rd${SUFFIX} > ${SRCDIR}/test_ts_nvar_rd.dmp echo "end test_ts_nvar_rd" >> test.output - + echo "test_ts_partial_nvar - each thread writes data for a single nodal variable..." echo "begin test_ts_partial_nvar" >> test.output ${PREFIX} ${BINDIR}/test_ts_partial_nvar${SUFFIX} >> test.output echo "end test_ts_partial_nvar" >> test.output ${NCDUMP} -d5,5 test.exo | grep -v version | grep -v _FillValue |grep -v "maximum_name_length" > ${SRCDIR}/test_ts_partial_nvar.dmp - + echo "test_ts_partial_nvar_rd - each thread reads data for a single nodal variable..." echo "begin test_ts_partial_nvar_rd" >> test.output ${PREFIX} ${BINDIR}/test_ts_partial_nvar${SUFFIX} >> test.output @@ -277,4 +277,3 @@ echo "begin test_ts_errval" >> test.output ${PREFIX} ${BINDIR}/test_ts_errval${SUFFIX} >> test.output echo "end test_ts_errval" >> test.output fi - diff --git a/packages/seacas/libraries/exodus/test/testall.in1 b/packages/seacas/libraries/exodus/test/testall.in1 index ab0b0bf69c..e5c7d124b4 100644 --- a/packages/seacas/libraries/exodus/test/testall.in1 +++ b/packages/seacas/libraries/exodus/test/testall.in1 @@ -1,7 +1,7 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. diff --git a/packages/seacas/libraries/exodus/test/testrd-assembly.dmp b/packages/seacas/libraries/exodus/test/testrd-assembly.dmp index 3c8f9d4aad..a1dea44f6b 100644 --- a/packages/seacas/libraries/exodus/test/testrd-assembly.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-assembly.dmp @@ -75,16 +75,16 @@ name = 'block_G' after ex_get_names(exoid, EX_ASSEMBLY, assembly_name2), error = 0 after ex_get_assembly(exoid, &assemblies[i]), error = 0 Assembly named 'Root' has id 100. It contains 3 entities of type 'assembly' - 200, 300, 400, + 200, 300, 400, after ex_get_assembly(exoid, &assemblies[i]), error = 0 Assembly named 'Child2' has id 200. It contains 4 entities of type 'element block' - 10, 11, 12, 13, + 10, 11, 12, 13, after ex_get_assembly(exoid, &assemblies[i]), error = 0 Assembly named 'Child3' has id 300. It contains 3 entities of type 'element block' - 14, 15, 16, + 14, 15, 16, after ex_get_assembly(exoid, &assemblies[i]), error = 0 Assembly named 'Child4' has id 400. It contains 2 entities of type 'element block' - 10, 16, + 10, 16, after ex_get_assemblies(exoid, assmbly), error = 0 Assembly named 'Root' has id 100. It contains 3 entities of type 'assembly' Assembly named 'Child2' has id 200. It contains 4 entities of type 'element block' diff --git a/packages/seacas/libraries/exodus/test/testrd-blob.dmp b/packages/seacas/libraries/exodus/test/testrd-blob.dmp index 24f8ca1395..faddc2bf2b 100644 --- a/packages/seacas/libraries/exodus/test/testrd-blob.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-blob.dmp @@ -16,13 +16,13 @@ num_node_sets = 0 num_side_sets = 0 after ex_get_blob(exoid, &blobs[i]), error = 0 Blob named 'Tempus' has id 100. It contains 10 entries. - + after ex_get_blob(exoid, &blobs[i]), error = 0 Blob named 'IOSS' has id 200. It contains 20 entries. - + after ex_get_blob(exoid, &blobs[i]), error = 0 Blob named 'Solver' has id 300. It contains 15 entries. - + after ex_get_blobs(exoid, blb), error = 0 Blob named 'Tempus' has id 100. It contains 10 entries. Blob named 'IOSS' has id 200. It contains 20 entries. diff --git a/packages/seacas/libraries/exodus/test/testrd-long-name.dmp b/packages/seacas/libraries/exodus/test/testrd-long-name.dmp index 3071eb10f4..3f2707b3a9 100644 --- a/packages/seacas/libraries/exodus/test/testrd-long-name.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-long-name.dmp @@ -15,7 +15,7 @@ num_side_sets = 5 after ex_inquire, error = 0 after ex_get_coord, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -49,7 +49,7 @@ x coords = 0.0 10.0 10.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -83,7 +83,7 @@ y coords = 0.0 0.0 10.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -197,13 +197,13 @@ nodal attribute 1 = 'Node_attr_2' 10.0 after ex_get_id_map, error = 0 -elem_map(0) = 1 -elem_map(1) = 2 -elem_map(2) = 3 -elem_map(3) = 4 -elem_map(4) = 5 -elem_map(5) = 6 -elem_map(6) = 7 +elem_map(0) = 1 +elem_map(1) = 2 +elem_map(2) = 3 +elem_map(3) = 4 +elem_map(4) = 5 +elem_map(5) = 6 +elem_map(6) = 7 after ex_get_elem_blk_ids, error = 0 @@ -376,7 +376,7 @@ after ex_get_names, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 name = 'nset_1' @@ -409,7 +409,7 @@ nodeset attribute 0 = 'Nodeset_attribute' after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 name = 'nset_2' @@ -448,16 +448,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -466,7 +466,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -739,37 +739,37 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 8 10 -num_dist_per_set = +num_dist_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 0 2 4 11 19 -dist_ind = +dist_ind = 0 4 8 8 8 -elem_list = +elem_list = 2 2 1 @@ -799,7 +799,7 @@ elem_list = 7 7 7 -side_list = +side_list = 4 2 2 @@ -829,7 +829,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -840,7 +840,7 @@ dist_fact = 31.300 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -853,7 +853,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' '' diff --git a/packages/seacas/libraries/exodus/test/testrd-nfaced.dmp b/packages/seacas/libraries/exodus/test/testrd-nfaced.dmp index 933936b2d8..1179ad6c21 100644 --- a/packages/seacas/libraries/exodus/test/testrd-nfaced.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-nfaced.dmp @@ -14,7 +14,7 @@ num_node_sets = 0 num_side_sets = 0 after ex_get_coord, error = 0 -x, y, z coords = +x, y, z coords = 0.0 0.0 0.0 2.0 0.0 0.0 0.0 2.0 0.0 @@ -53,9 +53,9 @@ after ex_get_entity_count_per_polyhedra, error = 0 after ex_get_conn, error = 0 face connectivity array for elem block 10 -Element 1, 5 faces: 1 2 3 4 5 -Element 2, 5 faces: 4 6 7 8 9 -Element 3, 7 faces: 8 10 11 12 13 14 15 +Element 1, 5 faces: 1 2 3 4 5 +Element 2, 5 faces: 4 6 7 8 9 +Element 3, 7 faces: 8 10 11 12 13 14 15 after ex_get_block (EX_FACE_BLOCK), error = 0 @@ -71,24 +71,24 @@ after ex_get_entity_count_per_polyhedra, error = 0 after ex_get_conn, error = 0 node connectivity array for face block 10 -Face 1, 3 nodes: 5 6 8 -Face 2, 3 nodes: 2 1 4 -Face 3, 4 nodes: 6 2 4 8 -Face 4, 4 nodes: 8 4 1 5 -Face 5, 4 nodes: 1 2 6 5 -Face 6, 3 nodes: 5 8 7 -Face 7, 3 nodes: 1 3 4 -Face 8, 4 nodes: 7 8 4 3 -Face 9, 4 nodes: 7 3 1 5 -Face 10, 5 nodes: 8 4 14 10 12 -Face 11, 5 nodes: 7 11 9 13 3 -Face 12, 4 nodes: 7 8 12 11 -Face 13, 4 nodes: 11 12 10 9 -Face 14, 4 nodes: 9 10 14 13 -Face 15, 4 nodes: 13 14 4 3 +Face 1, 3 nodes: 5 6 8 +Face 2, 3 nodes: 2 1 4 +Face 3, 4 nodes: 6 2 4 8 +Face 4, 4 nodes: 8 4 1 5 +Face 5, 4 nodes: 1 2 6 5 +Face 6, 3 nodes: 5 8 7 +Face 7, 3 nodes: 1 3 4 +Face 8, 4 nodes: 7 8 4 3 +Face 9, 4 nodes: 7 3 1 5 +Face 10, 5 nodes: 8 4 14 10 12 +Face 11, 5 nodes: 7 11 9 13 3 +Face 12, 4 nodes: 7 8 12 11 +Face 13, 4 nodes: 11 12 10 9 +Face 14, 4 nodes: 9 10 14 13 +Face 15, 4 nodes: 13 14 4 3 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT-NFACED' 'testwt-nfaced' '2010/02/15' @@ -101,7 +101,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' '' diff --git a/packages/seacas/libraries/exodus/test/testrd-nm32.dmp b/packages/seacas/libraries/exodus/test/testrd-nm32.dmp index 84c554f7df..70ec8a3c6b 100644 --- a/packages/seacas/libraries/exodus/test/testrd-nm32.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-nm32.dmp @@ -13,7 +13,7 @@ num_side_sets = 5 after ex_inquire, error = 0 after ex_get_coord, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -47,7 +47,7 @@ x coords = 0.0 10.0 10.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -81,7 +81,7 @@ y coords = 0.0 0.0 10.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -195,13 +195,13 @@ nodal attribute 1 = 'Node_attr_2' 10.0 after ex_get_id_map, error = 0 -elem_id_map(0) = 1 -elem_id_map(1) = 2 -elem_id_map(2) = 3 -elem_id_map(3) = 4 -elem_id_map(4) = 5 -elem_id_map(5) = 6 -elem_id_map(6) = 7 +elem_id_map(0) = 1 +elem_id_map(1) = 2 +elem_id_map(2) = 3 +elem_id_map(3) = 4 +elem_id_map(4) = 5 +elem_id_map(5) = 6 +elem_id_map(6) = 7 after ex_get_elem_blk_ids, error = 0 @@ -374,7 +374,7 @@ after ex_get_names, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 name = 'nset_1' @@ -407,7 +407,7 @@ nodeset attribute 0 = 'Nodeset_attribute' after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 name = 'nset_2' @@ -444,16 +444,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -462,7 +462,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -733,37 +733,37 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 8 10 -num_dist_per_set = +num_dist_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 0 2 4 11 19 -dist_ind = +dist_ind = 0 4 8 8 8 -elem_list = +elem_list = 2 2 1 @@ -793,7 +793,7 @@ elem_list = 7 7 7 -side_list = +side_list = 4 2 2 @@ -823,7 +823,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -834,7 +834,7 @@ dist_fact = 31.300 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -847,7 +847,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' '' diff --git a/packages/seacas/libraries/exodus/test/testrd-nsided.dmp b/packages/seacas/libraries/exodus/test/testrd-nsided.dmp index 20b77f3779..98ae3d0f93 100644 --- a/packages/seacas/libraries/exodus/test/testrd-nsided.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-nsided.dmp @@ -12,7 +12,7 @@ num_node_sets = 2 num_side_sets = 5 after ex_get_coord, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -46,7 +46,7 @@ x coords = 0.0 10.0 10.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -80,7 +80,7 @@ y coords = 0.0 0.0 10.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -193,13 +193,13 @@ nodal attribute 1 = 'Node_attr_2' 10.0 after ex_get_id_map, error = 0 -elem_map(0) = 1 -elem_map(1) = 2 -elem_map(2) = 3 -elem_map(3) = 4 -elem_map(4) = 5 -elem_map(5) = 6 -elem_map(6) = 7 +elem_map(0) = 1 +elem_map(1) = 2 +elem_map(2) = 3 +elem_map(3) = 4 +elem_map(4) = 5 +elem_map(5) = 6 +elem_map(6) = 7 after ex_get_elem_blk_ids, error = 0 @@ -222,13 +222,13 @@ after ex_get_entity_count_per_polyhedra, error = 0 after ex_get_conn, error = 0 connect array for elem block 10 -Element 1, 4 nodes: 1 2 3 4 -Element 2, 4 nodes: 5 6 7 8 -Element 3, 8 nodes: 9 10 11 12 13 14 15 16 -Element 4, 4 nodes: 17 18 19 20 -Element 5, 6 nodes: 21 22 23 24 25 26 -Element 6, 8 nodes: 17 18 19 20 27 28 30 29 -Element 7, 3 nodes: 31 32 33 +Element 1, 4 nodes: 1 2 3 4 +Element 2, 4 nodes: 5 6 7 8 +Element 3, 8 nodes: 9 10 11 12 13 14 15 16 +Element 4, 4 nodes: 17 18 19 20 +Element 5, 6 nodes: 21 22 23 24 25 26 +Element 6, 8 nodes: 17 18 19 20 27 28 30 29 +Element 7, 3 nodes: 31 32 33 after ex_get_node_set_ids, error = 0 @@ -236,7 +236,7 @@ after ex_get_names, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 name = 'nset_1' @@ -269,7 +269,7 @@ nodeset attribute 0 = 'Nodeset_attribute' after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 name = 'nset_2' @@ -308,16 +308,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -326,7 +326,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -488,37 +488,37 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 8 10 -num_dist_per_set = +num_dist_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 0 2 4 11 19 -dist_ind = +dist_ind = 0 4 8 8 8 -elem_list = +elem_list = 2 2 1 @@ -548,7 +548,7 @@ elem_list = 7 7 7 -side_list = +side_list = 4 2 2 @@ -578,7 +578,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -589,7 +589,7 @@ dist_fact = 31.300 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -602,7 +602,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' '' diff --git a/packages/seacas/libraries/exodus/test/testrd-oned.dmp b/packages/seacas/libraries/exodus/test/testrd-oned.dmp index d0ea2e9319..2489a65ebb 100644 --- a/packages/seacas/libraries/exodus/test/testrd-oned.dmp +++ b/packages/seacas/libraries/exodus/test/testrd-oned.dmp @@ -13,7 +13,7 @@ num_side_sets = 2 after ex_inquire, error = 0 after ex_get_coord, error = 0 -x coords = +x coords = 1.0 1.1 1.2 @@ -44,16 +44,16 @@ nodal attribute 0 = 'Node_attr_1' 2.5 after ex_get_id_map, error = 0 -elem_id_map(0) = 10 -elem_id_map(1) = 20 -elem_id_map(2) = 30 -elem_id_map(3) = 40 -elem_id_map(4) = 50 -elem_id_map(5) = 60 -elem_id_map(6) = 70 -elem_id_map(7) = 80 -elem_id_map(8) = 90 -elem_id_map(9) = 100 +elem_id_map(0) = 10 +elem_id_map(1) = 20 +elem_id_map(2) = 30 +elem_id_map(3) = 40 +elem_id_map(4) = 50 +elem_id_map(5) = 60 +elem_id_map(6) = 70 +elem_id_map(7) = 80 +elem_id_map(8) = 90 +elem_id_map(9) = 100 after ex_get_elem_blk_ids, error = 0 @@ -119,7 +119,7 @@ after ex_get_names, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 name = 'all_odd_nodes' @@ -152,7 +152,7 @@ nodeset attribute 0 = 'Nodeset_attribute' after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 name = 'some_even_nodes' @@ -189,16 +189,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 1 3 5 @@ -207,7 +207,7 @@ node_list = 2 4 6 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -276,33 +276,33 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 2, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 1 2 -num_elem_per_set = +num_elem_per_set = 1 1 -num_dist_per_set = +num_dist_per_set = 1 1 -elem_ind = +elem_ind = 0 1 -dist_ind = +dist_ind = 0 1 -elem_list = +elem_list = 1 9 -side_list = +side_list = 1 2 -dist_fact = +dist_fact = 2.000 3.000 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -315,7 +315,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' '' diff --git a/packages/seacas/libraries/exodus/test/testrd.dmp b/packages/seacas/libraries/exodus/test/testrd.dmp index d44c65196b..3f94abce4b 100644 --- a/packages/seacas/libraries/exodus/test/testrd.dmp +++ b/packages/seacas/libraries/exodus/test/testrd.dmp @@ -13,7 +13,7 @@ num_side_sets = 5 after ex_inquire, error = 0 after ex_get_coord, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -47,7 +47,7 @@ x coords = 0.0 10.0 10.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -81,7 +81,7 @@ y coords = 0.0 0.0 10.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -195,13 +195,13 @@ nodal attribute 1 = 'Node_attr_2' 10.0 after ex_get_id_map, error = 0 -elem_id_map(0) = 10 -elem_id_map(1) = 20 -elem_id_map(2) = 30 -elem_id_map(3) = 40 -elem_id_map(4) = 50 -elem_id_map(5) = 60 -elem_id_map(6) = 70 +elem_id_map(0) = 10 +elem_id_map(1) = 20 +elem_id_map(2) = 30 +elem_id_map(3) = 40 +elem_id_map(4) = 50 +elem_id_map(5) = 60 +elem_id_map(6) = 70 after ex_get_elem_blk_ids, error = 0 @@ -374,7 +374,7 @@ after ex_get_names, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 name = 'nset_1' @@ -407,7 +407,7 @@ nodeset attribute 0 = 'Nodeset_attribute' after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 name = 'nset_2' @@ -444,16 +444,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -462,7 +462,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -733,37 +733,37 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 8 10 -num_dist_per_set = +num_dist_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 0 2 4 11 19 -dist_ind = +dist_ind = 0 4 8 8 8 -elem_list = +elem_list = 2 2 1 @@ -793,7 +793,7 @@ elem_list = 7 7 7 -side_list = +side_list = 4 2 2 @@ -823,7 +823,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -834,7 +834,7 @@ dist_fact = 31.300 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -847,7 +847,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' 'This info record is exactly 80 characters long. last character should be pipe |' diff --git a/packages/seacas/libraries/exodus/test/testrd1.dmp b/packages/seacas/libraries/exodus/test/testrd1.dmp index dd4a05c55d..135f3905c8 100644 --- a/packages/seacas/libraries/exodus/test/testrd1.dmp +++ b/packages/seacas/libraries/exodus/test/testrd1.dmp @@ -14,7 +14,7 @@ num_node_sets = 2 num_side_sets = 5 after ex_get_coord, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -43,7 +43,7 @@ x coords = 3.0 6.0 0.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -72,7 +72,7 @@ y coords = 2.0 2.0 2.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -112,25 +112,25 @@ after ex_get_prop_array, error = 0 after ex_get_elem_map, error = 0 element map id = 111 -elem_map(0) = 1 -elem_map(1) = 2 -elem_map(2) = 3 -elem_map(3) = 4 -elem_map(4) = 5 -elem_map(5) = 6 -elem_map(6) = 7 -elem_map(7) = 8 +elem_map(0) = 1 +elem_map(1) = 2 +elem_map(2) = 3 +elem_map(3) = 4 +elem_map(4) = 5 +elem_map(5) = 6 +elem_map(6) = 7 +elem_map(7) = 8 after ex_get_elem_map, error = 0 element map id = 222 -elem_map(0) = 2 -elem_map(1) = 4 -elem_map(2) = 6 -elem_map(3) = 8 -elem_map(4) = 10 -elem_map(5) = 12 -elem_map(6) = 14 -elem_map(7) = 16 +elem_map(0) = 2 +elem_map(1) = 4 +elem_map(2) = 6 +elem_map(3) = 8 +elem_map(4) = 10 +elem_map(5) = 12 +elem_map(6) = 14 +elem_map(7) = 16 after ex_inquire, error = 0 @@ -150,34 +150,34 @@ after ex_get_prop_array, error = 0 after ex_get_node_map, error = 0 node map id = 333 -node_map(0) = 3 -node_map(1) = 6 -node_map(2) = 9 -node_map(3) = 12 -node_map(4) = 15 -node_map(5) = 18 -node_map(6) = 21 -node_map(7) = 24 -node_map(8) = 27 -node_map(9) = 30 -node_map(10) = 33 -node_map(11) = 36 -node_map(12) = 39 -node_map(13) = 42 -node_map(14) = 45 -node_map(15) = 48 -node_map(16) = 51 -node_map(17) = 54 -node_map(18) = 57 -node_map(19) = 60 -node_map(20) = 63 -node_map(21) = 66 -node_map(22) = 69 -node_map(23) = 72 -node_map(24) = 75 -node_map(25) = 78 -node_map(26) = 81 -node_map(27) = 84 +node_map(0) = 3 +node_map(1) = 6 +node_map(2) = 9 +node_map(3) = 12 +node_map(4) = 15 +node_map(5) = 18 +node_map(6) = 21 +node_map(7) = 24 +node_map(8) = 27 +node_map(9) = 30 +node_map(10) = 33 +node_map(11) = 36 +node_map(12) = 39 +node_map(13) = 42 +node_map(14) = 45 +node_map(15) = 48 +node_map(16) = 51 +node_map(17) = 54 +node_map(18) = 57 +node_map(19) = 60 +node_map(20) = 63 +node_map(21) = 66 +node_map(22) = 69 +node_map(23) = 72 +node_map(24) = 75 +node_map(25) = 78 +node_map(26) = 81 +node_map(27) = 84 after ex_inquire, error = 0 @@ -363,7 +363,7 @@ after ex_get_node_set_ids, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after ex_get_node_set, error = 0 @@ -385,7 +385,7 @@ dist factors for node set 20 after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after ex_get_node_set, error = 0 @@ -421,16 +421,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -439,7 +439,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -637,37 +637,37 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 4 2 -num_dist_per_set = +num_dist_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 0 2 4 11 15 -dist_ind = +dist_ind = 0 4 8 8 8 -elem_list = +elem_list = 3 3 1 @@ -685,7 +685,7 @@ elem_list = 5 6 7 -side_list = +side_list = 6 4 4 @@ -703,7 +703,7 @@ side_list = 4 1 1 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -714,7 +714,7 @@ dist_fact = 31.300 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT1' 'testwt1' '03/16/94' @@ -727,7 +727,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' 'This is the second information record.' 'This is the third information record.' diff --git a/packages/seacas/libraries/exodus/test/testrd_nc.dmp b/packages/seacas/libraries/exodus/test/testrd_nc.dmp index e50ee4c6b8..f079480612 100644 --- a/packages/seacas/libraries/exodus/test/testrd_nc.dmp +++ b/packages/seacas/libraries/exodus/test/testrd_nc.dmp @@ -14,7 +14,7 @@ num_side_sets = 5 after ex_get_coord, error = 0 after ex_get_coord (x), error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -50,7 +50,7 @@ x coords = 10.0 after ex_get_coord (y), error = 0 -y coords = +y coords = 0.0 0.0 1.0 @@ -86,7 +86,7 @@ y coords = 10.0 after ex_get_coord (z), error = 0 -z coords = +z coords = 0.0 0.0 0.0 @@ -126,13 +126,13 @@ x coord name = 'xcoor' y coord name = 'ycoor' after ex_get_id_map, error = 0 -elem_map(0) = 10 -elem_map(1) = 20 -elem_map(2) = 30 -elem_map(3) = 40 -elem_map(4) = 50 -elem_map(5) = 60 -elem_map(6) = 70 +elem_map(0) = 10 +elem_map(1) = 20 +elem_map(2) = 30 +elem_map(3) = 40 +elem_map(4) = 50 +elem_map(5) = 60 +elem_map(6) = 70 after ex_get_elem_blk_ids, error = 0 @@ -294,7 +294,7 @@ after ex_get_node_set_ids, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after ex_get_node_set, error = 0 @@ -316,7 +316,7 @@ dist factors for node set 20 after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after ex_get_node_set, error = 0 @@ -352,16 +352,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -370,7 +370,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -636,37 +636,37 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 8 10 -num_dist_per_set = +num_dist_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 0 2 4 11 19 -dist_ind = +dist_ind = 0 4 8 8 8 -elem_list = +elem_list = 2 2 1 @@ -696,7 +696,7 @@ elem_list = 7 7 7 -side_list = +side_list = 4 2 2 @@ -726,7 +726,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -737,7 +737,7 @@ dist_fact = 31.300 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -750,7 +750,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' 'This info record is exactly 80 characters long. last character should be pipe |' diff --git a/packages/seacas/libraries/exodus/test/testrd_ss.dmp b/packages/seacas/libraries/exodus/test/testrd_ss.dmp index c40e1b94e4..a44a2841e8 100644 --- a/packages/seacas/libraries/exodus/test/testrd_ss.dmp +++ b/packages/seacas/libraries/exodus/test/testrd_ss.dmp @@ -411,7 +411,7 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 @@ -421,7 +421,7 @@ ids = 36 37 38 -num_elem_per_set = +num_elem_per_set = 0 0 2 @@ -431,7 +431,7 @@ num_elem_per_set = 2 4 2 -num_dist_per_set = +num_dist_per_set = 0 0 4 @@ -441,7 +441,7 @@ num_dist_per_set = 0 0 0 -elem_ind = +elem_ind = 0 0 0 @@ -451,7 +451,7 @@ elem_ind = 15 17 21 -dist_ind = +dist_ind = 0 0 0 @@ -461,7 +461,7 @@ dist_ind = 8 8 8 -elem_list = +elem_list = 2 2 1 @@ -485,7 +485,7 @@ elem_list = 7 8 8 -side_list = +side_list = 4 2 2 @@ -509,7 +509,7 @@ side_list = 6 1 3 -dist_fact = +dist_fact = 30.000 30.100 30.200 diff --git a/packages/seacas/libraries/exodus/test/testrd_zeroe.dmp b/packages/seacas/libraries/exodus/test/testrd_zeroe.dmp index 41b5261351..ea6c7f41d3 100644 --- a/packages/seacas/libraries/exodus/test/testrd_zeroe.dmp +++ b/packages/seacas/libraries/exodus/test/testrd_zeroe.dmp @@ -13,7 +13,7 @@ num_side_sets = 0 after ex_inquire, error = 0 after ex_get_coord, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -47,7 +47,7 @@ x coords = 0.0 10.0 10.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -81,7 +81,7 @@ y coords = 0.0 0.0 10.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -131,7 +131,7 @@ after ex_get_names, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 name = '' @@ -156,7 +156,7 @@ num nodeset attributes for nodeset 20 = 0 after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 name = '' @@ -193,16 +193,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -211,7 +211,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -222,7 +222,7 @@ dist_fact = 3.100 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -235,7 +235,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' '' diff --git a/packages/seacas/libraries/exodus/test/testrd_zeron.dmp b/packages/seacas/libraries/exodus/test/testrd_zeron.dmp index 217fd539e4..2a2409974c 100644 --- a/packages/seacas/libraries/exodus/test/testrd_zeron.dmp +++ b/packages/seacas/libraries/exodus/test/testrd_zeron.dmp @@ -13,7 +13,7 @@ num_side_sets = 0 after ex_inquire, error = 0 after ex_get_coord, error = 0 -x coords = +x coords = after ex_get_coord_names, error = 0 x coord name = 'xcoor' @@ -23,7 +23,7 @@ num nodal attributes = 0 after ex_get_id_map, error = 0 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWT' 'testwt' '07/07/93' @@ -36,7 +36,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' '' '' diff --git a/packages/seacas/libraries/exodus/test/testrdd.dmp b/packages/seacas/libraries/exodus/test/testrdd.dmp index e95e8f8cda..fc5fbfcb2d 100644 --- a/packages/seacas/libraries/exodus/test/testrdd.dmp +++ b/packages/seacas/libraries/exodus/test/testrdd.dmp @@ -13,7 +13,7 @@ num_node_sets = 2 num_side_sets = 5 after ex_get_coord, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -40,7 +40,7 @@ x coords = 3.0 6.0 0.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -67,7 +67,7 @@ y coords = 2.0 2.0 2.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -100,11 +100,11 @@ x coord name = 'xcoor' y coord name = 'ycoor' after ex_get_id_map, error = 0 -elem_map(0) = 1 -elem_map(1) = 2 -elem_map(2) = 3 -elem_map(3) = 4 -elem_map(4) = 5 +elem_map(0) = 1 +elem_map(1) = 2 +elem_map(2) = 3 +elem_map(3) = 4 +elem_map(4) = 5 after ex_get_elem_blk_ids, error = 0 @@ -223,7 +223,7 @@ after ex_get_node_set_ids, error = 0 after ex_get_node_set_param, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after ex_get_node_set, error = 0 @@ -245,7 +245,7 @@ dist factors for node set 20 after ex_get_node_set_param, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after ex_get_node_set, error = 0 @@ -281,16 +281,16 @@ after ex_inquire: EX_INQ_NS_DF_LEN = 8, error = 0 after ex_get_concat_node_sets, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 0 5 -node_list = +node_list = 10 11 12 @@ -299,7 +299,7 @@ node_list = 20 21 22 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -519,37 +519,37 @@ after ex_inquire: EX_INQ_SS_DF_LEN = 8, error = 0 after ex_get_concat_side_sets, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 4 5 -num_dist_per_set = +num_dist_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 0 2 4 11 15 -dist_ind = +dist_ind = 0 4 8 8 8 -elem_list = +elem_list = 2 2 1 @@ -570,7 +570,7 @@ elem_list = 5 5 5 -side_list = +side_list = 4 2 2 @@ -591,7 +591,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -602,7 +602,7 @@ dist_fact = 31.300 after ex_get_qa, error = 0 -QA records = +QA records = 'TESTWTD' 'testwtd' '07/07/93' @@ -615,7 +615,7 @@ QA records = after ex_inquire, error = 0 after ex_get_info, error = 0 -info records = +info records = 'This is the first information record.' 'This is the second information record.' 'This is the third information record.' diff --git a/packages/seacas/libraries/exodus/test/testwt-blob.dmp b/packages/seacas/libraries/exodus/test/testwt-blob.dmp index 6d32177ea0..4e9cf1a09b 100644 --- a/packages/seacas/libraries/exodus/test/testwt-blob.dmp +++ b/packages/seacas/libraries/exodus/test/testwt-blob.dmp @@ -107,62 +107,62 @@ data: 0.16, 1.16, 2.16, 3.16, 4.16, 5.16, 6.16, 7.16, 8.16, 9.16 ; vals_blob_var1blob200 = - 0.03, 1.03, 2.03, 3.03, 4.03, 5.03, 6.03, 7.03, 8.03, 9.03, 10.03, 11.03, + 0.03, 1.03, 2.03, 3.03, 4.03, 5.03, 6.03, 7.03, 8.03, 9.03, 10.03, 11.03, 12.03, 13.03, 14.03, 15.03, 16.03, 17.03, 18.03, 19.03, - 0.05, 1.05, 2.05, 3.05, 4.05, 5.05, 6.05, 7.05, 8.05, 9.05, 10.05, 11.05, + 0.05, 1.05, 2.05, 3.05, 4.05, 5.05, 6.05, 7.05, 8.05, 9.05, 10.05, 11.05, 12.05, 13.05, 14.05, 15.05, 16.05, 17.05, 18.05, 19.05, - 0.07, 1.07, 2.07, 3.07, 4.07, 5.07, 6.07, 7.07, 8.07, 9.07, 10.07, 11.07, + 0.07, 1.07, 2.07, 3.07, 4.07, 5.07, 6.07, 7.07, 8.07, 9.07, 10.07, 11.07, 12.07, 13.07, 14.07, 15.07, 16.07, 17.07, 18.07, 19.07, - 0.09, 1.09, 2.09, 3.09, 4.09, 5.09, 6.09, 7.09, 8.09, 9.09, 10.09, 11.09, + 0.09, 1.09, 2.09, 3.09, 4.09, 5.09, 6.09, 7.09, 8.09, 9.09, 10.09, 11.09, 12.09, 13.09, 14.09, 15.09, 16.09, 17.09, 18.09, 19.09 ; vals_blob_var2blob200 = - 0.04, 1.04, 2.04, 3.04, 4.04, 5.04, 6.04, 7.04, 8.04, 9.04, 10.04, 11.04, + 0.04, 1.04, 2.04, 3.04, 4.04, 5.04, 6.04, 7.04, 8.04, 9.04, 10.04, 11.04, 12.04, 13.04, 14.04, 15.04, 16.04, 17.04, 18.04, 19.04, - 0.07, 1.07, 2.07, 3.07, 4.07, 5.07, 6.07, 7.07, 8.07, 9.07, 10.07, 11.07, + 0.07, 1.07, 2.07, 3.07, 4.07, 5.07, 6.07, 7.07, 8.07, 9.07, 10.07, 11.07, 12.07, 13.07, 14.07, 15.07, 16.07, 17.07, 18.07, 19.07, - 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 8.1, 9.1, 10.1, 11.1, 12.1, 13.1, + 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 8.1, 9.1, 10.1, 11.1, 12.1, 13.1, 14.1, 15.1, 16.1, 17.1, 18.1, 19.1, - 0.13, 1.13, 2.13, 3.13, 4.13, 5.13, 6.13, 7.13, 8.13, 9.13, 10.13, 11.13, + 0.13, 1.13, 2.13, 3.13, 4.13, 5.13, 6.13, 7.13, 8.13, 9.13, 10.13, 11.13, 12.13, 13.13, 14.13, 15.13, 16.13, 17.13, 18.13, 19.13 ; vals_blob_var3blob200 = - 0.05, 1.05, 2.05, 3.05, 4.05, 5.05, 6.05, 7.05, 8.05, 9.05, 10.05, 11.05, + 0.05, 1.05, 2.05, 3.05, 4.05, 5.05, 6.05, 7.05, 8.05, 9.05, 10.05, 11.05, 12.05, 13.05, 14.05, 15.05, 16.05, 17.05, 18.05, 19.05, - 0.09, 1.09, 2.09, 3.09, 4.09, 5.09, 6.09, 7.09, 8.09, 9.09, 10.09, 11.09, + 0.09, 1.09, 2.09, 3.09, 4.09, 5.09, 6.09, 7.09, 8.09, 9.09, 10.09, 11.09, 12.09, 13.09, 14.09, 15.09, 16.09, 17.09, 18.09, 19.09, - 0.13, 1.13, 2.13, 3.13, 4.13, 5.13, 6.13, 7.13, 8.13, 9.13, 10.13, 11.13, + 0.13, 1.13, 2.13, 3.13, 4.13, 5.13, 6.13, 7.13, 8.13, 9.13, 10.13, 11.13, 12.13, 13.13, 14.13, 15.13, 16.13, 17.13, 18.13, 19.13, - 0.17, 1.17, 2.17, 3.17, 4.17, 5.17, 6.17, 7.17, 8.17, 9.17, 10.17, 11.17, + 0.17, 1.17, 2.17, 3.17, 4.17, 5.17, 6.17, 7.17, 8.17, 9.17, 10.17, 11.17, 12.17, 13.17, 14.17, 15.17, 16.17, 17.17, 18.17, 19.17 ; vals_blob_var1blob300 = - 0.04, 1.04, 2.04, 3.04, 4.04, 5.04, 6.04, 7.04, 8.04, 9.04, 10.04, 11.04, + 0.04, 1.04, 2.04, 3.04, 4.04, 5.04, 6.04, 7.04, 8.04, 9.04, 10.04, 11.04, 12.04, 13.04, 14.04, - 0.06, 1.06, 2.06, 3.06, 4.06, 5.06, 6.06, 7.06, 8.06, 9.06, 10.06, 11.06, + 0.06, 1.06, 2.06, 3.06, 4.06, 5.06, 6.06, 7.06, 8.06, 9.06, 10.06, 11.06, 12.06, 13.06, 14.06, - 0.08, 1.08, 2.08, 3.08, 4.08, 5.08, 6.08, 7.08, 8.08, 9.08, 10.08, 11.08, + 0.08, 1.08, 2.08, 3.08, 4.08, 5.08, 6.08, 7.08, 8.08, 9.08, 10.08, 11.08, 12.08, 13.08, 14.08, - 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 8.1, 9.1, 10.1, 11.1, 12.1, 13.1, + 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 8.1, 9.1, 10.1, 11.1, 12.1, 13.1, 14.1 ; vals_blob_var2blob300 = - 0.05, 1.05, 2.05, 3.05, 4.05, 5.05, 6.05, 7.05, 8.05, 9.05, 10.05, 11.05, + 0.05, 1.05, 2.05, 3.05, 4.05, 5.05, 6.05, 7.05, 8.05, 9.05, 10.05, 11.05, 12.05, 13.05, 14.05, - 0.08, 1.08, 2.08, 3.08, 4.08, 5.08, 6.08, 7.08, 8.08, 9.08, 10.08, 11.08, + 0.08, 1.08, 2.08, 3.08, 4.08, 5.08, 6.08, 7.08, 8.08, 9.08, 10.08, 11.08, 12.08, 13.08, 14.08, - 0.11, 1.11, 2.11, 3.11, 4.11, 5.11, 6.11, 7.11, 8.11, 9.11, 10.11, 11.11, + 0.11, 1.11, 2.11, 3.11, 4.11, 5.11, 6.11, 7.11, 8.11, 9.11, 10.11, 11.11, 12.11, 13.11, 14.11, - 0.14, 1.14, 2.14, 3.14, 4.14, 5.14, 6.14, 7.14, 8.14, 9.14, 10.14, 11.14, + 0.14, 1.14, 2.14, 3.14, 4.14, 5.14, 6.14, 7.14, 8.14, 9.14, 10.14, 11.14, 12.14, 13.14, 14.14 ; vals_blob_var3blob300 = - 0.06, 1.06, 2.06, 3.06, 4.06, 5.06, 6.06, 7.06, 8.06, 9.06, 10.06, 11.06, + 0.06, 1.06, 2.06, 3.06, 4.06, 5.06, 6.06, 7.06, 8.06, 9.06, 10.06, 11.06, 12.06, 13.06, 14.06, - 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 8.1, 9.1, 10.1, 11.1, 12.1, 13.1, + 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 8.1, 9.1, 10.1, 11.1, 12.1, 13.1, 14.1, - 0.14, 1.14, 2.14, 3.14, 4.14, 5.14, 6.14, 7.14, 8.14, 9.14, 10.14, 11.14, + 0.14, 1.14, 2.14, 3.14, 4.14, 5.14, 6.14, 7.14, 8.14, 9.14, 10.14, 11.14, 12.14, 13.14, 14.14, - 0.18, 1.18, 2.18, 3.18, 4.18, 5.18, 6.18, 7.18, 8.18, 9.18, 10.18, 11.18, + 0.18, 1.18, 2.18, 3.18, 4.18, 5.18, 6.18, 7.18, 8.18, 9.18, 10.18, 11.18, 12.18, 13.18, 14.18 ; } diff --git a/packages/seacas/libraries/exodus/test/update_all_tests b/packages/seacas/libraries/exodus/test/update_all_tests index 5a8019dd89..dc84ef8ee7 100644 --- a/packages/seacas/libraries/exodus/test/update_all_tests +++ b/packages/seacas/libraries/exodus/test/update_all_tests @@ -1,7 +1,7 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. @@ -24,7 +24,7 @@ ${NCDUMP} -d5,5 test.exo | grep -v version | grep -v int64_status| grep -v _Fill echo "testrd - single precision read test..." echo "begin testrd" >> test.output -${PREFIX} ${SRCDIR}/testrd | grep -v version > ${SRCDIR}/testrd.dmp +${PREFIX} ${SRCDIR}/testrd | grep -v version > ${SRCDIR}/testrd.dmp echo "end testrd" >> test.output echo "testrdv - single precision read test with varid..." @@ -54,7 +54,7 @@ echo "testcp_nl - normal_model to large_model single precision copy test..." echo "begin testcp_nl" >> test.output ${PREFIX} ${SRCDIR}/testcp_nl >> test.output echo "end testcp_nl" >> test.output -${NCDUMP} -d5,5 testcp_nl.exo | grep -v version | grep -v int64_status| grep -v _FillValue > ${SRCDIR}/testcp_nl.dmp +${NCDUMP} -d5,5 testcp_nl.exo | grep -v version | grep -v int64_status| grep -v _FillValue > ${SRCDIR}/testcp_nl.dmp echo "testwt_clb - single precision write test using concatenated puts..." echo "begin testwt_clb" >> test.output @@ -90,13 +90,13 @@ echo "testwt1 ... [Expect WEDGE6 warning from this test]" echo "begin testwt1" >> test.output ${PREFIX} ${SRCDIR}/testwt1 >> test.output echo "end testwt1" >> test.output -${NCDUMP} -d5,5 test.exo | grep -v version | grep -v int64_status| grep -v _FillValue > ${SRCDIR}/test1.dmp +${NCDUMP} -d5,5 test.exo | grep -v version | grep -v int64_status| grep -v _FillValue > ${SRCDIR}/test1.dmp echo "testrd1 - single precision read test of a file with several side sets..." echo "testrd1 ... [Expect file create failure error, NOCLOBBER]" echo "testrd1 ... [Expect failure locating elem var 1 for elem block 12]" echo "begin testrd1" >> test.output -${PREFIX} ${SRCDIR}/testrd1 | grep -v version > ${SRCDIR}/testrd1.dmp +${PREFIX} ${SRCDIR}/testrd1 | grep -v version > ${SRCDIR}/testrd1.dmp echo "end testrd1" >> test.output echo "testwt_ss - write files to test side sets..." @@ -155,7 +155,7 @@ ${NCDUMP} -d5,5 test.exo | grep -v version | grep -v int64_status| grep -v _Fill echo "testrd - read test of file with zero elements..." echo "begin testrd zero elements" >> test.output -${PREFIX} ${SRCDIR}/testrd | grep -v version > ${SRCDIR}/testrd_zeroe.dmp +${PREFIX} ${SRCDIR}/testrd | grep -v version > ${SRCDIR}/testrd_zeroe.dmp echo "end testrd zero elements" >> test.output echo "testwt-one-attrib - read/write test of element attributes - read one at a time..." @@ -193,7 +193,7 @@ ${NCDUMP} -d5,5 test.exo | grep -v version | grep -v int64_status| grep -v _Fill echo "testrd - read long name file truncating to 32 characters on read..." echo "begin testrd (truncate)" >> test.output -${PREFIX} ${SRCDIR}/testrd | grep -v version > ${SRCDIR}/testrd-nm32.dmp +${PREFIX} ${SRCDIR}/testrd | grep -v version > ${SRCDIR}/testrd-nm32.dmp echo "end testrd (truncate)" >> test.output echo "testrd-long-name - read long name file..." diff --git a/packages/seacas/libraries/exodus_for/src/addrwrap.F b/packages/seacas/libraries/exodus_for/src/addrwrap.F index 4ba73d1376..d5ae5c7f34 100644 --- a/packages/seacas/libraries/exodus_for/src/addrwrap.F +++ b/packages/seacas/libraries/exodus_for/src/addrwrap.F @@ -1,4 +1,4 @@ -C Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +C Copyright(C) 1999-2020, 2022, 2024 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. C @@ -1204,7 +1204,7 @@ SUBROUTINE EXGSSC (IDEXO, IDESS, INCNT, IERR) IDEXO4 = IDEXO CALL EXGSSC4 (IDEXO4, IDESS, INCNT, IERR4) IERR = IERR4 - + END SUBROUTINE EXGCSSC (IDEXO, INCNT, IERR) diff --git a/packages/seacas/libraries/exodus_for/test/test-nsided.dmp b/packages/seacas/libraries/exodus_for/test/test-nsided.dmp index 0110289078..d2a7255b5f 100644 --- a/packages/seacas/libraries/exodus_for/test/test-nsided.dmp +++ b/packages/seacas/libraries/exodus_for/test/test-nsided.dmp @@ -49,13 +49,13 @@ data: eb_prop1 = 10 ; - coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, + coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, 6, 0, 3, 6, 0, 2.7, 6, 5.7, 3.7, 0, 10, 10 ; - coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, + coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, 0, 0, 2, 2, 2, 1.7, 1.7, 1.7, 0, 0, 0, 10 ; - coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, + coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, 6, 0, 0, 6, 2, 0, 2.7, 3.3, 1.7, 2.3, 0, 0, 10 ; eb_names = @@ -68,7 +68,7 @@ data: elem_map = 1, 2, 3, 4, 5, 6, 7 ; - connect1 = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + connect1 = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 17, 18, 19, 20, 27, 28, 30, 29, 31, 32, 33 ; ebepecnt1 = 4, 4, 8, 4, 6, 8, 3 ; @@ -87,8 +87,8 @@ data: "This is the second information record.", "This is the third information record." ; - frame_coordinates = 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.1, 1.2, - 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, + frame_coordinates = 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.1, 1.2, + 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9 ; frame_ids = 1, 11, 111 ; diff --git a/packages/seacas/libraries/exodus_for/test/test.dmp b/packages/seacas/libraries/exodus_for/test/test.dmp index a8fa396617..143456acd7 100644 --- a/packages/seacas/libraries/exodus_for/test/test.dmp +++ b/packages/seacas/libraries/exodus_for/test/test.dmp @@ -152,13 +152,13 @@ data: ss_prop1 = 30, 31, 32, 33, 34 ; - coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, + coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, 6, 0, 3, 6, 0 ; - coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, + coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, 0, 0, 2, 2, 2 ; - coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, + coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, 6, 0, 0, 6, 2, 0 ; eb_names = @@ -307,55 +307,55 @@ data: "nod_var1" ; vals_nod_var1 = - 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, - 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, + 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, + 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, - 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, + 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, 1.28, 1.3, 1.32, 1.34, 1.36, 1.38, 1.4, 1.42, 1.44, 1.46, 1.48, 1.5, 1.52, - 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, - 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, + 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, + 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, 1.75, 1.78, - 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, + 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, 1.56, 1.6, 1.64, 1.68, 1.72, 1.76, 1.8, 1.84, 1.88, 1.92, 1.96, 2, 2.04, - 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, + 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2, 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, - 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, + 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, 1.84, 1.9, 1.96, 2.02, 2.08, 2.14, 2.2, 2.26, 2.32, 2.38, 2.44, 2.5, 2.56, - 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, - 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, + 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, + 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, 2.75, 2.82, - 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, + 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, 2.12, 2.2, 2.28, 2.36, 2.44, 2.52, 2.6, 2.68, 2.76, 2.84, 2.92, 3, 3.08, - 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, - 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, + 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, + 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, 3.25, 3.34, - 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, + 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6 ; vals_nod_var2 = - 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, - 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, + 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, + 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, - 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, + 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, 2.28, 2.3, 2.32, 2.34, 2.36, 2.38, 2.4, 2.42, 2.44, 2.46, 2.48, 2.5, 2.52, - 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, - 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, + 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, + 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, 2.75, 2.78, - 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, + 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, 2.56, 2.6, 2.64, 2.68, 2.72, 2.76, 2.8, 2.84, 2.88, 2.92, 2.96, 3, 3.04, - 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, + 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, 2.7, 2.75, 2.8, 2.85, 2.9, 2.95, 3, 3.05, 3.1, 3.15, 3.2, 3.25, 3.3, - 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, + 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, 2.84, 2.9, 2.96, 3.02, 3.08, 3.14, 3.2, 3.26, 3.32, 3.38, 3.44, 3.5, 3.56, - 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, - 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, + 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, + 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, 3.75, 3.82, - 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, + 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, 3.12, 3.2, 3.28, 3.36, 3.44, 3.52, 3.6, 3.68, 3.76, 3.84, 3.92, 4, 4.08, - 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, - 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, + 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, + 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, 4.25, 4.34, - 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, + 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6 ; name_elem_var = diff --git a/packages/seacas/libraries/exodus_for/test/test1.dmp b/packages/seacas/libraries/exodus_for/test/test1.dmp index c99fea1a47..c800bedb27 100644 --- a/packages/seacas/libraries/exodus_for/test/test1.dmp +++ b/packages/seacas/libraries/exodus_for/test/test1.dmp @@ -186,13 +186,13 @@ data: ss_prop1 = 30, 31, 32, 33, 34 ; - coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, + coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 100, 50, 3, 6, 0, 3, 6, 0 ; - coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, + coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 100, 50, 0, 0, 0, 2, 2, 2 ; - coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, + coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, 0, 20, 6, 0, 0, 6, 2, 0 ; eb_names = @@ -225,7 +225,7 @@ data: nmap_names = "" ; - node_map1 = 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, + node_map1 = 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84 ; em_prop1 = 111, 222 ; @@ -399,65 +399,65 @@ data: "nod_var1" ; vals_nod_var1 = - 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, - 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, + 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, + 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, 1.27, 1.28, - 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, - 1.28, 1.3, 1.32, 1.34, 1.36, 1.38, 1.4, 1.42, 1.44, 1.46, 1.48, 1.5, + 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, + 1.28, 1.3, 1.32, 1.34, 1.36, 1.38, 1.4, 1.42, 1.44, 1.46, 1.48, 1.5, 1.52, 1.54, 1.56, - 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, - 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, + 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, + 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, 1.75, 1.78, 1.81, 1.84, - 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, - 1.56, 1.6, 1.64, 1.68, 1.72, 1.76, 1.8, 1.84, 1.88, 1.92, 1.96, 2, 2.04, + 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, + 1.56, 1.6, 1.64, 1.68, 1.72, 1.76, 1.8, 1.84, 1.88, 1.92, 1.96, 2, 2.04, 2.08, 2.12, - 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, - 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2, 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, + 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, + 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2, 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, - 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, - 1.84, 1.9, 1.96, 2.02, 2.08, 2.14, 2.2, 2.26, 2.32, 2.38, 2.44, 2.5, + 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, + 1.84, 1.9, 1.96, 2.02, 2.08, 2.14, 2.2, 2.26, 2.32, 2.38, 2.44, 2.5, 2.56, 2.62, 2.68, - 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, - 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, + 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, + 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, 2.75, 2.82, 2.89, 2.96, - 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, - 2.12, 2.2, 2.28, 2.36, 2.44, 2.52, 2.6, 2.68, 2.76, 2.84, 2.92, 3, 3.08, + 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, + 2.12, 2.2, 2.28, 2.36, 2.44, 2.52, 2.6, 2.68, 2.76, 2.84, 2.92, 3, 3.08, 3.16, 3.24, - 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, - 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, + 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, + 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, 3.25, 3.34, 3.43, 3.52, - 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, + 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8 ; vals_nod_var2 = - 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, - 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, + 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, + 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, 2.27, 2.28, - 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, - 2.28, 2.3, 2.32, 2.34, 2.36, 2.38, 2.4, 2.42, 2.44, 2.46, 2.48, 2.5, + 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, + 2.28, 2.3, 2.32, 2.34, 2.36, 2.38, 2.4, 2.42, 2.44, 2.46, 2.48, 2.5, 2.52, 2.54, 2.56, - 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, - 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, + 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, + 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, 2.75, 2.78, 2.81, 2.84, - 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, - 2.56, 2.6, 2.64, 2.68, 2.72, 2.76, 2.8, 2.84, 2.88, 2.92, 2.96, 3, 3.04, + 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, + 2.56, 2.6, 2.64, 2.68, 2.72, 2.76, 2.8, 2.84, 2.88, 2.92, 2.96, 3, 3.04, 3.08, 3.12, - 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, - 2.7, 2.75, 2.8, 2.85, 2.9, 2.95, 3, 3.05, 3.1, 3.15, 3.2, 3.25, 3.3, + 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, + 2.7, 2.75, 2.8, 2.85, 2.9, 2.95, 3, 3.05, 3.1, 3.15, 3.2, 3.25, 3.3, 3.35, 3.4, - 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, - 2.84, 2.9, 2.96, 3.02, 3.08, 3.14, 3.2, 3.26, 3.32, 3.38, 3.44, 3.5, + 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, + 2.84, 2.9, 2.96, 3.02, 3.08, 3.14, 3.2, 3.26, 3.32, 3.38, 3.44, 3.5, 3.56, 3.62, 3.68, - 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, - 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, + 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, + 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, 3.75, 3.82, 3.89, 3.96, - 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, - 3.12, 3.2, 3.28, 3.36, 3.44, 3.52, 3.6, 3.68, 3.76, 3.84, 3.92, 4, 4.08, + 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, + 3.12, 3.2, 3.28, 3.36, 3.44, 3.52, 3.6, 3.68, 3.76, 3.84, 3.92, 4, 4.08, 4.16, 4.24, - 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, - 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, + 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, + 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, 4.25, 4.34, 4.43, 4.52, - 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, + 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8 ; name_elem_var = diff --git a/packages/seacas/libraries/exodus_for/test/test2-1.dmp b/packages/seacas/libraries/exodus_for/test/test2-1.dmp index d8bba9eac7..1f8d317290 100644 --- a/packages/seacas/libraries/exodus_for/test/test2-1.dmp +++ b/packages/seacas/libraries/exodus_for/test/test2-1.dmp @@ -152,13 +152,13 @@ data: ss_prop1 = 30, 31, 32, 33, 34 ; - coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, + coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, 6, 0, 3, 6, 0 ; - coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, + coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, 0, 0, 2, 2, 2 ; - coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, + coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, 6, 0, 0, 6, 2, 0 ; eb_names = @@ -307,55 +307,55 @@ data: "nod_var1" ; vals_nod_var1 = - 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, - 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, + 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, + 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, - 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, + 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, 1.28, 1.3, 1.32, 1.34, 1.36, 1.38, 1.4, 1.42, 1.44, 1.46, 1.48, 1.5, 1.52, - 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, - 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, + 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, + 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, 1.75, 1.78, - 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, + 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, 1.56, 1.6, 1.64, 1.68, 1.72, 1.76, 1.8, 1.84, 1.88, 1.92, 1.96, 2, 2.04, - 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, + 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2, 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, - 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, + 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, 1.84, 1.9, 1.96, 2.02, 2.08, 2.14, 2.2, 2.26, 2.32, 2.38, 2.44, 2.5, 2.56, - 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, - 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, + 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, + 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, 2.75, 2.82, - 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, + 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, 2.12, 2.2, 2.28, 2.36, 2.44, 2.52, 2.6, 2.68, 2.76, 2.84, 2.92, 3, 3.08, - 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, - 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, + 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, + 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, 3.25, 3.34, - 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, + 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6 ; vals_nod_var2 = - 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, - 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, + 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, + 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, - 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, + 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, 2.28, 2.3, 2.32, 2.34, 2.36, 2.38, 2.4, 2.42, 2.44, 2.46, 2.48, 2.5, 2.52, - 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, - 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, + 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, + 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, 2.75, 2.78, - 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, + 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, 2.56, 2.6, 2.64, 2.68, 2.72, 2.76, 2.8, 2.84, 2.88, 2.92, 2.96, 3, 3.04, - 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, + 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, 2.7, 2.75, 2.8, 2.85, 2.9, 2.95, 3, 3.05, 3.1, 3.15, 3.2, 3.25, 3.3, - 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, + 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, 2.84, 2.9, 2.96, 3.02, 3.08, 3.14, 3.2, 3.26, 3.32, 3.38, 3.44, 3.5, 3.56, - 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, - 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, + 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, + 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, 3.75, 3.82, - 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, + 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, 3.12, 3.2, 3.28, 3.36, 3.44, 3.52, 3.6, 3.68, 3.76, 3.84, 3.92, 4, 4.08, - 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, - 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, + 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, + 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, 4.25, 4.34, - 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, + 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6 ; name_elem_var = diff --git a/packages/seacas/libraries/exodus_for/test/test2-2.dmp b/packages/seacas/libraries/exodus_for/test/test2-2.dmp index c039b85015..38720f6e54 100644 --- a/packages/seacas/libraries/exodus_for/test/test2-2.dmp +++ b/packages/seacas/libraries/exodus_for/test/test2-2.dmp @@ -152,13 +152,13 @@ data: ss_prop1 = 30, 31, 32, 33, 34 ; - coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, + coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, 6, 0, 3, 6, 0 ; - coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, + coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, 0, 0, 2, 2, 2 ; - coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, + coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, 6, 0, 0, 6, 2, 0 ; eb_names = @@ -307,55 +307,55 @@ data: "nod_var1" ; vals_nod_var1 = - 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, - 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, + 1.01, 1.02, 1.03, 1.04, 1.05, 1.06, 1.07, 1.08, 1.09, 1.1, 1.11, 1.12, + 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, - 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, + 1.02, 1.04, 1.06, 1.08, 1.1, 1.12, 1.14, 1.16, 1.18, 1.2, 1.22, 1.24, 1.26, 1.28, 1.3, 1.32, 1.34, 1.36, 1.38, 1.4, 1.42, 1.44, 1.46, 1.48, 1.5, 1.52, - 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, - 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, + 1.03, 1.06, 1.09, 1.12, 1.15, 1.18, 1.21, 1.24, 1.27, 1.3, 1.33, 1.36, + 1.39, 1.42, 1.45, 1.48, 1.51, 1.54, 1.57, 1.6, 1.63, 1.66, 1.69, 1.72, 1.75, 1.78, - 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, + 1.04, 1.08, 1.12, 1.16, 1.2, 1.24, 1.28, 1.32, 1.36, 1.4, 1.44, 1.48, 1.52, 1.56, 1.6, 1.64, 1.68, 1.72, 1.76, 1.8, 1.84, 1.88, 1.92, 1.96, 2, 2.04, - 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, + 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2, 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, - 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, + 1.06, 1.12, 1.18, 1.24, 1.3, 1.36, 1.42, 1.48, 1.54, 1.6, 1.66, 1.72, 1.78, 1.84, 1.9, 1.96, 2.02, 2.08, 2.14, 2.2, 2.26, 2.32, 2.38, 2.44, 2.5, 2.56, - 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, - 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, + 1.07, 1.14, 1.21, 1.28, 1.35, 1.42, 1.49, 1.56, 1.63, 1.7, 1.77, 1.84, + 1.91, 1.98, 2.05, 2.12, 2.19, 2.26, 2.33, 2.4, 2.47, 2.54, 2.61, 2.68, 2.75, 2.82, - 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, + 1.08, 1.16, 1.24, 1.32, 1.4, 1.48, 1.56, 1.64, 1.72, 1.8, 1.88, 1.96, 2.04, 2.12, 2.2, 2.28, 2.36, 2.44, 2.52, 2.6, 2.68, 2.76, 2.84, 2.92, 3, 3.08, - 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, - 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, + 1.09, 1.18, 1.27, 1.36, 1.45, 1.54, 1.63, 1.72, 1.81, 1.9, 1.99, 2.08, + 2.17, 2.26, 2.35, 2.44, 2.53, 2.62, 2.71, 2.8, 2.89, 2.98, 3.07, 3.16, 3.25, 3.34, - 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, + 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6 ; vals_nod_var2 = - 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, - 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, + 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07, 2.08, 2.09, 2.1, 2.11, 2.12, + 2.13, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.2, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, - 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, + 2.02, 2.04, 2.06, 2.08, 2.1, 2.12, 2.14, 2.16, 2.18, 2.2, 2.22, 2.24, 2.26, 2.28, 2.3, 2.32, 2.34, 2.36, 2.38, 2.4, 2.42, 2.44, 2.46, 2.48, 2.5, 2.52, - 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, - 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, + 2.03, 2.06, 2.09, 2.12, 2.15, 2.18, 2.21, 2.24, 2.27, 2.3, 2.33, 2.36, + 2.39, 2.42, 2.45, 2.48, 2.51, 2.54, 2.57, 2.6, 2.63, 2.66, 2.69, 2.72, 2.75, 2.78, - 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, + 2.04, 2.08, 2.12, 2.16, 2.2, 2.24, 2.28, 2.32, 2.36, 2.4, 2.44, 2.48, 2.52, 2.56, 2.6, 2.64, 2.68, 2.72, 2.76, 2.8, 2.84, 2.88, 2.92, 2.96, 3, 3.04, - 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, + 2.05, 2.1, 2.15, 2.2, 2.25, 2.3, 2.35, 2.4, 2.45, 2.5, 2.55, 2.6, 2.65, 2.7, 2.75, 2.8, 2.85, 2.9, 2.95, 3, 3.05, 3.1, 3.15, 3.2, 3.25, 3.3, - 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, + 2.06, 2.12, 2.18, 2.24, 2.3, 2.36, 2.42, 2.48, 2.54, 2.6, 2.66, 2.72, 2.78, 2.84, 2.9, 2.96, 3.02, 3.08, 3.14, 3.2, 3.26, 3.32, 3.38, 3.44, 3.5, 3.56, - 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, - 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, + 2.07, 2.14, 2.21, 2.28, 2.35, 2.42, 2.49, 2.56, 2.63, 2.7, 2.77, 2.84, + 2.91, 2.98, 3.05, 3.12, 3.19, 3.26, 3.33, 3.4, 3.47, 3.54, 3.61, 3.68, 3.75, 3.82, - 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, + 2.08, 2.16, 2.24, 2.32, 2.4, 2.48, 2.56, 2.64, 2.72, 2.8, 2.88, 2.96, 3.04, 3.12, 3.2, 3.28, 3.36, 3.44, 3.52, 3.6, 3.68, 3.76, 3.84, 3.92, 4, 4.08, - 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, - 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, + 2.09, 2.18, 2.27, 2.36, 2.45, 2.54, 2.63, 2.72, 2.81, 2.9, 2.99, 3.08, + 3.17, 3.26, 3.35, 3.44, 3.53, 3.62, 3.71, 3.8, 3.89, 3.98, 4.07, 4.16, 4.25, 4.34, - 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, + 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6 ; name_elem_var = diff --git a/packages/seacas/libraries/exodus_for/test/testcp_ss.dmp b/packages/seacas/libraries/exodus_for/test/testcp_ss.dmp index ed45b8d16e..8f85a59f23 100644 --- a/packages/seacas/libraries/exodus_for/test/testcp_ss.dmp +++ b/packages/seacas/libraries/exodus_for/test/testcp_ss.dmp @@ -118,13 +118,13 @@ data: ss_prop1 = 30, 31, 32, 33, 34 ; - coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, + coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, 6, 0, 3, 6, 0 ; - coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, + coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, 0, 0, 2, 2, 2 ; - coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, + coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, 6, 0, 0, 6, 2, 0 ; eb_names = diff --git a/packages/seacas/libraries/exodus_for/test/testcpnl.dmp b/packages/seacas/libraries/exodus_for/test/testcpnl.dmp index 919ba94a2a..e650b1f191 100644 --- a/packages/seacas/libraries/exodus_for/test/testcpnl.dmp +++ b/packages/seacas/libraries/exodus_for/test/testcpnl.dmp @@ -118,13 +118,13 @@ data: ss_prop1 = 30, 31, 32, 33, 34 ; - coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, + coordx = 0, 1, 1, 0, 1, 2, 2, 1, 0, 10, 10, 1, 1, 10, 10, 1, 0, 1, 10, 7, 3, 6, 0, 3, 6, 0 ; - coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, + coordy = 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 10, 10, 10, 10, 0, 0, 0, 5, 0, 0, 0, 2, 2, 2 ; - coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, + coordz = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -10, 0, 0, -10, -10, 0, 5, 2, 3, 6, 0, 0, 6, 2, 0 ; eb_names = diff --git a/packages/seacas/libraries/exodus_for/test/testpart.f90 b/packages/seacas/libraries/exodus_for/test/testpart.f90 index 3b97d76126..39b1a937af 100644 --- a/packages/seacas/libraries/exodus_for/test/testpart.f90 +++ b/packages/seacas/libraries/exodus_for/test/testpart.f90 @@ -40,7 +40,7 @@ Program TestExoRead_Part call exgnv (exoid, time_step, var_index, num_nodes, var_values,ierr) write (*, '("after exgnv, error = ", i3)' ) ierr write(*,*) var_values - + ! call expnv (exoid, time_step, var_index, num_nodes, var_values,ierr) DeAllocate(var_values) diff --git a/packages/seacas/libraries/exodus_for/test/testrd.dmp b/packages/seacas/libraries/exodus_for/test/testrd.dmp index e29fee84a0..53b30aec70 100644 --- a/packages/seacas/libraries/exodus_for/test/testrd.dmp +++ b/packages/seacas/libraries/exodus_for/test/testrd.dmp @@ -6,7 +6,7 @@ after exopen, error = 0 after exgini, error = 0 database parameters: -title = This is a test +title = This is a test num_dim = 3 num_nodes = 26 num_elem = 5 @@ -15,7 +15,7 @@ num_node_sets = 2 num_side_sets = 5 after exgcor, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -42,7 +42,7 @@ x coords = 3.0 6.0 0.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -69,7 +69,7 @@ y coords = 2.0 2.0 2.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -98,8 +98,8 @@ z coords = 0.0 after exgcon, error = 0 -x coord name = xcoor -y coord name = ycoor +x coord name = xcoor +y coord name = ycoor after exgmap, error = 0 elem_map(1) = 1 @@ -112,40 +112,40 @@ after exgebi, error = 0 after exgelb, error = 0 element block id = 10 -element type = quad -block name = block_a +element type = quad +block name = block_a num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 11 -element type = quad -block name = block_b +element type = quad +block name = block_b num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 12 -element type = hex -block name = block_c +element type = hex +block name = block_c num_elem_in_block = 1 num_nodes_per_elem = 8 num_attr = 1 after exgelb, error = 0 element block id = 13 -element type = tetra -block name = block_d +element type = tetra +block name = block_d num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 14 -element type = wedge -block name = block_e +element type = wedge +block name = block_e num_elem_in_block = 1 num_nodes_per_elem = 6 num_attr = 1 @@ -210,11 +210,11 @@ connect array for elem block 14 26 after exgnams, error = 0 -element block 1 name: block_a -element block 2 name: block_b -element block 3 name: block_c -element block 4 name: block_d -element block 5 name: block_e +element block 1 name: block_a +element block 2 name: block_b +element block 3 name: block_c +element block 4 name: block_d +element block 5 name: block_e after exgeat, error = 0 @@ -250,7 +250,7 @@ after exgnsi, error = 0 after exgnp, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after exgns, error = 0 @@ -272,7 +272,7 @@ dist factors for node set 20 after exgnp, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after exgns, error = 0 @@ -289,8 +289,8 @@ dist factors for node set 21 3.10 after exgnams, error = 0 -node set 1 name: nodeset_a1 -node set 2 name: nodeset_b2 +node set 1 name: nodeset_a1 +node set 2 name: nodeset_b2 There are 3 properties for each node set after exgpn, error = 0 @@ -308,16 +308,16 @@ after EXNSDF = 8 exinq, error = 0 after exgcns, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 1 6 -node_list = +node_list = 100 101 102 @@ -326,7 +326,7 @@ node_list = 200 201 202 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -527,11 +527,11 @@ node list for side set 34 no dist factors for side set 34 after exgnams, error = 0 -side set 1 name: surf_first -side set 2 name: surf_second -side set 3 name: surf_third -side set 4 name: surf_fourth -side set 5 name: surf_fifth +side set 1 name: surf_first +side set 2 name: surf_second +side set 3 name: surf_third +side set 4 name: surf_fourth +side set 5 name: surf_fifth There are 2 properties for each side set after exgpn, error = 0 @@ -556,37 +556,37 @@ after exinq: EXSSDF = 8, error = 0 after exgcss, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 4 5 -num_df_per_set = +num_df_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 1 3 5 12 16 -df_ind = +df_ind = 1 5 9 9 9 -elem_list = +elem_list = 2 2 1 @@ -607,7 +607,7 @@ elem_list = 5 5 5 -side_list = +side_list = 4 2 2 @@ -628,7 +628,7 @@ side_list = 3 4 5 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -639,41 +639,41 @@ dist_fact = 31.300 after exgqa, error = 0 -QA records = -testwt -07/07/93 -15:41:33 -FASTQ -fastq -07/07/93 -16:41:33 +QA records = +testwt +07/07/93 +15:41:33 +FASTQ +fastq +07/07/93 +16:41:33 after exginf, error = 0 -info records = - This is the first information record. - This is the second information record. - This is the third information record. +info records = + This is the first information record. + This is the second information record. + This is the third information record. after exgvp, error = 0 after exgvan, error = 0 There are 1 global variables; their names are : -glo_vars +glo_vars after exgvp, error = 0 after exgvan, error = 0 There are 2 nodal variables; their names are : -nod_var0 -nod_var1 +nod_var0 +nod_var1 after exgvp, error = 0 after exgvan, error = 0 There are 3 element variables; their names are : -ele_var0 -ele_var1 -ele_var2 +ele_var0 +ele_var1 +ele_var2 after exgvtt, error = 0 This is the element variable truth table: diff --git a/packages/seacas/libraries/exodus_for/test/testrd1.dmp b/packages/seacas/libraries/exodus_for/test/testrd1.dmp index c3b5fcf064..d2c826f6c1 100644 --- a/packages/seacas/libraries/exodus_for/test/testrd1.dmp +++ b/packages/seacas/libraries/exodus_for/test/testrd1.dmp @@ -4,7 +4,7 @@ after exopen, error = 0 after exgini, error = 0 database parameters: -title = This is testwt1 +title = This is testwt1 num_dim = 3 num_nodes = 28 num_elem = 8 @@ -13,7 +13,7 @@ num_node_sets = 2 num_side_sets = 5 after exgcor, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -42,7 +42,7 @@ x coords = 3.0 6.0 0.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -71,7 +71,7 @@ y coords = 2.0 2.0 2.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -102,8 +102,8 @@ z coords = 0.0 after exgcon, error = 0 -x coord name = xcoor -y coord name = ycoor +x coord name = xcoor +y coord name = ycoor after exgmp, error = 0 @@ -185,49 +185,49 @@ after exgebi, error = 0 after exgelb, error = 0 element block id = 10 -element type = quad +element type = quad num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 3 after exgelb, error = 0 element block id = 11 -element type = quad +element type = quad num_elem_in_block = 2 num_nodes_per_elem = 4 num_attr = 3 after exgelb, error = 0 element block id = 12 -element type = hex +element type = hex num_elem_in_block = 1 num_nodes_per_elem = 8 num_attr = 3 after exgelb, error = 0 element block id = 13 -element type = tetra +element type = tetra num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 3 after exgelb, error = 0 element block id = 14 -element type = circle +element type = circle num_elem_in_block = 1 num_nodes_per_elem = 1 num_attr = 3 after exgelb, error = 0 element block id = 15 -element type = sphere +element type = sphere num_elem_in_block = 1 num_nodes_per_elem = 1 num_attr = 3 after exgelb, error = 0 element block id = 16 -element type = wedge +element type = wedge num_elem_in_block = 1 num_nodes_per_elem = 6 num_attr = 3 @@ -365,7 +365,7 @@ after exgnsi, error = 0 after exgnp, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after exgns, error = 0 @@ -387,7 +387,7 @@ dist factors for node set 20 after exgnp, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after exgns, error = 0 @@ -419,16 +419,16 @@ after EXNSDF = 8 exinq, error = 0 after exgcns, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 1 6 -node_list = +node_list = 100 101 102 @@ -437,7 +437,7 @@ node_list = 200 201 202 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -638,37 +638,37 @@ after exinq: EXSSDF = 8, error = 0 after exgcss, error = 0 concatenated side set info -ids = +ids = 30 31 32 33 34 -num_elem_per_set = +num_elem_per_set = 2 2 7 4 2 -num_df_per_set = +num_df_per_set = 4 4 0 0 0 -elem_ind = +elem_ind = 1 3 5 12 16 -df_ind = +df_ind = 1 5 9 9 9 -elem_list = +elem_list = 3 3 1 @@ -686,7 +686,7 @@ elem_list = 5 6 7 -side_list = +side_list = 4 2 2 @@ -704,7 +704,7 @@ side_list = 4 1 1 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -715,41 +715,41 @@ dist_fact = 31.300 after exgqa, error = 0 -QA records = -testwt1 -03/16/94 -15:41:33 -FASTQ -fastq -07/07/93 -16:41:33 +QA records = +testwt1 +03/16/94 +15:41:33 +FASTQ +fastq +07/07/93 +16:41:33 after exginf, error = 0 -info records = - This is the first information record. - This is the second information record. - This is the third information record. +info records = + This is the first information record. + This is the second information record. + This is the third information record. after exgvp, error = 0 after exgvnm, error = 0 There are 1 global variables; their names are : -glo vars +glo vars after exgvp, error = 0 after exgvan, error = 0 There are 2 nodal variables; their names are : -nod_var0 -nod_var1 +nod_var0 +nod_var1 after exgvp, error = 0 after exgvan, error = 0 There are 3 element variables; their names are : -ele_var0 -ele_var1 -ele_var2 +ele_var0 +ele_var1 +ele_var2 after exgvtt, error = 0 This is the element variable truth table: diff --git a/packages/seacas/libraries/exodus_for/test/testrd_nsid.dmp b/packages/seacas/libraries/exodus_for/test/testrd_nsid.dmp index 9f819d8567..fd8f5a59ea 100644 --- a/packages/seacas/libraries/exodus_for/test/testrd_nsid.dmp +++ b/packages/seacas/libraries/exodus_for/test/testrd_nsid.dmp @@ -5,7 +5,7 @@ after exopen, error = 0 after exgini, error = 0 database parameters: -title = This is a test +title = This is a test num_dim = 3 num_nodes = 33 num_elem = 7 @@ -14,7 +14,7 @@ num_node_sets = 0 num_side_sets = 0 after exgcor, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -48,7 +48,7 @@ x coords = 0.0 10.0 10.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -82,7 +82,7 @@ y coords = 0.0 0.0 10.0 -z coords = +z coords = 0.0 0.0 0.0 @@ -118,8 +118,8 @@ z coords = 10.0 after exgcon, error = 0 -x coord name = xcoor -y coord name = ycoor +x coord name = xcoor +y coord name = ycoor after exgmap, error = 0 elem_map(1) = 1 @@ -134,7 +134,7 @@ after exgebi, error = 0 after exgelb, error = 0 element block id = 10 -element type = nsided +element type = nsided num_elem_in_block = 7 num_nodes_per_elem = 37 num_attr = 0 diff --git a/packages/seacas/libraries/exodus_for/test/testrdd.dmp b/packages/seacas/libraries/exodus_for/test/testrdd.dmp index 7deca71a03..df1826fc8d 100644 --- a/packages/seacas/libraries/exodus_for/test/testrdd.dmp +++ b/packages/seacas/libraries/exodus_for/test/testrdd.dmp @@ -4,7 +4,7 @@ after exopen, error = 0 after exgini, error = 0 database parameters: -title = This is a test +title = This is a test num_dim = 2 num_nodes = 8 num_elem = 2 @@ -13,7 +13,7 @@ num_node_sets = 2 num_side_sets = 2 after exgcor, error = 0 -x coords = +x coords = 0.0 1.0 1.0 @@ -22,7 +22,7 @@ x coords = 2.0 2.0 1.0 -y coords = +y coords = 0.0 0.0 1.0 @@ -33,8 +33,8 @@ y coords = 1.0 after exgcon, error = 0 -x coord name = xcoor -y coord name = ycoor +x coord name = xcoor +y coord name = ycoor after exgmap, error = 0 elem_map(1) = 1 @@ -44,14 +44,14 @@ after exgebi, error = 0 after exgelb, error = 0 element block id = 10 -element type = quad +element type = quad num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 after exgelb, error = 0 element block id = 11 -element type = quad +element type = quad num_elem_in_block = 1 num_nodes_per_elem = 4 num_attr = 1 @@ -89,7 +89,7 @@ after exgnsi, error = 0 after exgnp, error = 0 -node set 20 parameters: +node set 20 parameters: num_nodes = 5 after exgns, error = 0 @@ -111,7 +111,7 @@ dist factors for node set 20 after exgnp, error = 0 -node set 21 parameters: +node set 21 parameters: num_nodes = 3 after exgns, error = 0 @@ -143,16 +143,16 @@ after EXNSDF = 8 exinq, error = 0 after exgcns, error = 0 concatenated node set info -ids = +ids = 20 21 -num_nodes_per_set = +num_nodes_per_set = 5 3 -node_ind = +node_ind = 1 6 -node_list = +node_list = 100 101 102 @@ -161,7 +161,7 @@ node_list = 200 201 202 -dist_fact = +dist_fact = 1.000 2.000 3.000 @@ -230,32 +230,32 @@ after exinq: EXSSDF = 8, error = 0 after exgcss, error = 0 concatenated side set info -ids = +ids = 30 31 -num_elem_per_set = +num_elem_per_set = 2 2 -num_df_per_set = +num_df_per_set = 4 4 -elem_ind = +elem_ind = 1 3 -df_ind = +df_ind = 1 5 -elem_list = +elem_list = 11 12 13 14 -side_list = +side_list = 1 2 3 4 -dist_fact = +dist_fact = 30.000 30.100 30.200 @@ -266,41 +266,41 @@ dist_fact = 31.300 after exgqa, error = 0 -QA records = -testwtd -07/07/93 -15:41:33 -FASTQ -fastq -07/07/93 -16:41:33 +QA records = +testwtd +07/07/93 +15:41:33 +FASTQ +fastq +07/07/93 +16:41:33 after exginf, error = 0 -info records = - This is the first information record. - This is the second information record. - This is the third information record. +info records = + This is the first information record. + This is the second information record. + This is the third information record. after exgvp, error = 0 after exgvan, error = 0 There are 1 global variables; their names are : -glo_vars +glo_vars after exgvp, error = 0 after exgvan, error = 0 There are 2 nodal variables; their names are : -nod_var0 -nod_var1 +nod_var0 +nod_var1 after exgvp, error = 0 after exgvan, error = 0 There are 3 element variables; their names are : -ele_var0 -ele_var1 -ele_var2 +ele_var0 +ele_var1 +ele_var2 after exgvtt, error = 0 This is the element variable truth table: diff --git a/packages/seacas/libraries/ioss/src/Ioss_BasisVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_BasisVariableType.h index 7a78e1cfa0..32b095f61f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_BasisVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_BasisVariableType.h @@ -75,13 +75,13 @@ namespace Ioss { typedef struct ex_basis { /* - * subc_dim: dimension of the subcell associated with the specified DoF ordinal + * subc_dim: dimension of the subcell associated with the specified DoF ordinal * -- 0 node, 1 edge, 2 face, 3 volume [Range: 0..3] * subc_ordinal: ordinal of the subcell relative to its parent cell - * -- 0..n for each ordinal with the same subc dim [Range: <= DoF ordinal] - * subc_dof_ordinal: ordinal of the DoF relative to the subcell - * subc_num_dof: cardinality of the DoF set associated with this subcell. - * xi, eta, mu (ξ, η, ζ): Parametric coordinate location of the DoF + * -- 0..n for each ordinal with the same subc dim [Range: <= DoF ordinal] + * subc_dof_ordinal: ordinal of the DoF relative to the subcell + * subc_num_dof: cardinality of the DoF set associated with this subcell. + * xi, eta, mu (ξ, η, ζ): Parametric coordinate location of the DoF * -- (Only first ndim values are valid) */ char name[EX_MAX_NAME + 1]; diff --git a/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h b/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h index 6206f622dd..f989a37966 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h @@ -38,7 +38,7 @@ adios | Input/Output | Adaptable Input/Output system, (https://adios faodel | Input/Output | (https://github.com/faodel/faodel) exodusii | Input/Output | alias for exodus genesis | Input/Output | alias for exodus -par_cgns | Input/Output | alias for parallel CGNS +par_cgns | Input/Output | alias for parallel CGNS \section properties Properties @@ -137,7 +137,7 @@ PARALLEL_IO_MODE | netcdf4, hdf5, pnetcdf, (mpiio and mpiposix are deprecated) The `overlay` specifies the number of output steps which will be overlaid on top of the currently written step before advancing to the next step on the database. - + For example, if output every 0.1 seconds and the overlay count is specified as 2, then IOSS will write time 0.1 to step 1 of the database. It will then write 0.2 and 0.3 also to step 1. It will @@ -146,7 +146,7 @@ then increment the database step and write 0.4 to step 2 and overlay to completion), the database would have times 0.3, 0.6, 0.9, ... However, if there were a problem during the analysis, the last step on the database would contain an intermediate step. - + The `cycle_count` specifies the number of restart steps which will be written to the restart database before previously written steps are overwritten. For example, if the `cycle` count is 5 and output is @@ -156,16 +156,16 @@ with data from time 0.6, the second with time 0.7. At time 0.8, the database would contain data at times 0.6, 0.7, 0.8, 0.4, 0.5. Note that time will not necessarily be monotonically increasing on a database that specifies the cycle count. - + The cycle count and overlay count can both be used at the same time also. The basic formula is: -``` +``` db_step = (((output_step - 1) / overlay) % cycle) + 1 -``` +``` where `output_step` is the step that this would have been on the database in a normal write (1,2,3,....) and `db_step` is the step number that this will be written to. - + If you only want the last step available on the database, use `set_cycle_count(1)`. @@ -177,7 +177,7 @@ timesteps will be written to each file. If we have `cycle=2` and file. Then, the first file will be reopened and steps 0.7, 0.8, and 0.9 will be written to the first file. - + ## Properties for the heartbeat output Property | Value | Description -----------------------|:------:|----------------------------------------------------------- diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriAppendLocationAttributesOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriAppendLocationAttributesOperation.py index 67145dfed5..a419bab460 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriAppendLocationAttributesOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriAppendLocationAttributesOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -57,7 +57,7 @@ def ParseParametersFromJson(self, inJson): self.AppendPointLocations = 1 else: self.AppendPointLocations = 0 - + key2 = "append cell centers" if key2 in inJson: testval = inJson[key2] @@ -80,7 +80,7 @@ def CreateParaViewFilter(self, inInputFilter): if PhactoriDbg(100): myDebugPrint3('PhactoriAppendLocationAttributesOperation:CreateParaViewFilter entered\n', 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3('about to call UpdatePipelineWithCurrentTimeArgument\n', 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCSVExportOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCSVExportOperation.py index 1b3f23be72..41e43b4ff0 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCSVExportOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCSVExportOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -67,7 +67,7 @@ def ParseOutputFilenameParametersFromJson(self, inJson): if (self.Precision < 1) or (self.Precision > 100): myDebugPrint3AndException("PhactoriCSVExportOperation:\n" "precision must be 1-100, not " + str(self.Precision) + "\n") - + def ParseParametersFromJson(self, inJson): self.ParseOutputFilenameParametersFromJson(inJson) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCalculatorOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCalculatorOperation.py index 8338bd8bcb..c019227d33 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCalculatorOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCalculatorOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -107,7 +107,7 @@ def CreateParaViewFilter(self, inInputFilter): numArrays = inInputFilter.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + inInputFilter.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" calculator inInputFilter cell data arrays:\n") numArrays = inInputFilter.CellData.GetNumberOfArrays() diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellEdgeAngleMetrics.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellEdgeAngleMetrics.py index bb0f36aed7..67b24707b4 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellEdgeAngleMetrics.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellEdgeAngleMetrics.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -86,10 +86,10 @@ def ParseParametersFromJson(self, inJson): self.OffsetIndex = 0 keyval10 = "output angle cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.OutputAngleCellVariableName = inJson[keyval10] keyval10 = "output height cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.OutputHeightCellVariableName = inJson[keyval10] keyval11 = "do operation in createparaview method" diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellSizeOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellSizeOperation.py index dea7bce044..d7aad135fc 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellSizeOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriCellSizeOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -47,7 +47,7 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3('PhactoriCellSizeOperation:CreateParaViewFilter entered\n', 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3('about to call UpdatePipelineWithCurrentTimeArgument\n', 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriDataArtifactMetaDataControl.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriDataArtifactMetaDataControl.py index e7eb49e320..fb1ae4e5ae 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriDataArtifactMetaDataControl.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriDataArtifactMetaDataControl.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -111,8 +111,3 @@ def AddImageToDataArtifactOutputList(self, fileName): pdamdc.AddDataExportToDataArtifactOutputList("CatalystVtkDataOutput/test2.vtm") #phactori_combine_to_single_python_file_subpiece_end_1 - - - - - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractBlockOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractBlockOperation.py index bc84d49be8..bf00deba75 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractBlockOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractBlockOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -144,7 +144,7 @@ def CreateParaViewFilter(self, inInputFilter): numArrays = inInputFilter.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + inInputFilter.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" extractblock inInputFilter cell data arrays:\n") numArrays = inInputFilter.CellData.GetNumberOfArrays() @@ -163,7 +163,7 @@ def CreateParaViewFilter(self, inInputFilter): numArrays = newParaViewFilter.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + newParaViewFilter.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" extractblock newParaViewFilter cell data arrays:\n") numArrays = newParaViewFilter.CellData.GetNumberOfArrays() diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractComponentOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractComponentOperation.py index 43c1a54246..2818a9c207 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractComponentOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractComponentOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -84,7 +84,7 @@ def CreateParaViewFilter(self, inInputFilter): if PhactoriDbg(100): myDebugPrint3("PhactoriExtractComponentOperation:CreateParaViewFilter entered\n", 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3("about to call UpdatePipelineWithCurrentTimeArgument\n", 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractStructuredMultiBlock.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractStructuredMultiBlock.py index ea12784fbe..f3aad146ae 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractStructuredMultiBlock.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriExtractStructuredMultiBlock.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -255,7 +255,7 @@ def FigureBlockIndicesFromBlockList(includeBlockList, inInputFilter): listOfBlockIndicesToInclude = [] FigureBlockIndicesFromBlockListRecurse1(listOfBlockIndicesToInclude, includeBlockList, csdata, None, flatIndexCounter, 0) - + #if PhactoriDbg(100): # myDebugPrint3("number of times existing block names found:\n") # for blknm, count in gDuplicateNameCounter.items(): @@ -373,7 +373,7 @@ def ParseParametersFromJson(self, inJson): def MakeExtractBlockFilter(self, inInputFilter, blockName): if PhactoriDbg(100): myDebugPrint3("MakeExtractBlockFilter entered: " + str(blockName) + "\n") - newPvExtractBlockFilter = ExtractBlock(inInputFilter) + newPvExtractBlockFilter = ExtractBlock(inInputFilter) #newParaViewFilter.PruneOutput = 1 #newParaViewFilter.MaintainStructure = 0 #newParaViewFilter.MaintainStructure = 1 @@ -404,7 +404,7 @@ def CreateIjkRangeFromSettingsForThisBlock(self, ijkJson, blockExtent): rngFunc = [0,0,0,0,0,0] if rngFuncAllAbsolute: - retIjkRange = ijkJson["ijkrange"] + retIjkRange = ijkJson["ijkrange"] if PhactoriDbg(100): myDebugPrint3("rngFunc is [0,0,0,0,0,0], all absolute, " "so just return explicit ijkrange:\nretIjkRange: \n" + \ @@ -417,7 +417,7 @@ def CreateIjkRangeFromSettingsForThisBlock(self, ijkJson, blockExtent): return [0,-1,0,-1,0,-1] if "ijkrange" in ijkJson: - ijkRangeFromJson = ijkJson["ijkrange"] + ijkRangeFromJson = ijkJson["ijkrange"] else: ijkRangeFromJson = [0,0,0,0,0,0] @@ -458,22 +458,22 @@ def CreateIjkRangeFromSettingsForThisBlock(self, ijkJson, blockExtent): if hadToCorrect: if PhactoriDbg(100): myDebugPrint3("return ijkrange had to be corrected because it was outside block extent" - "\nblockExtent: " + str(blockExtent) + - "\nijkRangeFromJson: " + str(retIjkRange) + - "\nrngFunc (from json): " + str(rngFunc) + + "\nblockExtent: " + str(blockExtent) + + "\nijkRangeFromJson: " + str(retIjkRange) + + "\nrngFunc (from json): " + str(rngFunc) + "\nuncorrectedIjkRange: " + str(uncorrectedIjkRange) + "\nretIjkRange: " + str(retIjkRange) + "\n") else: if PhactoriDbg(100): myDebugPrint3("return ijkrange did not need correction" - "\nblockExtent: " + str(blockExtent) + + "\nblockExtent: " + str(blockExtent) + "\nijkRangeFromJson: " + str(retIjkRange) + - "\nrngFunc (from json): " + str(rngFunc) + + "\nrngFunc (from json): " + str(rngFunc) + "\nretIjkRange: " + str(retIjkRange) + "\n") return retIjkRange - - + + def MakeExtractSubsetFilter(self, extractBlockFilter, oneBlockExtractSubsetJson, oneBlockExtents): if PhactoriDbg(100): myDebugPrint3("MakeOneExtractBlockExtractSubsetFilter entered\n") @@ -523,7 +523,7 @@ def MakeGroupAllExtractSubsetsFilter(self): if PhactoriDbg(100): myDebugPrint3("MakeGroupAllExtractSubsetsFilter returning\n") - + def CreateParaViewFilter(self, inInputFilter): """create the PhactoriExtractStructuredMultiBlock filter for ParaView""" if PhactoriDbg(100): diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFindCellEdgeLengths.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFindCellEdgeLengths.py index 31b2274c95..cbf249455f 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFindCellEdgeLengths.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFindCellEdgeLengths.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -77,7 +77,7 @@ def ParseParametersFromJson(self, inJson): self.OutputShortestLongestIndex = 0 keyval10 = "output cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.ProgrammableFilterOutputCellVariableName = inJson[keyval10] def CreateParaViewFilter(self, inInputFilter): diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFollowSurfaceSide1.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFollowSurfaceSide1.py index 0c865a02f3..2f8128df99 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFollowSurfaceSide1.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriFollowSurfaceSide1.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -82,7 +82,7 @@ def ParseParametersFromJson(self, inJson): self.OffsetIndex = 0 keyval10 = "output cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.ProgrammableFilterOutputCellVariableName = inJson[keyval10] def CreateParaViewFilter(self, inInputFilter): @@ -128,7 +128,7 @@ def CreateParaViewFilter(self, inInputFilter): # lvly[zz] = 0 # lvlz = lvly[zz] # lvly[zz] = lvlz + 1 - + @staticmethod def IncrementTouchingCellCountForAllPointsInOneCell(inInputCsData, inParameters, inCellIndex, cellsTouchingPointCount): @@ -389,7 +389,7 @@ def FindWhichSurfaceCellsTouchEachPoint(inInputCsData, surfaceCellMap): for ptId, cellList in cellsTouchingPoints: myDebugPrint(str(ptId) + " " + str(celllist) + "\n") return cellsTouchingPoints - + def FollowSurfaceSideFromSeedCell(inInputCsData, seedCellIndex, surfaceStatus): #get a list of all surface cells surfaceCellMap, seedCellIndex = FindSurfaceCells(surfaceStatus) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGeometricCellSampler1.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGeometricCellSampler1.py index 4e33171c00..9b274de414 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGeometricCellSampler1.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGeometricCellSampler1.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -333,7 +333,7 @@ def GatherGeometricallySampledCellsInBlock(recursionObject, inInputCsData, inPar myDebugPrint3("None\n") else: myDebugPrint3(str(oneCellDataArray.GetNumberOfTuples()) + "\n") - + if dataArrayNumCmpnts != 0: defaultTuple = [] for ii in range(0, dataArrayNumCmpnts): @@ -513,7 +513,7 @@ def CreateInternalListOfDataControlledSampledCellsOnThisProcess(self): else: myDebugPrint3AndException("CreateInternalListOfDataControlledSampledCellsOnThisProcess:\n" +\ "bad self.DataControlledSamplingMethod\n") - + if PhactoriDbg(100): myDebugPrint3("CreateInternalListOfDataControlledSampledCellsOnThisProcess returning\n") @@ -576,7 +576,7 @@ def CollectDataOnSampledCellsInBlock(recursionObject, inInputCsData, inParameter myDebugPrint3("None\n") else: myDebugPrint3(str(oneCellDataArray.GetNumberOfTuples()) + "\n") - + if dataArrayNumCmpnts != 0: defaultTuple = [] for ii in range(0, dataArrayNumCmpnts): @@ -647,7 +647,7 @@ def CreateLeafRecursionTrackingStructure(self): for leafKey in self.GeometricallySampledCellsByRecursionLeaf: cellListForLeaf = self.GeometricallySampledCellsByRecursionLeaf[leafKey] myDebugPrint3(str(len(cellListForLeaf)) + " cells for leaf " + str(leafKey) + "\n") - + if PhactoriDbg(100): myDebugPrint3("CreateLeafRecursionTrackingStructure returning\n") @@ -866,7 +866,7 @@ def CreateProgrammableFilterString(self): scriptLines.append(" iter.GoToNextItem();\n") scriptLines.append("else:\n") scriptLines.append(" flatten(input, output)\n") - + self.mainScriptString = "".join(scriptLines) myCellIndexesToSet = [] @@ -884,10 +884,10 @@ def CreateProgrammableFilterString(self): myCellIndexesToSet.append(oneCellInfo.index) myMaskValuesToSet.append(maskValue) myLeafVisitCount.append(oneCellInfo.leafVisitCount) - - newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" - newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" - newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" + + newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" + newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" + newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" self.mProgFilterString = newstr1 + newstr2 + newstr3 + self.mainScriptString if PhactoriDbg(100): diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGlyphOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGlyphOperation.py index f16d371863..da3cfc0ef5 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGlyphOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGlyphOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2021 National Technology & Engineering Solutions +# Copyright(C) 1999-2021, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -52,7 +52,7 @@ def ParseParametersFromJson(self, inJson): if PhactoriDbg(100): myDebugPrint3("PhactoriGlyphOperation.ParseParametersFromJson " "entered\n", 100) - + key1 = "scale factor" if key1 in inJson: self.scaleFactor = inJson[key1] diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGroupOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGroupOperation.py index 938f92b775..67894314b1 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGroupOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriGroupOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -83,7 +83,7 @@ def CreateParaViewFilter2(self, ioPipeAndViewsState): "Error: operation '" + str(ii) + "' paraview filter not " "constructed\n") self.mOperationList.append(inputOperationBlock.GetPvFilter()) - + newParaViewFilter = GroupDatasets(Input = self.mOperationList) SetActiveSource(newParaViewFilter) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriIntegrateVariablesOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriIntegrateVariablesOperation.py index 22dfe96e98..d952bfcc0b 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriIntegrateVariablesOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriIntegrateVariablesOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -53,7 +53,7 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3('PhactoriIntegrateVariablesOperation:CreateParaViewFilter entered\n', 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3('about to call UpdatePipelineWithCurrentTimeArgument\n', 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMarkCellSurfaceStatus2.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMarkCellSurfaceStatus2.py index 217f6df293..4d135951f8 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMarkCellSurfaceStatus2.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMarkCellSurfaceStatus2.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -82,7 +82,7 @@ def ParseParametersFromJson(self, inJson): self.OffsetIndex = 0 keyval10 = "output cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.OutputCellVariableName = inJson[keyval10] keyval11 = "do operation in createparaview method" diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMpiUtilities.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMpiUtilities.py index 08c9d70ec3..3a19e68b4d 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMpiUtilities.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriMpiUtilities.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -172,7 +172,7 @@ def UseMpiToSendAllProcessesFloatArrayToOneProcess(thisProcessFloatArray, pidToC retVal = [] if PhactoriDbg(100): - if len(globalFloatArray) == 0: + if len(globalFloatArray) == 0: myDebugPrint3(str(len(globalFloatArray)) + "\n") else: myDebugPrint3(str(len(globalFloatArray)) + " " + str(globalFloatArray[0]) + " " + str(globalFloatArray[-1]) + "\n") diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriOperationBlock.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriOperationBlock.py index 80363d3599..db62f46cef 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriOperationBlock.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriOperationBlock.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -66,7 +66,7 @@ class PhactoriOperationBlock: Operations with multiple inputs and outputs are conceiveable, and may be added pending user requirements. The instance is presumed to contain a name unique amound the operation - blocks and keeps a reference to the input operation (by name), the + blocks and keeps a reference to the input operation (by name), the ParaView/Catalyst filter which is built, and some flags determining where we are in the construction process. """ @@ -226,7 +226,7 @@ def OutputElementListFromOneBlockToFile(self, inInputCsData, inParameters): myDebugPrint3("OutputElementListFromOneBlockToFile returning\n") class FindClosestNPointsToListParams: - """recursion structure for FindClosestNPointsToList(). Also servers to + """recursion structure for FindClosestNPointsToList(). Also servers to store/track data for passing back answer""" def __init__(self, inParentOperation, inNumToFind, inTargetGlobalNodeIdList, inTargetPointXyzList): @@ -343,7 +343,7 @@ def TestPointSub2(self, inSrcId, inSrcXyz, inTgtId, inTgtXyz, inNrstdist): # str(self.mTargetMatchXyzs.GetValue(gndx+2)) + "\n") #now find which in the current list has the biggest distance, as it is - #next in line for replacement (we do this to avoid having to shift + #next in line for replacement (we do this to avoid having to shift #elements every time self.mcfndx = 0 self.mMinDistSqrd = self.mDistSqrds.GetValue(0) @@ -414,7 +414,7 @@ def TestPointSub1(self, inId, inX, inY, inZ, tId, tX, tY, tZ): str(self.mTargetMatchXyzs.GetValue(gndx+2)) + "\n") #now find which in the current list has the biggest distance, as it is - #next in line for replacement (we do this to avoid having to shift + #next in line for replacement (we do this to avoid having to shift #elements every time self.mcfndx = 0 self.mMinDistSqrd = self.mDistSqrds.GetValue(0) @@ -530,7 +530,7 @@ def MakeListOfAllPoints1(self): self.DoMethodPerBlock(recursionItem) return recursionItem.mParameters.mGlobalNodeIdList, \ recursionItem.mParameters.mPointXYZList - + def MakeListOfAllPointsInBlock1(self, inInputCsData, inParameters): #if PhactoriDbg(100): # myDebugPrint3("MakeListOfAllPointsInBlock1 entered\n") diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParallelGeometryUtilities.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParallelGeometryUtilities.py index 65ce2a61b6..ff0ab895ae 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParallelGeometryUtilities.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParallelGeometryUtilities.py @@ -143,7 +143,7 @@ def GetPidWithLeastValueListV5(inLocalDistSqrdList): pidWithDataList = UseReduceOnIntegerList(localPidList, 0) return pidWithDataList, globalDistSqrdList - + def UseMpiToGetGlobalCellPointsClosestV5(inInputFilter, inLocalCellPointList, inLocalDistSqrdList): if PhactoriDbg(100): diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParaviewMultiBlockRecursion.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParaviewMultiBlockRecursion.py index 5824fd9662..ae82e0def0 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParaviewMultiBlockRecursion.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriParaviewMultiBlockRecursion.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -92,7 +92,7 @@ def DebugPrintBlockName(csData, blockIndex): myDebugPrint3("oneBlockMetaData is None (2)\n") def PhactoriRecusivelyDoMethodPerBlockFromParaViewFilter(inRecursionControlItem, inPvFilter): - """grab client side data object, and use that to do recursion""" + """grab client side data object, and use that to do recursion""" pvClientSideData = inPvFilter.GetClientSideObject().GetOutputDataObject(0) if pvClientSideData == None: if PhactoriDbg(100): diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceFromJsonList.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceFromJsonList.py index e309bb6d49..f868639d5f 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceFromJsonList.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceFromJsonList.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -69,7 +69,7 @@ def ValidateJsonPointList(self): myDebugPrint3AndException(errStr) return True - + def ParseParametersFromJson(self, inJson): if 'filename' in inJson: self.JsonListFileName = inJson['filename'] @@ -128,4 +128,3 @@ def CreateParaViewFilter(self, inInputFilter): return self.ParaviewPointSource #phactori_combine_to_single_python_file_subpiece_end_1 - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceGeometrySampler1.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceGeometrySampler1.py index d9dcd53429..fa489d2e7c 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceGeometrySampler1.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceGeometrySampler1.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -70,7 +70,7 @@ def ValidateJsonPointList(self): errStr = "PhactoriPointSourceGeometrySampler1::ValidateJsonPointList\n" \ "point with index " + str(ptNdx) + "does not have three elements\n" myDebugPrint3AndException(errStr) - + def ParseParametersFromJson(self, inJson): if 'filename' in inJson: @@ -93,7 +93,7 @@ def GetPidWithLeastValueList(self, inLocalDistSqrdList): pidWithDataList = UseReduceOnIntegerList(localPidList, 0) return pidWithDataList, globalDistSqrdList - + def UseMpiToGetGlobalQuadsClosest(self, inLocalQuadList, inLocalDistSqrdList): if PhactoriDbg(100): myDebugPrint3("PhactoriPointSourceGeometrySampler1.UseMpiToGetGlobalQuadsClosest entered\n", 100) @@ -205,4 +205,3 @@ def CreateParaViewFilter(self, inInputFilter): return self.ParaviewPointSource #phactori_combine_to_single_python_file_subpiece_end_1 - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceNearbyCorrelator.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceNearbyCorrelator.py index 14f2f525c0..3a46926b74 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceNearbyCorrelator.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriPointSourceNearbyCorrelator.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -72,7 +72,7 @@ def ValidateJsonPointList(self): errStr = "PhactoriPointSourceFromJsonList::ValidateJsonPointList\n" \ "point with index " + str(ptNdx) + "does not have three elements\n" myDebugPrint3AndException(errStr) - + def ParseParametersFromJson(self, inJson): if 'filename' in inJson: @@ -163,13 +163,13 @@ def UseMpiToFindGlobalNearestPointList(self, inTargetPointList, inDistanceSquare for idx in range(0, numSrcPnts): xyzIdx = idx*3 resultPoints.append([globalXyz[xyzIdx], globalXyz[xyzIdx+1], globalXyz[xyzIdx+2], globalNodeId[idx]]) - + if PhactoriDbg(100): myDebugPrint3("resultPoints:\n" + str(resultPoints) + "\n") if PhactoriDbg(100): myDebugPrint3("UseMpiToFindGlobalNearestPointList returning\n") - return resultPoints + return resultPoints def CalculateOneDisplacedPoint(self, srcPt, tgtPt, dispDist): deltaVec = vecFromAToB(srcPt, tgtPt) @@ -200,7 +200,7 @@ def FindCorrelatedInputOperationPoints(self, inInputFilter): """in parallel, using mpi to help, find the nodes from the input filter which are closest to the points in self.mJsonPointList, and record the 3d location of those points""" - + #grab local process points thisProcessPointList = self.mPhactoriOperationBlockOwner.MakeListOfAllPointsAndNodeIdsOnThisProcessFromParaViewFilter(inInputFilter) @@ -228,7 +228,7 @@ def FindCorrelatedInputOperationPoints(self, inInputFilter): distx = math.sqrt(distSqrd) myDebugPrint3(str(ndx) + ": " + str(sourcePt) + " " + str(distSqrd) + " " + str(distx) + " " + str(self.DisplacedPointList[ndx]) + "\n") - + def CreateParaViewFilter(self, inInputFilter): if PhactoriDbg(100): myDebugPrint3("PhactoriPointSourceFromJsonList.CreateParaViewFilter entered\n", 100) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriRepresentationBlock.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriRepresentationBlock.py index 374bcfa214..b75d4c4b2e 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriRepresentationBlock.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriRepresentationBlock.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2022 National Technology & Engineering Solutions +# Copyright(C) 1999-2022, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -325,7 +325,7 @@ def ParseSettingsFromJson(self, inRepresentationBlockJson): def SetFromRestartInfo(self, inJson): """given a map (json format), use the info in the map to set the - representation state--this reads the info created in + representation state--this reads the info created in GetRestartInfo""" if 'mColorRangeMinMaxTracker' not in inJson: @@ -392,4 +392,3 @@ def SetUpForInterpretValuesAsCateories(self, variableLookUpTable): if PhactoriDbg(): myDebugPrint3("SetUpForInterpretValuesAsCateories returning\n") #phactori_combine_to_single_python_file_subpiece_end_1 - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriResampleWithDataset.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriResampleWithDataset.py index 0cf6d60007..621b9bd92e 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriResampleWithDataset.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriResampleWithDataset.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -105,7 +105,7 @@ def CreateParaViewFilter2(self, inInputFilter, inPipeAndViewsState): self.InternalParaViewFilterPtr.CellLocator = 'Static Cell Locator' self.DebugPrintInputPortAndOutputPortInfo("pre filter update 1\n") - + SetActiveSource(self.InternalParaViewFilterPtr) SetActiveSource(savedActiveSource) @@ -119,7 +119,7 @@ def CreateParaViewFilter2(self, inInputFilter, inPipeAndViewsState): self.InternalParaViewFilterPtr.UpdatePipeline() self.DebugPrintInputPortAndOutputPortInfo("post filter update 1\n") - + if PhactoriDbg(100): myDebugPrint3("self.InternalParaViewFilterPtr: " + str(self.InternalParaViewFilterPtr) + "\n", 100) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSampledCellInfo.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSampledCellInfo.py index 0f6f20917c..dd034f5d2b 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSampledCellInfo.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSampledCellInfo.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -445,9 +445,9 @@ def PhactoriLocalToGlobalCellsWithMinMaxDataUsingMPI(localPidMinMaxCellPair, tup globalMaxCell = PhactoriSampledCellInfo() globalMinCell.SerializeSetFromFloatAndIntArray(globalSerializedFloatArray, globalSerializedIntArray, 0, tupleSize) globalMaxCell.SerializeSetFromFloatAndIntArray(globalSerializedFloatArray, globalSerializedIntArray, 1, tupleSize) - + if PhactoriDbg(100): myDebugPrint3("PhactoriLocalToGlobalCellsWithMinMaxDataUsingMPI returning\n") - return [globalMinCell, globalMaxCell] - + return [globalMinCell, globalMaxCell] + #phactori_combine_to_single_python_file_subpiece_end_1 diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSegmentCellSampler3.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSegmentCellSampler3.py index 787464d177..36a4f6908b 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSegmentCellSampler3.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSegmentCellSampler3.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -263,7 +263,7 @@ def ValidateJsonSegmentList(self, testlist): errStr = "PhactoriSegmentCellSampler3:ValidateJsonSegmentList\n" \ "segment with index " + str(segNdx) + " point 2 does not have 3 components\n" myDebugPrint3AndException(errStr) - + return True def ParseParametersFromJson(self, inJson): @@ -420,7 +420,7 @@ def CreateInternalSegmentListFromJson(self, segmentListJson): if PhactoriDbg(100): myDebugPrint3("PhactoriSegmentCellSampler3.ExportOperationData entered\n", 100) - if self.SegmentDefinitionFormat == "two geometric points": + if self.SegmentDefinitionFormat == "two geometric points": self.ValidateJsonSegmentList(segmentListJson) self.SegmentList = [] self.NearbyGeometryPointList = [] @@ -501,7 +501,7 @@ def CreateParaViewFilter(self, inInputFilter): savedActiveSource = GetActiveSource() segmentListJson = ReadAndMpiBroadcastJsonFile(self.JsonListFileName) - + self.myCopyOfInputFilter = inInputFilter UpdatePipelineWithCurrentTimeArgument(self.myCopyOfInputFilter) @@ -568,7 +568,7 @@ def GetPidWithLeastValueList(self, inLocalDistSqrdList): pidWithDataList = UseReduceOnIntegerList(localPidList, 0) return pidWithDataList, globalDistSqrdList - + def UseMpiToGetGlobalCellPointsClosestStructured(self, ioCellList, inLocalDistSqrdList): if PhactoriDbg(100): myDebugPrint3("PhactoriSegmentCellSampler3.UseMpiToGetGlobalCellPointsClosestStructured entered\n", 100) @@ -758,12 +758,12 @@ def SetMaskValueForCellsNearSegmentsInBlock(recursionObject, inInputCsData, inPa thisCellDataTuple = outputCellArray.GetTuple(cellIndex) newCellInfo = PhactoriSampledCellInfo() newCellInfo.SetFromList([cellTestPoint, [-1,-1,-1], thisCellDataTuple, myPid, leafVisitCount, cellIndex, segIndex, -1]) - + inParameters.markedCellSet[segIndex].append(newCellInfo) if PhactoriDbg(100): myDebugPrint3("new cell close to segment:\n") myDebugPrint3(newCellInfo.ToStr()) - + if PhactoriDbg(100): for idx, cellsForThisSegment in enumerate(inParameters.markedCellSet): @@ -1273,7 +1273,7 @@ def CreateProgrammableFilterString(self): scriptLines.append(" iter.GoToNextItem();\n") scriptLines.append("else:\n") scriptLines.append(" flatten(input, output)\n") - + mainScriptString = "".join(scriptLines) myCellIndexesToSet = [] @@ -1287,10 +1287,10 @@ def CreateProgrammableFilterString(self): myCellIndexesToSet.append(oneCellInfo.index) myMaskValuesToSet.append(maskValue) myLeafVisitCount.append(oneCellInfo.leafVisitCount) - - newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" - newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" - newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" + + newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" + newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" + newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" self.mProgFilterString = newstr1 + newstr2 + newstr3 + mainScriptString if PhactoriDbg(100): diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSliceWithPlaneOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSliceWithPlaneOperation.py index cb847577e5..1c9bfe23ff 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSliceWithPlaneOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriSliceWithPlaneOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -85,7 +85,7 @@ class PhactoriSliceWithPlaneOperation(PhactoriPlaneOpBase): "plane normal":[1.0, 2.0, 3.0] } } - } + } the plane normal does not need to be a unit vector: Phactori will normalize it for you (again, see PhactoriClipPlaneOperation) @@ -183,4 +183,3 @@ def UpdateSlice(self, inIncomingPvFilter, ioOutgoingPvFilter): myDebugPrint3("PhactoriSliceWithPlanePlaneOperation::UpdateSlice returning\n") #phactori_combine_to_single_python_file_subpiece_end_1 - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerOperation.py index 3928af4ccc..9436c2c353 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -90,12 +90,12 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3("stido0 st: " + str(stido0.GetClassName()) + "\n") stido1 = stcso.GetInputDataObject(1,0) myDebugPrint3("stido1 st: " + str(stido1.GetClassName()) + " numcells " + str(stido1.GetNumberOfCells()) + " numpoints " + str(stido1.GetNumberOfPoints()) + "\n") - + SetActiveSource(newParaViewFilter) SetActiveSource(savedActiveSource) UpdatePipelineWithCurrentTimeArgument(newParaViewFilter) - + if PhactoriDbg(100): stcso = newParaViewFilter.GetClientSideObject() stodo = stcso.GetOutputDataObject(0) @@ -104,7 +104,7 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3("B stido0 st: " + str(stido0.GetClassName()) + "\n") stido1 = stcso.GetInputDataObject(1,0) myDebugPrint3("B stido1 st: " + str(stido1.GetClassName()) + " numcells " + str(stido1.GetNumberOfCells()) + " numpoints " + str(stido1.GetNumberOfPoints()) + "\n") - + if PhactoriDbg(100): myDebugPrint3('PhactoriStreamTracerOperation.CreateParaViewFilter returning\n', 100) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerSeedSourceOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerSeedSourceOperation.py index bdb41b6cfb..48a380853d 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerSeedSourceOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStreamTracerSeedSourceOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -104,14 +104,14 @@ def CreateParaViewFilter2(self, inInputFilter, inPipeAndViewsState): #self.InternalParaViewFilterPtr.InitialStepLength = 0.01 self.DebugPrintInputPortAndOutputPortInfo("pre filter update 1\n") - + SetActiveSource(self.InternalParaViewFilterPtr) SetActiveSource(savedActiveSource) UpdatePipelineWithCurrentTimeArgument(self.InternalParaViewFilterPtr) self.DebugPrintInputPortAndOutputPortInfo("post filter update 1\n") - + if PhactoriDbg(100): myDebugPrint3("self.InternalParaViewFilterPtr: " + str(self.InternalParaViewFilterPtr) + "\n", 100) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStructuredGridSampler.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStructuredGridSampler.py index 967a78e37d..bbc94bffbe 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStructuredGridSampler.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriStructuredGridSampler.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -131,7 +131,7 @@ def GatherStructuredSampledCellsOnThisProcess(self): dataArrayNumCmpnts = -1 defaultTuple = [] - + def CreateParaViewFilter(self, inInputFilter): if PhactoriDbg(100): myDebugPrint3("PhactoriStructuredGridSampler.CreateParaViewFilter entered\n", 100) @@ -139,7 +139,7 @@ def CreateParaViewFilter(self, inInputFilter): savedActiveSource = GetActiveSource() ##segmentListJson = ReadAndMpiBroadcastJsonFile(self.JsonListFileName) - + self.myCopyOfInputFilter = inInputFilter UpdatePipelineWithCurrentTimeArgument(self.myCopyOfInputFilter) @@ -151,4 +151,3 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3("PhactoriStructuredGridSampler.CreateParaViewFilter returning\n", 100) #phactori_combine_to_single_python_file_subpiece_end_1 - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriThresholdOperation.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriThresholdOperation.py index 91e671751b..ce4921cb2b 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriThresholdOperation.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriThresholdOperation.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -122,7 +122,7 @@ def DoUpdateDueToChangeInData(self, inIncomingPvFilter, if self.mVariableInfo.mVariableTypeNeedsDetection == False: UpdatePipelineWithCurrentTimeArgument(outOutgoingPvFilter) - + def ParseParametersFromJson(self, inJson): self.mBypassFlag = getParameterFromBlock(inJson, 'bypass flag', @@ -257,4 +257,3 @@ def CreateParaViewFilter(self, inInputFilter): return newParaViewFilter #phactori_combine_to_single_python_file_subpiece_end_1 - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriVtkCellOperations.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriVtkCellOperations.py index 47d4985cce..b6d07108dc 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriVtkCellOperations.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/PhactoriVtkCellOperations.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -181,9 +181,9 @@ def PhactoriCountCellTouchingEachFace(inInputCsData): "\nnum faces with 1 cell: " + str(cctef.totalNumFacesWithOneCellTouching) + \ "\nnum faces with 2 cells: " + str(cctef.totalNumFacesWithTwoCellsTouching) + \ "\nnum faces with 3+ cells: " + str(cctef.totalNumFacesWith3plCellsTouching) + "\n") - + return countCellsTouchingEachFace - + def PhactoriCountCellTouchingEachPoint(inInputCsData): numCells = inInputCsData.GetNumberOfCells() numPoints = inInputCsData.GetNumberOfPoints() @@ -474,7 +474,7 @@ def PhactoriGetAverageOfCellPoints(inInputCsData, oneCell): avgFac = 1.0/float(numPoints) vecScaleInPlace(avgFac, retAvgPt) return retAvgPt - + def PhactoriFindSelectedAngleBetweenEdgeAndCellNormal(inInputCsData, oneCell, compareNormal, paramUseSmallestAngle, paramOffsetIndex): edgeCompareDotProdList = [] @@ -484,7 +484,7 @@ def PhactoriFindSelectedAngleBetweenEdgeAndCellNormal(inInputCsData, oneCell, vecNormalize2(oneEdgeVec, oneEdgeVec) edgeCompareDotProd = abs(vecDotProduct(compareNormal, oneEdgeVec)) edgeCompareDotProdList.append(edgeCompareDotProd) - + sortedEdgeCompareDotProdList = sorted(edgeCompareDotProdList) if paramUseSmallestAngle: @@ -499,7 +499,7 @@ def DebugPrintPhactoriFindHeightOfCell(inInputCsData, oneCell, compareNormal): if PhactoriDbg(100): dbght = [] dbglen = [] - dbgretHeight = -1.0 + dbgretHeight = -1.0 dbgretHeightIndex = -1 for ii in range(0, numCellEdges): oneCellEdgeVec = PhactoriGetCellEdgeVector(inInputCsData, oneCell, ii) @@ -528,7 +528,7 @@ def PhactoriFindHeightOfCell(inInputCsData, oneCell, compareNormal): #than the four shortest sides? numCellEdges = oneCell.GetNumberOfEdges() - retHeight = -1.0 + retHeight = -1.0 for ii in range(0, numCellEdges): #get edge vectory and project on to normal vector (which is unit length) #and find magnitude diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCameraBlock.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCameraBlock.py index 79fc49702a..b1f791b5bf 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCameraBlock.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCameraBlock.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -230,7 +230,7 @@ def getjson_ForTestHelper1(testname, thisTestJson): } } return testname, myjson - + @staticmethod def getjson_CameraLookDirectionWithDefaultLookAtPointZMinus1(): testname = "CameraLookDirectionWithDefaultLookAtPointZMinus1" @@ -255,7 +255,7 @@ def test_CameraLookDirectionWithDefaultLookAtPointZMinus1(self): baselineCamFocalPt = [5.0, -0.001999974250793457, -0.625] self.CheckCameraPostionAndFocalPoint(testOutFile, baselineCamPos, baselineCamFocalPt) self.RemoveTestOutputFiles2(testname); - + @staticmethod def getjson_CameraLookDirectionWithDefaultLookAtPointZPlus1(): testname = "CameraLookDirectionWithDefaultLookAtPointZPlus1" @@ -687,4 +687,3 @@ def test_CameraImageNameAddon(self): cc = Cone() rr = Show() unittest.main() - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCreateSegmentsNormalToCells.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCreateSegmentsNormalToCells.py index 2328b7b354..f3f832d361 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCreateSegmentsNormalToCells.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriCreateSegmentsNormalToCells.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -50,9 +50,9 @@ def MakeOneHexahdtronGridFrom8Points1(self, pointList): points.InsertNextPoint(pointList[5]) points.InsertNextPoint(pointList[6]) points.InsertNextPoint(pointList[7]) - + # Create a hexahedron from the points - hex = vtk.vtkHexahedron() + hex = vtk.vtkHexahedron() hex.GetPointIds().SetId(0,0) hex.GetPointIds().SetId(1,1) hex.GetPointIds().SetId(2,2) @@ -61,11 +61,11 @@ def MakeOneHexahdtronGridFrom8Points1(self, pointList): hex.GetPointIds().SetId(5,5) hex.GetPointIds().SetId(6,6) hex.GetPointIds().SetId(7,7) - + # Add the hexahedron to a cell array hexs = vtk.vtkCellArray() hexs.InsertNextCell(hex) - + # Add the points and hexahedron to an unstructured grid uGrid = vtk.vtkUnstructuredGrid() uGrid.SetPoints(points) @@ -163,7 +163,7 @@ def test_Parse4(self): self.assertRaises(Exception, pcsntc1.ParseParametersFromJson, testJson1) testJson1 = {"segment direction reference point":13.5} self.assertRaises(Exception, pcsntc1.ParseParametersFromJson, testJson1) - + def test_CalculateGeometricProgressionSampleValues_linear(self): pcsntc1 = PhactoriCreateSegmentsNormalToCells() @@ -242,7 +242,7 @@ def test_CreateParaViewSourcesForSegments(self): pcsntc1 = PhactoriCreateSegmentsNormalToCells() pcsntc1.CreateSegmentsForAllCells(xfrm1) pcsntc1.CreateParaViewSourcesForSegments() - + if __name__ == '__main__': cc = Cone() diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriGeometricCellSampler1.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriGeometricCellSampler1.py index eb5d43ae42..c667fafff8 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriGeometricCellSampler1.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriGeometricCellSampler1.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -238,7 +238,7 @@ def test_CreateInternalListOfGeometricallySampledCellsOnThisProcess(self): [[-1.5, 3.5, 6.5], [-1, -1, -1], [204.49305725097656], 0, 1, 6668, -1, -1]] } """ - + goldJson = json.loads(goldTestStringJson) ff = open("test_PhactoriGeometricCellSampler1_1.json", "r") testJson = json.load(ff) @@ -567,5 +567,3 @@ def test_CollectDataOnSampledCellsOnThisProcess(self): cc = Cone() rr = Show() unittest.main() - - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriPointSourceFromJsonList.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriPointSourceFromJsonList.py index 1e55b80fd2..24240801fb 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriPointSourceFromJsonList.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriPointSourceFromJsonList.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -55,11 +55,11 @@ def test_ValidateJsonPointList(self): ] with self.assertRaises(Exception): theSource.ValidateJsonPointList() - + theSource.JsonList = [] with self.assertRaises(Exception): theSource.ValidateJsonPointList() - + def test_CreateVtkPolyDataFromJsonList(self): theSource = PhactoriPointSourceFromJsonList() @@ -77,10 +77,8 @@ def test_CreateVtkPolyDataFromJsonList(self): self.assertEqual(pt0, tuple(theSource.JsonList[0])) pt3 = vtkPts.GetPoint(3) self.assertEqual(pt3, tuple(theSource.JsonList[3])) - + if __name__ == '__main__': cc = Cone() rr = Show() unittest.main() - - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegment.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegment.py index f2a8720deb..e65f26191b 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegment.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegment.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -55,7 +55,7 @@ def test_FindNearestPointOnSegmentToPoint(self): self.assertEqual(testpt1, theSegment.ptB) testpt1 = theSegment.FindNearestPointOnSegmentToPoint([0.0, 0.0, 0.0]) self.assertEqual(testpt1, [-0.3793103448275862, -0.06896551724137923, 0.24137931034482762]) - + def test_FindDistanceSquaredToPoint(self): theSegment = PhactoriSegment() theSegment.SetPoints([-1.0, -1.0, -1.0], [1.0, 2.0, 3.0]) @@ -223,5 +223,3 @@ def test_IntersectsBoundingBoxProjected(self): cc = Cone() rr = Show() unittest.main() - - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegmentCellSampler3.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegmentCellSampler3.py index 2994953677..e518d645d3 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegmentCellSampler3.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriSegmentCellSampler3.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -154,7 +154,7 @@ def test_GetListOfCellTestPointsNearestListOfPoints(self): #myDebugPrint3('DoMethodPerBlock: pvClientSideData is None\n') #outstr3 = "num points in sphere: " + str(pvClientSideData.GetNumberOfPoints()) + "\n" #myDebugPrint3(outstr3) - + PhactoriSegmentCellSampler3Instance = newOperationBlock.mOperationSpecifics PhactoriSegmentCellSampler3Instance.myCopyOfInputFilter = testSphere thisProcessNearestCellPointList, thisProcDistSqrdList = PhactoriSegmentCellSampler3Instance.\ @@ -327,8 +327,8 @@ def test_GatherStructuredCellsFromSeedCells(self): localDataTuples.append(oneStructuredCell.dataTuple) self.assertEqual(localResultPoints, goldPoints[ii]) #myDebugPrint3("end cell test points for segment k axis " + str(ii) + "\n") - - #test j axis collection instead of k + + #test j axis collection instead of k operationParams = { "filename":"dummyfilename", "cell center to segment test distance":0.5, @@ -348,7 +348,7 @@ def test_GatherStructuredCellsFromSeedCells(self): self.assertTrue(PhactoriSegmentCellSampler3Instance.ValidateJsonStructuredSeedCellList(testGeometryPointsJson)) PhactoriSegmentCellSampler3Instance.CreateInternalStructuredSeedCellListFromJson(testGeometryPointsJson) testWavelet.UpdatePipeline() - + perSegmentStructuredCellList = PhactoriSegmentCellSampler3Instance.GatherStructuredCellsFromSeedCells() self.assertEqual(len(perSegmentStructuredCellList),len(PhactoriSegmentCellSampler3Instance.StructuredNearbyCellPointList)) @@ -365,8 +365,8 @@ def test_GatherStructuredCellsFromSeedCells(self): #myDebugPrint3(str(oneStructuredCell.cellTestPoint) + "\n") self.assertEqual(localResultPoints, goldPoints[ii]) #myDebugPrint3("end cell test points for segment j axis " + str(ii) + "\n") - - #test i axis collection instead of j or k + + #test i axis collection instead of j or k operationParams = { "filename":"dummyfilename", "cell center to segment test distance":0.5, @@ -375,7 +375,7 @@ def test_GatherStructuredCellsFromSeedCells(self): } PhactoriSegmentCellSampler3Instance.ParseParametersFromJson(operationParams) - + testGeometryPointsJson = [ {"geometric seed point":[0.5, 0.5, 0.5], "collection axis":"i"}, @@ -386,7 +386,7 @@ def test_GatherStructuredCellsFromSeedCells(self): self.assertTrue(PhactoriSegmentCellSampler3Instance.ValidateJsonStructuredSeedCellList(testGeometryPointsJson)) PhactoriSegmentCellSampler3Instance.CreateInternalStructuredSeedCellListFromJson(testGeometryPointsJson) testWavelet.UpdatePipeline() - + perSegmentStructuredCellList = PhactoriSegmentCellSampler3Instance.GatherStructuredCellsFromSeedCells() self.assertEqual(len(perSegmentStructuredCellList),len(PhactoriSegmentCellSampler3Instance.StructuredNearbyCellPointList)) @@ -509,7 +509,7 @@ def test_WriteAllDataFromOneProcessUsingMPI(self): testJson = json.load(ff) ff.close() self.assertEqual(goldJson, testJson) - + #remove file that got made during test os.remove(testFileName) @@ -847,11 +847,9 @@ def test_WriteAllDataFromOneProcessUsingMPIStructured(self): #remove file that got made during test os.remove(testFileName) - - + + if __name__ == '__main__': cc = Cone() rr = Show() unittest.main() - - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriVtkCellOperations.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriVtkCellOperations.py index 27fb01cc6d..39627a1616 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriVtkCellOperations.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/Operation/test_PhactoriVtkCellOperations.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -50,9 +50,9 @@ def MakeOneHexahdtronGridFrom8Points1(self, pointList): points.InsertNextPoint(pointList[5]) points.InsertNextPoint(pointList[6]) points.InsertNextPoint(pointList[7]) - + # Create a hexahedron from the points - hex = vtk.vtkHexahedron() + hex = vtk.vtkHexahedron() hex.GetPointIds().SetId(0,0) hex.GetPointIds().SetId(1,1) hex.GetPointIds().SetId(2,2) @@ -61,11 +61,11 @@ def MakeOneHexahdtronGridFrom8Points1(self, pointList): hex.GetPointIds().SetId(5,5) hex.GetPointIds().SetId(6,6) hex.GetPointIds().SetId(7,7) - + # Add the hexahedron to a cell array hexs = vtk.vtkCellArray() hexs.InsertNextCell(hex) - + # Add the points and hexahedron to an unstructured grid uGrid = vtk.vtkUnstructuredGrid() uGrid.SetPoints(points) @@ -429,12 +429,12 @@ def test_PhactoriGetCellEdgeVector(self): self.assertEqual(testEdgeVec, [0.0, 0.0, 4.0]) testEdgeVec = PhactoriGetCellEdgeVector(testugrid1, testhex1, 11) self.assertEqual(testEdgeVec, [0.0, 0.0, 3.0]) - + def test_PhactoriFindCellEdgeAngleMetricsForOneCell(self): testugrid1 = self.MakeOneHexahdronGrid1() testAngle, testHeight = PhactoriFindCellEdgeAngleMetricsForOneCell(testugrid1, 0, True, 0) self.assertEqual(testAngle, 67.38013505195958) - self.assertEqual(testHeight, 3.692307692307693) + self.assertEqual(testHeight, 3.692307692307693) testugrid2 = self.MakeOneFlatHexahdronGrid1() testAngle, testHeight = PhactoriFindCellEdgeAngleMetricsForOneCell(testugrid2, 0, True, 0) self.assertEqual(testAngle, 10.024987862075733) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriCombineToOneFile.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriCombineToOneFile.py index 58de09d924..9a53d0b731 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriCombineToOneFile.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriCombineToOneFile.py @@ -96,7 +96,7 @@ def RemoveTripleQuotes(inlines): print(chgLine) outlines.append(chgLine) ndx = qend_ndx + 1 - return outlines + return outlines @@ -248,7 +248,3 @@ def GetCombineSectionFromClass(inClassName): if frmphimprtlnfound == False: print("error, from phactori import * not found in PhactoriDriver_modular.py") exit(-12) - - - - diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver.py index 90dde56b18..eabb655279 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -690,7 +690,7 @@ def TestUserDataForBypassScript(datadescription): myDebugPrint3("no user data, no catalyst_script_extra_file (2)\n") return - if(sa.GetNumberOfValues() > 8): + if(sa.GetNumberOfValues() > 8): catalyst_script_extra_file = sa.GetValue(8) if PhactoriDbg(100): myDebugPrint3(" catalyst_script_extra_file: ->" + \ @@ -901,7 +901,7 @@ def ParseSettingsFromJson(self, inJsn): halfH - betweenEyeY, -eyeToScreenDistance ] - + def GetScreenBottomLeft(self, inLeftEyeFlag): if inLeftEyeFlag: return self.mLeftEyeScreenBottomLeft @@ -1778,7 +1778,7 @@ def DebugPrintCellAndPointArrayInfo(label, pvFilter, priority): DebugPrintVtkDataArraysInfo("PointData:\n", theData, priority) theData = pvFilter.CellData DebugPrintVtkDataArraysInfo("CellData:\n", theData, priority) - + #def SetCpViewsAndCpWriters(inCpViews, inCpWriters): # global localCpViews # global localCpWriters @@ -2122,9 +2122,9 @@ def PhactoriCountCellTouchingEachFace(inInputCsData): "\nnum faces with 1 cell: " + str(cctef.totalNumFacesWithOneCellTouching) + \ "\nnum faces with 2 cells: " + str(cctef.totalNumFacesWithTwoCellsTouching) + \ "\nnum faces with 3+ cells: " + str(cctef.totalNumFacesWith3plCellsTouching) + "\n") - + return countCellsTouchingEachFace - + def PhactoriCountCellTouchingEachPoint(inInputCsData): numCells = inInputCsData.GetNumberOfCells() numPoints = inInputCsData.GetNumberOfPoints() @@ -2415,7 +2415,7 @@ def PhactoriGetAverageOfCellPoints(inInputCsData, oneCell): avgFac = 1.0/float(numPoints) vecScaleInPlace(avgFac, retAvgPt) return retAvgPt - + def PhactoriFindSelectedAngleBetweenEdgeAndCellNormal(inInputCsData, oneCell, compareNormal, paramUseSmallestAngle, paramOffsetIndex): edgeCompareDotProdList = [] @@ -2425,7 +2425,7 @@ def PhactoriFindSelectedAngleBetweenEdgeAndCellNormal(inInputCsData, oneCell, vecNormalize2(oneEdgeVec, oneEdgeVec) edgeCompareDotProd = abs(vecDotProduct(compareNormal, oneEdgeVec)) edgeCompareDotProdList.append(edgeCompareDotProd) - + sortedEdgeCompareDotProdList = sorted(edgeCompareDotProdList) if paramUseSmallestAngle: @@ -2440,7 +2440,7 @@ def DebugPrintPhactoriFindHeightOfCell(inInputCsData, oneCell, compareNormal): if PhactoriDbg(100): dbght = [] dbglen = [] - dbgretHeight = -1.0 + dbgretHeight = -1.0 dbgretHeightIndex = -1 for ii in range(0, numCellEdges): oneCellEdgeVec = PhactoriGetCellEdgeVector(inInputCsData, oneCell, ii) @@ -2469,7 +2469,7 @@ def PhactoriFindHeightOfCell(inInputCsData, oneCell, compareNormal): #than the four shortest sides? numCellEdges = oneCell.GetNumberOfEdges() - retHeight = -1.0 + retHeight = -1.0 for ii in range(0, numCellEdges): #get edge vectory and project on to normal vector (which is unit length) #and find magnitude @@ -2924,7 +2924,7 @@ def DebugPrintBlockName(csData, blockIndex): myDebugPrint3("oneBlockMetaData is None (2)\n") def PhactoriRecusivelyDoMethodPerBlockFromParaViewFilter(inRecursionControlItem, inPvFilter): - "grab client side data object, and use that to do recursion" + "grab client side data object, and use that to do recursion" pvClientSideData = inPvFilter.GetClientSideObject().GetOutputDataObject(0) if pvClientSideData == None: if PhactoriDbg(100): @@ -3009,7 +3009,7 @@ class PhactoriRenderViewInfo: def __init__(self): self.RenderView1 = None self.DataRepresentation1 = None - + #class PhactoriRenderViewInfo: # RenderView1 = None # DataRepresentation1 = None @@ -3156,12 +3156,12 @@ def SafeColorBy(inDataRepresentation, ptOrNodeAndVarname): if PhactoriDbg(100): myDebugPrint3("SafeColorBy returning (valid cell data)\n") return - + def SetDataRepresentationToDefault(inDataRepresentation): #a3_vel__PiecewiseFunction = CreatePiecewiseFunction( Points=[0.0, 0.0, 0.5, 0.0, 1.0, 1.0, 0.5, 0.0] ) - + inDataRepresentation.SelectionPointLabelColor = [0.5, 0.5, 0.5] inDataRepresentation.SelectionPointFieldDataArrayName = 'displ' inDataRepresentation.SuppressLOD = 0 @@ -3488,7 +3488,7 @@ def AddRenderView(inPhactoriImagesetInfo, inColorSettings, inPhactoriImagesetInfo.mPvDataRepresentation2 = DataRepresentation1 inPhactoriImagesetInfo.mVisiblePvDataReps[0] = DataRepresentation1 else: - DataRepresentation1 = inPhactoriImagesetInfo.mPvDataRepresentation2 + DataRepresentation1 = inPhactoriImagesetInfo.mPvDataRepresentation2 if PhactoriDbg(): myDebugPrint3("new DataRepresentation1: " + str(DataRepresentation1) + "\n") @@ -3631,9 +3631,9 @@ def CheckForParallelVector(vec1, vec2): if PhactoriDbg(): myDebugPrint3("same ratio between vectors, parallel\n") return True - + #given a bounds in the form [xmin, xmax, ymin, ymax, zmin, zmax], return the -# maximum dimension out of all those (max of xmax-xmin, ymax-ymin, and +# maximum dimension out of all those (max of xmax-xmin, ymax-ymin, and # zmax-zmin) def GetMaximumDimensionFromBounds(inBounds): maxDim = inBounds[1] - inBounds[0] @@ -4133,7 +4133,7 @@ def GetXyzForNodeOrElementParallelOneBlock(inInputCsData, inIdIsNode, def GetXyzForNodeOrElementParallelRecurse1(inInputCsData, inIdIsNode, inGlobalId, outXyz): "utility function used by GetXyzForNodeOrElementParallel\n\n looking for inGlobalId to potentially set outXyz, recurses through\n structure and calls GetXyzForNodeOrElementParallelOneBlock() on\n unstructured grids to do the real work of checking for the id and setting\n outXyz\n " - + #myDebugPrint3('GetXyzForNodeOrElementParallelRecurse1 entered\n', 100) icsdClassname = inInputCsData.GetClassName() @@ -4258,7 +4258,7 @@ def CalcRelativeCameraDistance2_AA(inFocalPoint, inNormCameraDir, "finds point X which is along the inNormCameraDir vector starting from\n point inFocalPoint, such that inTestPoint is visible. This is\n accomplished by taking a parametric value ss to move the camera position\n out from the focal point (along the inNormCameraDir vector) and finding\n the parametric value such that the angle between the vector from the\n camera position to the focal point and the camera position to inTestPoint\n is equal to (or greater than) the camera field of view. The parametric\n value is returned. We use the law of sines. assumes inNormCameraDir\n is normalized and pointing in the direction from inFocalPoint towards\n where we want to place the camera (the opposite of the look direction)" #angle between camera-to-focal point vector and camera-to-testpoint vector - #is equal to half the camera fOV. Call this angle AA. + #is equal to half the camera fOV. Call this angle AA. #The side opposite this angle has length equal to the distance between #the focal point and the test point. Call this distance aa. We also #know the angle between the focal point-to-camera vector and the focal @@ -4349,7 +4349,7 @@ def CalcRelativeCameraDistance2_BB(inFocalPoint, inNormCameraDir, myDebugPrint3("pointH: " + str(pointH) + "\n"); dd1 = CalcRelativeCameraDistance2_AA(inFocalPoint, inNormCameraDir, - pointH, inFovH) + pointH, inFovH) if PhactoriDbg(100): myDebugPrint3("dd1: " + str(dd1) + "\n"); dd2 = CalcRelativeCameraDistance2_AA(inFocalPoint, inNormCameraDir, @@ -4434,7 +4434,7 @@ def CalcRelativeCameraDistance2(inFocalPoint, inLookDirection, inUpVector, aspectRatio = float(inXyPixelSize[0]) / float(inXyPixelSize[1]) else: aspectRatio = float(pixelSizeWithBorder[0]) / float(pixelSizeWithBorder[1]) - + if PhactoriDbg(100): myDebugPrint3("bordered aspectRatio: " + str(aspectRatio) + "\n"); @@ -4558,7 +4558,7 @@ def SetParaViewRepresentationCameraParams(inXParaViewRenderView, inCameraC, if PhactoriDbg(): myDebugPrint3(' lookDirection ' + str(lookDirection) + '\n') - myViewBounds = viewBoundsIo[0] + myViewBounds = viewBoundsIo[0] if PhactoriDbg(): myDebugPrint3(' focalPoint ' + str(focalPoint) + '\n') @@ -5316,11 +5316,11 @@ def MakeFiltersFromViewMapOperationsC(ioPipeAndViewsState, inOperationBlocksJson keepConstructing = False #at the beginning of the loop, we haven't seen any unconstructed operations for operationName, operationBlock in ioPipeAndViewsState.mOperationBlocks.items(): if operationBlock.mHasBeenConstructed == False: - #this one still needs constructing, and we'll have to loop again to + #this one still needs constructing, and we'll have to loop again to #make sure all are constructed keepConstructing = True - #determine whether or not we can construct this operation yet, or if + #determine whether or not we can construct this operation yet, or if #we need to wait for something else to be constructed canBeConstructedNow = True inputOperationNames = operationBlock.GetListOfInputOperationNames() @@ -5329,7 +5329,7 @@ def MakeFiltersFromViewMapOperationsC(ioPipeAndViewsState, inOperationBlocksJson if inputBlock.mHasBeenConstructed == False: canBeConstructedNow = False break - + if PhactoriDbg(100): myDebugPrint3("trying: " + str(operationName) + "\n" + \ "depends on: " + str(inputOperationNames) + "\n" + \ @@ -5340,7 +5340,7 @@ def MakeFiltersFromViewMapOperationsC(ioPipeAndViewsState, inOperationBlocksJson operationBlock.mHasBeenConstructed = True if PhactoriDbg(100): myDebugPrint3("done constructing all operation blocks\n",100) - + #helper method: given a block A which potentially contains a key B with @@ -5403,7 +5403,7 @@ def CreateParaViewRepresentationAndViewFromInfoC(inImageset, inLookDirection, in raise Exception(errStr) meshRenderControl = theRepresentation.mMeshRenderControl - + showColorLegend = theRepresentation.mColorLegendFlag colorLegendPositionAndSize = theRepresentation.mColorLegendPositionAndSize showDataCubeAxes = theRepresentation.mDataCubeAxesFlag @@ -5433,7 +5433,7 @@ def CreateParaViewRepresentationAndViewFromInfoC(inImageset, inLookDirection, in numArrays = pvPvGeomFilterFromOp.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + pvPvGeomFilterFromOp.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" operation cell data arrays:\n") numArrays = pvPvGeomFilterFromOp.CellData.GetNumberOfArrays() @@ -5627,7 +5627,7 @@ def ParseOneCameraBlockC(ioCameraBlock, ioCameraBlockJson, inPipeAndViewsState): ioCameraBlock.mLookDirectionSpecifiedFlag = True else: ioCameraBlock.mLookDirectionSpecifiedFlag = False - + #get text to add to each image created with this camera, if any if "image name addon" in ioCameraBlockJson: ioCameraBlock.mFilenameAddon = ioCameraBlockJson["image name addon"] @@ -5679,7 +5679,7 @@ def ParseOneCameraBlockC(ioCameraBlock, ioCameraBlockJson, inPipeAndViewsState): 'lock camera call count', -1) if "lockingcamera" in ioCameraBlock.mName: ioCameraBlock.LockAfterNCalls = 1 - + def localGet1or0(inJsn, inKey, inDefault): value = getParameterFromBlock(inJsn, inKey, inDefault) @@ -6432,7 +6432,7 @@ def GetCurrentGeometricPoint(self, inParaViewSource, ioViewBounds, if PhactoriDbg(): myDebugPrint3(errStr) raise Exception(errStr) - + if PhactoriDbg(100): myDebugPrint3("GetCurrentGeometricPoint returning: " + \ str(returnXyz) + "\n", 100) @@ -6512,7 +6512,7 @@ def ParseParametersFromJson(self, inJsn): if 'auto size 1 view angle delta in degrees' in inJsn: angleInDegrees = inJsn['auto size 1 view angle delta in degrees'] self.mAutoSize1ViewAngleDeltaInRadians = math.radians(angleInDegrees) - + def SetUpIfEnabled(self, inRenderView, ioCameraPosition, ioLookAtPoint, inViewUpVector): @@ -6612,7 +6612,7 @@ def ChangeEyeAndFocusInModelSpaceForStereo(self, lookDirection = vecFromAToB(ioEyePosition, ioFocalPoint) axisBetweenEyes = vecCrossProduct(lookDirection, inViewUpVector) axisBetweenEyesNorm = vecNormalize(axisBetweenEyes) - + if self.mLeftEyeFlag: modelCsHalfIpd = -self.mIpdInModelUnits * \ self.mVirtualSelfSizeMultiplier * 0.5 @@ -7010,7 +7010,7 @@ def DcoaiParseParametersFromJson(self, parentAxesInfo, inJsn, inXyzKey): if theKey in inJsn: self.mUseLabelFlag = True self.mAxisLabel = getParameterFromBlock(inJsn, theKey, "") - + if PhactoriDbg(): myDebugPrint3('DcoaiParseParametersFromJson ' + inXyzKey + ' ' \ + str(parentAxesInfo.mShowTicks) + ' ' \ @@ -7136,7 +7136,7 @@ def DoUpdateDueToChangeInData(self, inIncomingPvFilter, if self.mVariableInfo.mVariableTypeNeedsDetection == False: UpdatePipelineWithCurrentTimeArgument(outOutgoingPvFilter) - + def ParseParametersFromJson(self, inJson): self.mBypassFlag = getParameterFromBlock(inJson, 'bypass flag', @@ -7592,7 +7592,7 @@ def CreateParaViewFilter(self, inInputFilter): numArrays = inInputFilter.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + inInputFilter.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" calculator inInputFilter cell data arrays:\n") numArrays = inInputFilter.CellData.GetNumberOfArrays() @@ -7932,13 +7932,13 @@ def IntersectWithOneRayViaBSPTree(self, inIndex, inRayStart, inRayDirection, if inPointOrCellData <= 0: oldvv = ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ GetValue(inIndex) - if (oldvv < 0.0) or (hitdist < oldvv): + if (oldvv < 0.0) or (hitdist < oldvv): ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitdist) else: oldvv = ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ GetValue(inIndex) - if (oldvv < 0.0) or (hitdist < oldvv): + if (oldvv < 0.0) or (hitdist < oldvv): ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitdist) @@ -8006,14 +8006,14 @@ def IntersectWithOneRay(self, inIndex, inRayStart, inRayDirection, oldvv = ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ GetValue(inIndex) newvv = hitPoint[3] - if (oldvv < 0.0) or (newvv < oldvv): + if (oldvv < 0.0) or (newvv < oldvv): ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitPoint[3]) else: oldvv = ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ GetValue(inIndex) newvv = hitPoint[3] - if (oldvv < 0.0) or (newvv < oldvv): + if (oldvv < 0.0) or (newvv < oldvv): ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitPoint[3]) @@ -8304,7 +8304,7 @@ def TestAndSet(self, inLengthSquared, inPt1, inPt2): self.LengthSquared = inLengthSquared vecCopy(self.Point1, inPt1) vecCopy(self.Point2, inPt2) - + class PhactoriSegmentGroup1: "manage a set of segments for purposes of showing raycast results" def __init__(self): @@ -8840,7 +8840,7 @@ def ParseOutputFilenameParametersFromJson(self, inJson): if (self.Precision < 1) or (self.Precision > 100): myDebugPrint3AndException("PhactoriCSVExportOperation:\n" "precision must be 1-100, not " + str(self.Precision) + "\n") - + def ParseParametersFromJson(self, inJson): self.ParseOutputFilenameParametersFromJson(inJson) @@ -8923,7 +8923,7 @@ def __init__(self): self.mCellNormalRayIntersectDistanceArray = None self.SegmentsFromPointRays = PhactoriSegmentGroup1() - self.SegmentsFromTriangleRays = PhactoriSegmentGroup1() + self.SegmentsFromTriangleRays = PhactoriSegmentGroup1() def ParseParametersFromJson(self, inJson): if "target operation" in inJson: @@ -8971,7 +8971,7 @@ def CreateParaViewFilter(self, inInputFilter): self.mTriangleRayLineSource = PVTrivialProducer() self.mTriangleRayLineSource.GetClientSideObject().SetOutput( self.SegmentsFromTriangleRays.mVtkPolyData) - + #newParaViewFilter = GroupDatasets(Input = []) #self.mGroupLineSource = newParaViewFilter @@ -8986,7 +8986,7 @@ def CreateParaViewFilter(self, inInputFilter): else: newParaViewFilter = PVTrivialProducer() passthru = inInputFilter.GetClientSideObject().GetOutputDataObject(0) - + numpts = passthru.GetNumberOfPoints() newvar = vtk.vtkDoubleArray() @@ -9085,7 +9085,7 @@ def RunCalculationToCastRays(self, ioPipeAndViewsState): #now loop through all processes; one process at a time share the triangles #from each process to the others and intersect with the local surface - #portion + #portion mypid = SmartGetLocalProcessId() @@ -9139,7 +9139,7 @@ def RunCalculationToCastRays(self, ioPipeAndViewsState): def ExportOperationData(self, datadescription): "this will be called once per callback (before WriteImages) to allow the\n operation to export any desired data which is not an image. The child\n class should override this method if it wants so do something.\n For PhactoriIntersectNodeNormalsWithSurface we will output information\n about the nearest and furthest intersections" - + if PhactoriDbg(100): myDebugPrint3( "PhactoriIntersectNodeNormalsWithSurface::ExportOperationData " @@ -9315,7 +9315,7 @@ def CreateParaViewFilter(self, inInputFilter): newParaViewFilter = Line() newParaViewFilter.Point1 = [0.0, 0.0, 0.0] newParaViewFilter.Point2 = [0.01, 0.01, 0.01] - + SetActiveSource(newParaViewFilter) SetActiveSource(savedActiveSource) @@ -9418,7 +9418,7 @@ def RunCalculationToFindNearestPoints(self, ioPipeAndViewsState): tgty = self.mClosestNPointsFromEachProcess.mTargetMatchXyzs.GetValue(pndx+1) tgtz = self.mClosestNPointsFromEachProcess.mTargetMatchXyzs.GetValue(pndx+2) - self.mLineSource.Point1 = [srcx, srcy, srcz] + self.mLineSource.Point1 = [srcx, srcy, srcz] self.mLineSource.Point2 = [tgtx, tgty, tgtz] self.mLineSource.UpdatePipeline() @@ -9461,7 +9461,7 @@ def OutputToTextAnnotation(self, ioPipeAndViewsState): tgty = clstpts.mTargetMatchXyzs.GetValue(pndx+1) tgtz = clstpts.mTargetMatchXyzs.GetValue(pndx+2) - if self.mTxtAntnFormatString == None: + if self.mTxtAntnFormatString == None: self.mTextAnnotationOutputTarget.mTextString = \ "nearest: " + str(dist) + "\n" \ "node id 1: " + str(srcndid) + "\n" \ @@ -9646,7 +9646,7 @@ def CreateParaViewFilter2(self, ioPipeAndViewsState): "Error: operation '" + str(ii) + "' paraview filter not " "constructed\n") self.mOperationList.append(inputOperationBlock.GetPvFilter()) - + newParaViewFilter = GroupDatasets(Input = self.mOperationList) SetActiveSource(newParaViewFilter) @@ -10340,7 +10340,7 @@ def ParseParametersFromJson(self, inJson): if PhactoriDbg(100): myDebugPrint3("PhactoriGlyphOperation.ParseParametersFromJson " "entered\n", 100) - + key1 = "scale factor" if key1 in inJson: self.scaleFactor = inJson[key1] @@ -10589,7 +10589,7 @@ def CreateParaViewFilter(self, inInputFilter): numArrays = inInputFilter.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + inInputFilter.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" extractblock inInputFilter cell data arrays:\n") numArrays = inInputFilter.CellData.GetNumberOfArrays() @@ -10608,7 +10608,7 @@ def CreateParaViewFilter(self, inInputFilter): numArrays = newParaViewFilter.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + newParaViewFilter.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" extractblock newParaViewFilter cell data arrays:\n") numArrays = newParaViewFilter.CellData.GetNumberOfArrays() @@ -10724,7 +10724,7 @@ def CreateParaViewFilter(self, inInputFilter): if PhactoriDbg(100): myDebugPrint3("PhactoriExtractComponentOperation:CreateParaViewFilter entered\n", 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3("about to call UpdatePipelineWithCurrentTimeArgument\n", 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) @@ -10769,7 +10769,7 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3('PhactoriCellSizeOperation:CreateParaViewFilter entered\n', 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3('about to call UpdatePipelineWithCurrentTimeArgument\n', 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) @@ -10818,7 +10818,7 @@ def ParseParametersFromJson(self, inJson): self.AppendPointLocations = 1 else: self.AppendPointLocations = 0 - + key2 = "append cell centers" if key2 in inJson: testval = inJson[key2] @@ -10841,7 +10841,7 @@ def CreateParaViewFilter(self, inInputFilter): if PhactoriDbg(100): myDebugPrint3('PhactoriAppendLocationAttributesOperation:CreateParaViewFilter entered\n', 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3('about to call UpdatePipelineWithCurrentTimeArgument\n', 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) @@ -10888,7 +10888,7 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3('PhactoriIntegrateVariablesOperation:CreateParaViewFilter entered\n', 100) #info in block class should already be parsed and checked - + if PhactoriDbg(100): myDebugPrint3('about to call UpdatePipelineWithCurrentTimeArgument\n', 100) UpdatePipelineWithCurrentTimeArgument(inInputFilter) @@ -11858,12 +11858,12 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3("stido0 st: " + str(stido0.GetClassName()) + "\n") stido1 = stcso.GetInputDataObject(1,0) myDebugPrint3("stido1 st: " + str(stido1.GetClassName()) + " numcells " + str(stido1.GetNumberOfCells()) + " numpoints " + str(stido1.GetNumberOfPoints()) + "\n") - + SetActiveSource(newParaViewFilter) SetActiveSource(savedActiveSource) UpdatePipelineWithCurrentTimeArgument(newParaViewFilter) - + if PhactoriDbg(100): stcso = newParaViewFilter.GetClientSideObject() stodo = stcso.GetOutputDataObject(0) @@ -11872,7 +11872,7 @@ def CreateParaViewFilter(self, inInputFilter): myDebugPrint3("B stido0 st: " + str(stido0.GetClassName()) + "\n") stido1 = stcso.GetInputDataObject(1,0) myDebugPrint3("B stido1 st: " + str(stido1.GetClassName()) + " numcells " + str(stido1.GetNumberOfCells()) + " numpoints " + str(stido1.GetNumberOfPoints()) + "\n") - + if PhactoriDbg(100): myDebugPrint3('PhactoriStreamTracerOperation.CreateParaViewFilter returning\n', 100) @@ -11952,14 +11952,14 @@ def CreateParaViewFilter2(self, inInputFilter, inPipeAndViewsState): #self.InternalParaViewFilterPtr.InitialStepLength = 0.01 self.DebugPrintInputPortAndOutputPortInfo("pre filter update 1\n") - + SetActiveSource(self.InternalParaViewFilterPtr) SetActiveSource(savedActiveSource) UpdatePipelineWithCurrentTimeArgument(self.InternalParaViewFilterPtr) self.DebugPrintInputPortAndOutputPortInfo("post filter update 1\n") - + if PhactoriDbg(100): myDebugPrint3("self.InternalParaViewFilterPtr: " + str(self.InternalParaViewFilterPtr) + "\n", 100) @@ -12043,7 +12043,7 @@ def CreateParaViewFilter2(self, inInputFilter, inPipeAndViewsState): self.InternalParaViewFilterPtr.CellLocator = 'Static Cell Locator' self.DebugPrintInputPortAndOutputPortInfo("pre filter update 1\n") - + SetActiveSource(self.InternalParaViewFilterPtr) SetActiveSource(savedActiveSource) @@ -12057,7 +12057,7 @@ def CreateParaViewFilter2(self, inInputFilter, inPipeAndViewsState): self.InternalParaViewFilterPtr.UpdatePipeline() self.DebugPrintInputPortAndOutputPortInfo("post filter update 1\n") - + if PhactoriDbg(100): myDebugPrint3("self.InternalParaViewFilterPtr: " + str(self.InternalParaViewFilterPtr) + "\n", 100) @@ -12099,7 +12099,7 @@ def ValidateJsonPointList(self): myDebugPrint3AndException(errStr) return True - + def ParseParametersFromJson(self, inJson): if 'filename' in inJson: self.JsonListFileName = inJson['filename'] @@ -12367,7 +12367,7 @@ def ValidateJsonPointList(self): errStr = "PhactoriPointSourceFromJsonList::ValidateJsonPointList\n" \ "point with index " + str(ptNdx) + "does not have three elements\n" myDebugPrint3AndException(errStr) - + def ParseParametersFromJson(self, inJson): if 'filename' in inJson: @@ -12458,13 +12458,13 @@ def UseMpiToFindGlobalNearestPointList(self, inTargetPointList, inDistanceSquare for idx in range(0, numSrcPnts): xyzIdx = idx*3 resultPoints.append([globalXyz[xyzIdx], globalXyz[xyzIdx+1], globalXyz[xyzIdx+2], globalNodeId[idx]]) - + if PhactoriDbg(100): myDebugPrint3("resultPoints:\n" + str(resultPoints) + "\n") if PhactoriDbg(100): myDebugPrint3("UseMpiToFindGlobalNearestPointList returning\n") - return resultPoints + return resultPoints def CalculateOneDisplacedPoint(self, srcPt, tgtPt, dispDist): deltaVec = vecFromAToB(srcPt, tgtPt) @@ -12491,7 +12491,7 @@ def CalculateDisplacedPointList(self): def FindCorrelatedInputOperationPoints(self, inInputFilter): "in parallel, using mpi to help, find the nodes from the input filter\n which are closest to the points in self.mJsonPointList, and record the\n 3d location of those points" - + #grab local process points thisProcessPointList = self.mPhactoriOperationBlockOwner.MakeListOfAllPointsAndNodeIdsOnThisProcessFromParaViewFilter(inInputFilter) @@ -12519,7 +12519,7 @@ def FindCorrelatedInputOperationPoints(self, inInputFilter): distx = math.sqrt(distSqrd) myDebugPrint3(str(ndx) + ": " + str(sourcePt) + " " + str(distSqrd) + " " + str(distx) + " " + str(self.DisplacedPointList[ndx]) + "\n") - + def CreateParaViewFilter(self, inInputFilter): if PhactoriDbg(100): myDebugPrint3("PhactoriPointSourceFromJsonList.CreateParaViewFilter entered\n", 100) @@ -12980,11 +12980,11 @@ def PhactoriLocalToGlobalCellsWithMinMaxDataUsingMPI(localPidMinMaxCellPair, tup globalMaxCell = PhactoriSampledCellInfo() globalMinCell.SerializeSetFromFloatAndIntArray(globalSerializedFloatArray, globalSerializedIntArray, 0, tupleSize) globalMaxCell.SerializeSetFromFloatAndIntArray(globalSerializedFloatArray, globalSerializedIntArray, 1, tupleSize) - + if PhactoriDbg(100): myDebugPrint3("PhactoriLocalToGlobalCellsWithMinMaxDataUsingMPI returning\n") - return [globalMinCell, globalMaxCell] - + return [globalMinCell, globalMaxCell] + #phactori_combine_to_single_python_file_subpiece_end_1 #phactori_combine_to_single_python_file_parent_1 @@ -13018,7 +13018,7 @@ def ValidateJsonPointList(self): errStr = "PhactoriPointSourceGeometrySampler1::ValidateJsonPointList\n" \ "point with index " + str(ptNdx) + "does not have three elements\n" myDebugPrint3AndException(errStr) - + def ParseParametersFromJson(self, inJson): if 'filename' in inJson: @@ -13041,7 +13041,7 @@ def GetPidWithLeastValueList(self, inLocalDistSqrdList): pidWithDataList = UseReduceOnIntegerList(localPidList, 0) return pidWithDataList, globalDistSqrdList - + def UseMpiToGetGlobalQuadsClosest(self, inLocalQuadList, inLocalDistSqrdList): if PhactoriDbg(100): myDebugPrint3("PhactoriPointSourceGeometrySampler1.UseMpiToGetGlobalQuadsClosest entered\n", 100) @@ -13375,7 +13375,7 @@ def ValidateJsonSegmentList(self, testlist): errStr = "PhactoriSegmentCellSampler3:ValidateJsonSegmentList\n" \ "segment with index " + str(segNdx) + " point 2 does not have 3 components\n" myDebugPrint3AndException(errStr) - + return True def ParseParametersFromJson(self, inJson): @@ -13532,7 +13532,7 @@ def CreateInternalSegmentListFromJson(self, segmentListJson): if PhactoriDbg(100): myDebugPrint3("PhactoriSegmentCellSampler3.ExportOperationData entered\n", 100) - if self.SegmentDefinitionFormat == "two geometric points": + if self.SegmentDefinitionFormat == "two geometric points": self.ValidateJsonSegmentList(segmentListJson) self.SegmentList = [] self.NearbyGeometryPointList = [] @@ -13613,7 +13613,7 @@ def CreateParaViewFilter(self, inInputFilter): savedActiveSource = GetActiveSource() segmentListJson = ReadAndMpiBroadcastJsonFile(self.JsonListFileName) - + self.myCopyOfInputFilter = inInputFilter UpdatePipelineWithCurrentTimeArgument(self.myCopyOfInputFilter) @@ -13680,7 +13680,7 @@ def GetPidWithLeastValueList(self, inLocalDistSqrdList): pidWithDataList = UseReduceOnIntegerList(localPidList, 0) return pidWithDataList, globalDistSqrdList - + def UseMpiToGetGlobalCellPointsClosestStructured(self, ioCellList, inLocalDistSqrdList): if PhactoriDbg(100): myDebugPrint3("PhactoriSegmentCellSampler3.UseMpiToGetGlobalCellPointsClosestStructured entered\n", 100) @@ -13870,12 +13870,12 @@ def SetMaskValueForCellsNearSegmentsInBlock(recursionObject, inInputCsData, inPa thisCellDataTuple = outputCellArray.GetTuple(cellIndex) newCellInfo = PhactoriSampledCellInfo() newCellInfo.SetFromList([cellTestPoint, [-1,-1,-1], thisCellDataTuple, myPid, leafVisitCount, cellIndex, segIndex, -1]) - + inParameters.markedCellSet[segIndex].append(newCellInfo) if PhactoriDbg(100): myDebugPrint3("new cell close to segment:\n") myDebugPrint3(newCellInfo.ToStr()) - + if PhactoriDbg(100): for idx, cellsForThisSegment in enumerate(inParameters.markedCellSet): @@ -14381,7 +14381,7 @@ def CreateProgrammableFilterString(self): scriptLines.append(" iter.GoToNextItem();\n") scriptLines.append("else:\n") scriptLines.append(" flatten(input, output)\n") - + mainScriptString = "".join(scriptLines) myCellIndexesToSet = [] @@ -14395,10 +14395,10 @@ def CreateProgrammableFilterString(self): myCellIndexesToSet.append(oneCellInfo.index) myMaskValuesToSet.append(maskValue) myLeafVisitCount.append(oneCellInfo.leafVisitCount) - - newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" - newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" - newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" + + newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" + newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" + newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" self.mProgFilterString = newstr1 + newstr2 + newstr3 + mainScriptString if PhactoriDbg(100): @@ -14696,7 +14696,7 @@ def GatherGeometricallySampledCellsInBlock(recursionObject, inInputCsData, inPar myDebugPrint3("None\n") else: myDebugPrint3(str(oneCellDataArray.GetNumberOfTuples()) + "\n") - + if dataArrayNumCmpnts != 0: defaultTuple = [] for ii in range(0, dataArrayNumCmpnts): @@ -14876,7 +14876,7 @@ def CreateInternalListOfDataControlledSampledCellsOnThisProcess(self): else: myDebugPrint3AndException("CreateInternalListOfDataControlledSampledCellsOnThisProcess:\n" +\ "bad self.DataControlledSamplingMethod\n") - + if PhactoriDbg(100): myDebugPrint3("CreateInternalListOfDataControlledSampledCellsOnThisProcess returning\n") @@ -14939,7 +14939,7 @@ def CollectDataOnSampledCellsInBlock(recursionObject, inInputCsData, inParameter myDebugPrint3("None\n") else: myDebugPrint3(str(oneCellDataArray.GetNumberOfTuples()) + "\n") - + if dataArrayNumCmpnts != 0: defaultTuple = [] for ii in range(0, dataArrayNumCmpnts): @@ -15009,7 +15009,7 @@ def CreateLeafRecursionTrackingStructure(self): for leafKey in self.GeometricallySampledCellsByRecursionLeaf: cellListForLeaf = self.GeometricallySampledCellsByRecursionLeaf[leafKey] myDebugPrint3(str(len(cellListForLeaf)) + " cells for leaf " + str(leafKey) + "\n") - + if PhactoriDbg(100): myDebugPrint3("CreateLeafRecursionTrackingStructure returning\n") @@ -15228,7 +15228,7 @@ def CreateProgrammableFilterString(self): scriptLines.append(" iter.GoToNextItem();\n") scriptLines.append("else:\n") scriptLines.append(" flatten(input, output)\n") - + self.mainScriptString = "".join(scriptLines) myCellIndexesToSet = [] @@ -15246,10 +15246,10 @@ def CreateProgrammableFilterString(self): myCellIndexesToSet.append(oneCellInfo.index) myMaskValuesToSet.append(maskValue) myLeafVisitCount.append(oneCellInfo.leafVisitCount) - - newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" - newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" - newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" + + newstr1 = "cellIndexesToSet = " + str(myCellIndexesToSet) + "\n" + newstr2 = "maskValuesToSet = " + str(myMaskValuesToSet) + "\n" + newstr3 = "leafVisitCount = " + str(myLeafVisitCount) + "\n" self.mProgFilterString = newstr1 + newstr2 + newstr3 + self.mainScriptString if PhactoriDbg(100): @@ -15391,7 +15391,7 @@ def GetPidWithLeastValueListV5(inLocalDistSqrdList): pidWithDataList = UseReduceOnIntegerList(localPidList, 0) return pidWithDataList, globalDistSqrdList - + def UseMpiToGetGlobalCellPointsClosestV5(inInputFilter, inLocalCellPointList, inLocalDistSqrdList): if PhactoriDbg(100): @@ -15784,7 +15784,7 @@ def FigureBlockIndicesFromBlockList(includeBlockList, inInputFilter): listOfBlockIndicesToInclude = [] FigureBlockIndicesFromBlockListRecurse1(listOfBlockIndicesToInclude, includeBlockList, csdata, None, flatIndexCounter, 0) - + #if PhactoriDbg(100): # myDebugPrint3("number of times existing block names found:\n") # for blknm, count in gDuplicateNameCounter.items(): @@ -15902,7 +15902,7 @@ def ParseParametersFromJson(self, inJson): def MakeExtractBlockFilter(self, inInputFilter, blockName): if PhactoriDbg(100): myDebugPrint3("MakeExtractBlockFilter entered: " + str(blockName) + "\n") - newPvExtractBlockFilter = ExtractBlock(inInputFilter) + newPvExtractBlockFilter = ExtractBlock(inInputFilter) #newParaViewFilter.PruneOutput = 1 #newParaViewFilter.MaintainStructure = 0 #newParaViewFilter.MaintainStructure = 1 @@ -15933,7 +15933,7 @@ def CreateIjkRangeFromSettingsForThisBlock(self, ijkJson, blockExtent): rngFunc = [0,0,0,0,0,0] if rngFuncAllAbsolute: - retIjkRange = ijkJson["ijkrange"] + retIjkRange = ijkJson["ijkrange"] if PhactoriDbg(100): myDebugPrint3("rngFunc is [0,0,0,0,0,0], all absolute, " "so just return explicit ijkrange:\nretIjkRange: \n" + \ @@ -15946,7 +15946,7 @@ def CreateIjkRangeFromSettingsForThisBlock(self, ijkJson, blockExtent): return [0,-1,0,-1,0,-1] if "ijkrange" in ijkJson: - ijkRangeFromJson = ijkJson["ijkrange"] + ijkRangeFromJson = ijkJson["ijkrange"] else: ijkRangeFromJson = [0,0,0,0,0,0] @@ -15987,22 +15987,22 @@ def CreateIjkRangeFromSettingsForThisBlock(self, ijkJson, blockExtent): if hadToCorrect: if PhactoriDbg(100): myDebugPrint3("return ijkrange had to be corrected because it was outside block extent" - "\nblockExtent: " + str(blockExtent) + - "\nijkRangeFromJson: " + str(retIjkRange) + - "\nrngFunc (from json): " + str(rngFunc) + + "\nblockExtent: " + str(blockExtent) + + "\nijkRangeFromJson: " + str(retIjkRange) + + "\nrngFunc (from json): " + str(rngFunc) + "\nuncorrectedIjkRange: " + str(uncorrectedIjkRange) + "\nretIjkRange: " + str(retIjkRange) + "\n") else: if PhactoriDbg(100): myDebugPrint3("return ijkrange did not need correction" - "\nblockExtent: " + str(blockExtent) + + "\nblockExtent: " + str(blockExtent) + "\nijkRangeFromJson: " + str(retIjkRange) + - "\nrngFunc (from json): " + str(rngFunc) + + "\nrngFunc (from json): " + str(rngFunc) + "\nretIjkRange: " + str(retIjkRange) + "\n") return retIjkRange - - + + def MakeExtractSubsetFilter(self, extractBlockFilter, oneBlockExtractSubsetJson, oneBlockExtents): if PhactoriDbg(100): myDebugPrint3("MakeOneExtractBlockExtractSubsetFilter entered\n") @@ -16052,7 +16052,7 @@ def MakeGroupAllExtractSubsetsFilter(self): if PhactoriDbg(100): myDebugPrint3("MakeGroupAllExtractSubsetsFilter returning\n") - + def CreateParaViewFilter(self, inInputFilter): "create the PhactoriExtractStructuredMultiBlock filter for ParaView" if PhactoriDbg(100): @@ -16889,7 +16889,7 @@ def TestPointSub2(self, inSrcId, inSrcXyz, inTgtId, inTgtXyz, inNrstdist): # str(self.mTargetMatchXyzs.GetValue(gndx+2)) + "\n") #now find which in the current list has the biggest distance, as it is - #next in line for replacement (we do this to avoid having to shift + #next in line for replacement (we do this to avoid having to shift #elements every time self.mcfndx = 0 self.mMinDistSqrd = self.mDistSqrds.GetValue(0) @@ -16957,7 +16957,7 @@ def TestPointSub1(self, inId, inX, inY, inZ, tId, tX, tY, tZ): str(self.mTargetMatchXyzs.GetValue(gndx+2)) + "\n") #now find which in the current list has the biggest distance, as it is - #next in line for replacement (we do this to avoid having to shift + #next in line for replacement (we do this to avoid having to shift #elements every time self.mcfndx = 0 self.mMinDistSqrd = self.mDistSqrds.GetValue(0) @@ -17061,7 +17061,7 @@ def MakeListOfAllPoints1(self): self.DoMethodPerBlock(recursionItem) return recursionItem.mParameters.mGlobalNodeIdList, \ recursionItem.mParameters.mPointXYZList - + def MakeListOfAllPointsInBlock1(self, inInputCsData, inParameters): #if PhactoriDbg(100): # myDebugPrint3("MakeListOfAllPointsInBlock1 entered\n") @@ -17428,7 +17428,7 @@ def ParseParametersFromJson(self, inJson): self.OutputShortestLongestIndex = 0 keyval10 = "output cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.ProgrammableFilterOutputCellVariableName = inJson[keyval10] def CreateParaViewFilter(self, inInputFilter): @@ -17675,10 +17675,10 @@ def ParseParametersFromJson(self, inJson): self.OffsetIndex = 0 keyval10 = "output angle cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.OutputAngleCellVariableName = inJson[keyval10] keyval10 = "output height cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.OutputHeightCellVariableName = inJson[keyval10] keyval11 = "do operation in createparaview method" @@ -17928,7 +17928,7 @@ def ParseParametersFromJson(self, inJson): self.OffsetIndex = 0 keyval10 = "output cell variable name" - if keyval10 in inJson: + if keyval10 in inJson: self.OutputCellVariableName = inJson[keyval10] keyval11 = "do operation in createparaview method" @@ -18494,7 +18494,7 @@ def CreateParaViewStuff(self, inColor, inImageset = None): "to work off, and None was supplied\n") return self.mInputOperation = inImageset.mOperation - + savedActiveSource = GetActiveSource() inOprtn = self.mInputOperation if(inOprtn.mParaViewTimeAnnotationSource == None): @@ -18644,11 +18644,11 @@ def SetSizeScale(self, inNewSizeScale): def SetWindowLocation(self, inNewPosition): global gParaViewCatalystVersionFlag if gParaViewCatalystVersionFlag < 51000: - validPositions = ['UpperLeftCorner', 'UpperRightCorner', + validPositions = ['UpperLeftCorner', 'UpperRightCorner', 'LowerLeftCorner', 'LowerRightCorner', 'UpperCenter', 'LowerCenter'] else: - validPositions = ['Upper Left Corner', 'Upper Right Corner', + validPositions = ['Upper Left Corner', 'Upper Right Corner', 'Lower Left Corner', 'Lower Right Corner', 'Upper Center', 'Lower Center'] if inNewPosition in validPositions: @@ -18758,7 +18758,7 @@ def GetImageFilename(self, datadescription, inImageSettings, inImageBasedirectory = inImageSettings.mImageBasedirectory inNumCounterDigits = inImageSettings.mNumCounterDigits inImageFormat = inImageSettings.mImageFormat - + timestep = datadescription.GetTimeStep() lastImagesetName = "" @@ -18793,7 +18793,7 @@ def GetImageFilename(self, datadescription, inImageSettings, while len(timestepString) < inNumCounterDigits: timestepString = "0" + timestepString myDebugPrint2("image fname: " + fname + "\ndigit count: " + str(inNumCounterDigits) + "\ntimestepString: " + timestepString + "\n") - + rplstr1 = None if self.mUseDateTime: ttnow = gPipeAndViewsState.mCallbackDateTime @@ -18823,7 +18823,7 @@ def GetImageFilename(self, datadescription, inImageSettings, fnameRR = fname.replace("%t", rplstr1) else: fnameRR = None - + fname = fname.replace("%t", timestepString) myDebugPrint2("fname after replace: ->" + fname + "<-\n") @@ -18852,7 +18852,7 @@ class PhactoriPlot1Base: def __init__(self): self.mName = "" self.m_DataCubeAxesInfo = PhactoriDataCubeAxesInfo() - + self.m_PlotType = "PhactoriPlot1Base" self.mImageSettings = PhactoriImageSettings() self.mImageSettings.mPixelBorderRatioXY = [0.175 / self.mImageSettings.GetAspectRatio(), 0.175] @@ -18911,7 +18911,7 @@ def WriteImages(self, datadescription): oneLookDirectionFilenameAddon = "" else: oneLookDirectionFilenameAddon = "" - + fname, fnameRR = self.mImageFileNameCountSettings.GetImageFilename( datadescription, self.mImageSettings, oneLookDirectionFilenameAddon, @@ -19781,7 +19781,7 @@ def ParseOperationAndRepresentationPair(self, ioPipeAndViewsState, ioJson, "inOperationKey: " + str(inOperationKey) + "\n" "inRepresentationKey: " + str(inRepresentationKey) + "\n" "incoming json:\n" + str(ioJson) + "\n") - + if inOperationKey not in ioJson: if inSkipIfOperationKeyNotPresent: @@ -20031,7 +20031,7 @@ def PerRendersetInitialization(datadescription): #cellDataInfo = paraviewSource.GetCellDataInformation() myDebugPrint3(" PerRendersetInitialization:\n num cells: " + str(pvsDi.GetNumberOfCells()) + "\n num points: " + str(pvsDi.GetNumberOfPoints()) + "\n") - #we assume to begin with that all global data bounds in operations are + #we assume to begin with that all global data bounds in operations are #invalid as data may have changed for oneOperationName, oneOperation in \ gPipeAndViewsState.mOperationBlocks.items(): @@ -20064,7 +20064,7 @@ def UpdateRepresentationColorBy(ioPhactoriImagesetBlock): if PhactoriDbg(100): myDebugPrint3("in PhactoriImagsetBlock named: " + \ ioPhactoriImagesetBlock.mName + "\n" + \ - "mColorLegendRepRefs " + str(ii) + + "mColorLegendRepRefs " + str(ii) + "is set to " + str(retVal) + "\n") ioPhactoriImagesetBlock.mColorLegendRepRefs[ii] = retVal @@ -20097,7 +20097,7 @@ def UpdateRepresentationColorBySub1(inPvView, inPvRep, if PhactoriDbg(100): myDebugPrint3('bad element type: returning\n', 100) return None - + if colorVarName != '': if inPhactoriRep.mColorVariableInfo.mVariableIsVectorComponent: ColorByVariableComponentOrMagnitudeXX(inPvRep, inPhactoriRep, @@ -20404,7 +20404,7 @@ def SaveRestartInfoCallback(): for onePlotOtName, onePlotOt in \ gPipeAndViewsState.mPlotOverTimeBlocks.items(): if PhactoriDbg(): - myDebugPrint3("making end vis callback json for plot over time: " + + myDebugPrint3("making end vis callback json for plot over time: " + onePlotOtName + "\n") plotsOverTimeJsonOut[onePlotOtName] = onePlotOt.GetRestartInfo() @@ -20511,7 +20511,7 @@ def HandleOperationShortcuts2(inBlockName, inJson, ioOperationBlocks, inCount): if PhactoriDbg(): myDebugPrint3(errStr) raise Exception(errStr) - #stuff should have 4 items + #stuff should have 4 items #[scalar|vector magnitude|vector component|tensor #component, component, namekeep between|keep above|keep #below, [, ]] @@ -20531,7 +20531,7 @@ def HandleOperationShortcuts2(inBlockName, inJson, ioOperationBlocks, inCount): if PhactoriDbg(): myDebugPrint3(errStr) raise Exception(errStr) - + if PhactoriDbg(): myDebugPrint3('got threshold operation shortcut ' + str(newOperationJson) + '\n') if lastShortcutOperationName != None: @@ -21130,7 +21130,7 @@ def CreateViewSetFromPhactoriViewMapC(inViewMapC): myDebugPrint3(str(inViewMapC) + "\n") global gPipeAndViewsState gPipeAndViewsState.mJsonDescription = inViewMapC - + #get pointers to the various block types (currently 6, camera, #representation, operation, imageset, plot over time, and scatter plot) @@ -21723,7 +21723,7 @@ def ColorByBlock(inParaViewDataSource, inParaViewDataRepresentation, ColorByBlockRecurse1(csdata, blockAndLeafBlockCounter, inParaViewDataRepresentation.BlockColor, False) #inParaViewDataRepresentation.BlockColor = blockColorData - + if PhactoriDbg(100): myDebugPrint3(' block color data: ' + str(inParaViewDataRepresentation.BlockColor) + '\n', 100) if PhactoriDbg(100): @@ -21774,8 +21774,8 @@ def UseDataRangeForColorValues(inPvDataRepresentation, inRepresentation, if PhactoriDbg(): myDebugPrint3(" input:" + str(input) + "\n") UpdatePipelineWithCurrentTimeArgument(input) - - #assume point info + + #assume point info #datainformation = rep.Input.GetPointDataInformation() if pointsOrCellsType == gPointsString: @@ -21979,7 +21979,7 @@ def helpFindNewRgbPoint(inBaseRgbPts, inRatio): #print "deltaPt: ", deltaPt #print "ratioPt: ", ratioPt - subrangePt1 = [inRatio, + subrangePt1 = [inRatio, rr1 + ratioPt * (rr2 - rr1), gg1 + ratioPt * (gg2 - gg1), bb1 + ratioPt * (bb2 - bb1)] @@ -22306,7 +22306,7 @@ def ShowCubeAxesXX(inPvRenderView, inOnOrOff, inShowDataCubeAxesInfo = None): SetAxesGridVisibility(inPvRenderView, 0) if PhactoriDbg(100): myDebugPrint3("ShowCubeAxesXX returning\n", 100) - + def ShowDataColorLegendXX(inPvView, inOnOffSetting, inColorLegendPositionAndSize, inColorSettings, @@ -22452,7 +22452,7 @@ def ShowDataColorLegendXX(inPvView, defaultMidPos = 0.5 - 0.5*defaultLegendLength #legendFontSize = 16 #legendSize = 1.0 - #validPositions = ['UpperLeftCorner', 'UpperRightCorner', + #validPositions = ['UpperLeftCorner', 'UpperRightCorner', # 'LowerLeftCorner', 'LowerRightCorner', # 'UpperCenter', 'LowerCenter'] legendPosition=[0.0, 0.0] @@ -22494,7 +22494,7 @@ def ShowDataColorLegendXX(inPvView, defaultMidPos = 0.5 - 0.5*defaultLegendLength #legendFontSize = 16 #legendSize = 1.0 - #validPositions = ['UpperLeftCorner', 'UpperRightCorner', + #validPositions = ['UpperLeftCorner', 'UpperRightCorner', # 'LowerLeftCorner', 'LowerRightCorner', # 'UpperCenter', 'LowerCenter'] legendPosition=[0.0, 0.0] @@ -22742,9 +22742,9 @@ def ExtractComponentFromVectorVariable(inVariableName, inWhichComponent, inResul newFunctionString = "" if(inWhichComponent == 0): newFunctionString = inVariableName + '_X' - elif(inWhichComponent == 1): + elif(inWhichComponent == 1): newFunctionString = inVariableName + '_Y' - elif(inWhichComponent == 2): + elif(inWhichComponent == 2): newFunctionString = inVariableName + '_Z' else: if PhactoriDbg(): @@ -22830,7 +22830,7 @@ def CollectCells2(inClientSideData, inBlockIndex, ioCollectList, ioTotalCellCoun appendCount += 1 if PhactoriDbg(): myDebugPrint3(' proc ' + str(SmartGetLocalProcessId()) + ' Leaving CollectCells2\n') - + def CollectCells1(cellVariableName, thresholdValue, thresholdDir): if PhactoriDbg(): @@ -22932,7 +22932,7 @@ def UseReduceToSpreadValues(ioListOfValues): if value != 0.0: value = -value ioListOfValues[ii] = value - + if PhactoriDbg(): myDebugPrint3(' ' + 'proc ' + str(SmartGetLocalProcessId()) + ' final values: ' + str(ioListOfValues) + '\n') if PhactoriDbg(100): @@ -23315,7 +23315,7 @@ def GetRestartInfo(self): # def SetRepresentationAndViewColors(self, ioRenderViewInfo): # myDebugPrint3('PlotColorInfo.SetRepresentationColors entered\n', 100) # rep1 = ioRenderViewInfo.DataRepresentation1 -# view1 = ioRenderViewInfo.RenderView1 +# view1 = ioRenderViewInfo.RenderView1 # view1.Background = self.m_BackgroundColor # rep1.EdgeColor = self.m_EdgeColor # rep1.DiffuseColor = self.m_DiffuseColor @@ -23324,7 +23324,7 @@ def GetRestartInfo(self): # rep1.BackfaceDiffuseColor = self.m_BackfaceDiffuseColor # rep1.CubeAxesColor = self.m_CubeAxesColor # myDebugPrint3('PlotColorInfo.SetRepresentationColors returning\n', 100) - + #global gPlotColorInfoPreset #gPlotColorInfoPreset = PlotColorInfo() @@ -23708,7 +23708,7 @@ def FindNodeOrElementIdForMinMax(inputcsData, inVariableInfo): myDebugPrint3("min/max not available, calculating\n", 100) DataMinMax = [0.0, 0.0, False] DataSumCnt = [0.0, 0] - FindMinMaxSumCntFromData(inputcsData, inVariableInfo, + FindMinMaxSumCntFromData(inputcsData, inVariableInfo, None, DataMinMax, DataSumCnt, None, None) else: @@ -23735,7 +23735,7 @@ def FindNodeOrElementIdForMinMax(inputcsData, inVariableInfo): inVariableInfo.mStats.mMaxId = idForMinAndidForMax[1] #mark done for this catalyst callback, so we won't do extra mpi - #communication if we call this routine again + #communication if we call this routine again inVariableInfo.mStats.mIdsTestCounter = gPipeAndViewsState.mFrameTagCounter if PhactoriDbg(100): @@ -24245,7 +24245,7 @@ def FindThisProcessorMinMaxForVar(inOperation, inVariableInfo): return myDataMinMax -def FindMinMaxSumCntFromData(inputcsData, inVariableInfo, +def FindMinMaxSumCntFromData(inputcsData, inVariableInfo, inSecondaryVariableInfo, DataMinMax, DataSumCnt, DataForIds, inPlotIdLineList): "fairly complex high level mpi-operation routine. This takes a paraview\n filter client side object, gets the client side data\n (which is presumably a multiblock\n dataset) and finds the min, max, sum, and count of items for a variable.\n It uses MPI (if the item is not global) to share values and get them\n across all processors. Used for plotting min/max/mean and for evaluating\n boolean criteria (such as whether or not to produce images) for min/max\n /mean/count. Data return is a bit messy and should be updated--it fills\n in DataMinMax, DataSumCnt, and DataForIds if it is not None" @@ -24253,7 +24253,7 @@ def FindMinMaxSumCntFromData(inputcsData, inVariableInfo, if PhactoriDbg(): myDebugPrint3("FindMinMaxSumCntFromData entered\n") - FindMinMaxSumCntFromDataRecurse1(inputcsData, inVariableInfo, + FindMinMaxSumCntFromDataRecurse1(inputcsData, inVariableInfo, inSecondaryVariableInfo, DataMinMax, DataSumCnt, DataForIds, inPlotIdLineList) @@ -24326,7 +24326,7 @@ def SetPlotOverTimePointsFromData(ioPlotInfo): DataForIds = None FindMinMaxSumCntFromData(inputcsData, - ioPlotInfo.m_YAxisVariableInfo, ioPlotInfo.m_XAxisVariableInfo, + ioPlotInfo.m_YAxisVariableInfo, ioPlotInfo.m_XAxisVariableInfo, DataMinMax, DataSumCnt, DataForIds, ioPlotInfo.m_IdPlotLineList) if DataSumCnt[1] == 0: @@ -24422,7 +24422,7 @@ def SetPlotPointsFromData(ioPlotInfo): #myDebugPrint3(' done updating ids\n') - + FindPlotXYZMinMax(plotPts, ioPlotInfo.m_xyzMinMaxTrkC) ScalePlotYForFit(plotPts, ioPlotInfo.m_xyzMinMaxTrkC, @@ -24858,7 +24858,7 @@ def UseMpiToSendAllProcessesFloatArrayToOneProcess(thisProcessFloatArray, pidToC retVal = [] if PhactoriDbg(100): - if len(globalFloatArray) == 0: + if len(globalFloatArray) == 0: myDebugPrint3(str(len(globalFloatArray)) + "\n") else: myDebugPrint3(str(len(globalFloatArray)) + " " + str(globalFloatArray[0]) + " " + str(globalFloatArray[-1]) + "\n") @@ -25897,7 +25897,7 @@ def TestForTruth(self, ioPipeAndViewsState): DataMinMax = [0.0, 0.0, False] DataSumCnt = [0.0, 0] - FindMinMaxSumCntFromData(inputcsData, self.mVariableInfo, None, + FindMinMaxSumCntFromData(inputcsData, self.mVariableInfo, None, DataMinMax, DataSumCnt, None, None) #just return false if there is no min/max found @@ -26255,16 +26255,16 @@ def InitializePerPipeRoot(datadescription, inCoprocessor): sa4 = sa[4] sa5 = sa[5] dbDummyFname = sa[6] - if(len(sa) > 7): + if(len(sa) > 7): defaultDirectory = sa[7] else: defaultDirectory = "" - if(len(sa) > 8): + if(len(sa) > 8): catalyst_script_extra_file = sa[8] else: catalyst_script_extra_file = "" - outputResultBaseId, remeshRestartTag = parseDbDummyFname(dbDummyFname) + outputResultBaseId, remeshRestartTag = parseDbDummyFname(dbDummyFname) if PhactoriDbg(): myDebugPrint3(" extra data list:\n") if PhactoriDbg(): @@ -26624,7 +26624,7 @@ class Pipeline: #reuse same coprocesor instance (?), then have LocalWriteImages3 only do the images for a given output results bloxk:q #PhactoriScript.CreatePipeline(datadescription) - + return Pipeline() class CoProcessor(coprocessing.CoProcessor): @@ -26773,7 +26773,7 @@ def compareTearDeath(tList, dList): myDebugPrint2('compareTearDeath entered\n') myDebugPrint2('compareTearDeath returning\n') #end tear/death persistence; not used now but may be useful later - + # ---------------------- Data Selection method ---------------------- @@ -26799,14 +26799,14 @@ def RequestDataDescription(datadescription): if GetBypassUserDataFlag() == False: fd = datadescription.GetUserData() - + if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} return returnViewMapC global gCatchAllExceptionsAndPassUpFlag - if gCatchAllExceptionsAndPassUpFlag: + if gCatchAllExceptionsAndPassUpFlag: try: return RequestDataDescriptionSub(datadescription) except: @@ -26824,7 +26824,7 @@ def RequestDataDescriptionSub(datadescription): if GetBypassUserDataFlag() == False: fd = datadescription.GetUserData() - + if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} @@ -26887,15 +26887,15 @@ def DoCoProcessing(datadescription): fd = datadescription.GetUserData() - + if GetBypassUserDataFlag() == False: if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} return returnViewMapC - + global gCatchAllExceptionsAndPassUpFlag - if gCatchAllExceptionsAndPassUpFlag: + if gCatchAllExceptionsAndPassUpFlag: try: DoCoProcessingSub(datadescription) except: @@ -26915,13 +26915,13 @@ def DoCoProcessingSub(datadescription): fd = datadescription.GetUserData() - + if GetBypassUserDataFlag() == False: if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} return returnViewMapC - + global coprocessor global gFirstTimeInDoCoProcessing global gSkipCountdown @@ -26994,7 +26994,7 @@ def DoCoProcessingSub(datadescription): coprocessor.WriteData(datadescription) coprocessor.LocalExportOperationsData3(datadescription) - + # Write image capture (Last arg: rescale lookup table), if appropriate. coprocessor.LocalWriteImages3(datadescription, rescale_lookuptable=False) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver_modular.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver_modular.py index 73dd77523a..440c79dcbe 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver_modular.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/PhactoriDriver_modular.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -105,7 +105,7 @@ class Pipeline: #reuse same coprocesor instance (?), then have LocalWriteImages3 only do the images for a given output results bloxk:q #PhactoriScript.CreatePipeline(datadescription) - + return Pipeline() class CoProcessor(coprocessing.CoProcessor): @@ -254,7 +254,7 @@ def compareTearDeath(tList, dList): myDebugPrint2('compareTearDeath entered\n') myDebugPrint2('compareTearDeath returning\n') #end tear/death persistence; not used now but may be useful later - + # ---------------------- Data Selection method ---------------------- @@ -280,14 +280,14 @@ def RequestDataDescription(datadescription): if GetBypassUserDataFlag() == False: fd = datadescription.GetUserData() - + if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} return returnViewMapC global gCatchAllExceptionsAndPassUpFlag - if gCatchAllExceptionsAndPassUpFlag: + if gCatchAllExceptionsAndPassUpFlag: try: return RequestDataDescriptionSub(datadescription) except: @@ -305,7 +305,7 @@ def RequestDataDescriptionSub(datadescription): if GetBypassUserDataFlag() == False: fd = datadescription.GetUserData() - + if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} @@ -368,15 +368,15 @@ def DoCoProcessing(datadescription): fd = datadescription.GetUserData() - + if GetBypassUserDataFlag() == False: if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} return returnViewMapC - + global gCatchAllExceptionsAndPassUpFlag - if gCatchAllExceptionsAndPassUpFlag: + if gCatchAllExceptionsAndPassUpFlag: try: DoCoProcessingSub(datadescription) except: @@ -396,13 +396,13 @@ def DoCoProcessingSub(datadescription): fd = datadescription.GetUserData() - + if GetBypassUserDataFlag() == False: if fd == None: myDebugPrint2("no user data, returning {}\n") returnViewMapC = {} return returnViewMapC - + global coprocessor global gFirstTimeInDoCoProcessing global gSkipCountdown @@ -475,7 +475,7 @@ def DoCoProcessingSub(datadescription): coprocessor.WriteData(datadescription) coprocessor.LocalExportOperationsData3(datadescription) - + # Write image capture (Last arg: rescale lookup table), if appropriate. coprocessor.LocalWriteImages3(datadescription, rescale_lookuptable=False) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/phactori.py b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/phactori.py index 296f1a8f20..9e83e988ff 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/phactori.py +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/phactori/phactori.py @@ -1,4 +1,4 @@ -# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -648,7 +648,7 @@ def TestUserDataForBypassScript(datadescription): myDebugPrint3("no user data, no catalyst_script_extra_file (2)\n") return - if(sa.GetNumberOfValues() > 8): + if(sa.GetNumberOfValues() > 8): catalyst_script_extra_file = sa.GetValue(8) if PhactoriDbg(100): myDebugPrint3(" catalyst_script_extra_file: ->" + \ @@ -868,7 +868,7 @@ def ParseSettingsFromJson(self, inJsn): halfH - betweenEyeY, -eyeToScreenDistance ] - + def GetScreenBottomLeft(self, inLeftEyeFlag): if inLeftEyeFlag: return self.mLeftEyeScreenBottomLeft @@ -1751,7 +1751,7 @@ def DebugPrintCellAndPointArrayInfo(label, pvFilter, priority): DebugPrintVtkDataArraysInfo("PointData:\n", theData, priority) theData = pvFilter.CellData DebugPrintVtkDataArraysInfo("CellData:\n", theData, priority) - + #def SetCpViewsAndCpWriters(inCpViews, inCpWriters): # global localCpViews # global localCpWriters @@ -1799,7 +1799,7 @@ class PhactoriRenderViewInfo: def __init__(self): self.RenderView1 = None self.DataRepresentation1 = None - + #class PhactoriRenderViewInfo: # RenderView1 = None # DataRepresentation1 = None @@ -1946,12 +1946,12 @@ def SafeColorBy(inDataRepresentation, ptOrNodeAndVarname): if PhactoriDbg(100): myDebugPrint3("SafeColorBy returning (valid cell data)\n") return - + def SetDataRepresentationToDefault(inDataRepresentation): #a3_vel__PiecewiseFunction = CreatePiecewiseFunction( Points=[0.0, 0.0, 0.5, 0.0, 1.0, 1.0, 0.5, 0.0] ) - + inDataRepresentation.SelectionPointLabelColor = [0.5, 0.5, 0.5] inDataRepresentation.SelectionPointFieldDataArrayName = 'displ' inDataRepresentation.SuppressLOD = 0 @@ -2278,7 +2278,7 @@ def AddRenderView(inPhactoriImagesetInfo, inColorSettings, inPhactoriImagesetInfo.mPvDataRepresentation2 = DataRepresentation1 inPhactoriImagesetInfo.mVisiblePvDataReps[0] = DataRepresentation1 else: - DataRepresentation1 = inPhactoriImagesetInfo.mPvDataRepresentation2 + DataRepresentation1 = inPhactoriImagesetInfo.mPvDataRepresentation2 if PhactoriDbg(): myDebugPrint3("new DataRepresentation1: " + str(DataRepresentation1) + "\n") @@ -2421,9 +2421,9 @@ def CheckForParallelVector(vec1, vec2): if PhactoriDbg(): myDebugPrint3("same ratio between vectors, parallel\n") return True - + #given a bounds in the form [xmin, xmax, ymin, ymax, zmin, zmax], return the -# maximum dimension out of all those (max of xmax-xmin, ymax-ymin, and +# maximum dimension out of all those (max of xmax-xmin, ymax-ymin, and # zmax-zmin) def GetMaximumDimensionFromBounds(inBounds): maxDim = inBounds[1] - inBounds[0] @@ -2898,7 +2898,7 @@ def GetXyzForNodeOrElementParallelRecurse1(inInputCsData, unstructured grids to do the real work of checking for the id and setting outXyz """ - + #myDebugPrint3('GetXyzForNodeOrElementParallelRecurse1 entered\n', 100) icsdClassname = inInputCsData.GetClassName() @@ -3043,7 +3043,7 @@ def CalcRelativeCameraDistance2_AA(inFocalPoint, inNormCameraDir, where we want to place the camera (the opposite of the look direction)""" #angle between camera-to-focal point vector and camera-to-testpoint vector - #is equal to half the camera fOV. Call this angle AA. + #is equal to half the camera fOV. Call this angle AA. #The side opposite this angle has length equal to the distance between #the focal point and the test point. Call this distance aa. We also #know the angle between the focal point-to-camera vector and the focal @@ -3139,7 +3139,7 @@ def CalcRelativeCameraDistance2_BB(inFocalPoint, inNormCameraDir, myDebugPrint3("pointH: " + str(pointH) + "\n"); dd1 = CalcRelativeCameraDistance2_AA(inFocalPoint, inNormCameraDir, - pointH, inFovH) + pointH, inFovH) if PhactoriDbg(100): myDebugPrint3("dd1: " + str(dd1) + "\n"); dd2 = CalcRelativeCameraDistance2_AA(inFocalPoint, inNormCameraDir, @@ -3224,7 +3224,7 @@ def CalcRelativeCameraDistance2(inFocalPoint, inLookDirection, inUpVector, aspectRatio = float(inXyPixelSize[0]) / float(inXyPixelSize[1]) else: aspectRatio = float(pixelSizeWithBorder[0]) / float(pixelSizeWithBorder[1]) - + if PhactoriDbg(100): myDebugPrint3("bordered aspectRatio: " + str(aspectRatio) + "\n"); @@ -3348,7 +3348,7 @@ def SetParaViewRepresentationCameraParams(inXParaViewRenderView, inCameraC, if PhactoriDbg(): myDebugPrint3(' lookDirection ' + str(lookDirection) + '\n') - myViewBounds = viewBoundsIo[0] + myViewBounds = viewBoundsIo[0] if PhactoriDbg(): myDebugPrint3(' focalPoint ' + str(focalPoint) + '\n') @@ -4108,11 +4108,11 @@ def MakeFiltersFromViewMapOperationsC(ioPipeAndViewsState, inOperationBlocksJson keepConstructing = False #at the beginning of the loop, we haven't seen any unconstructed operations for operationName, operationBlock in ioPipeAndViewsState.mOperationBlocks.items(): if operationBlock.mHasBeenConstructed == False: - #this one still needs constructing, and we'll have to loop again to + #this one still needs constructing, and we'll have to loop again to #make sure all are constructed keepConstructing = True - #determine whether or not we can construct this operation yet, or if + #determine whether or not we can construct this operation yet, or if #we need to wait for something else to be constructed canBeConstructedNow = True inputOperationNames = operationBlock.GetListOfInputOperationNames() @@ -4121,7 +4121,7 @@ def MakeFiltersFromViewMapOperationsC(ioPipeAndViewsState, inOperationBlocksJson if inputBlock.mHasBeenConstructed == False: canBeConstructedNow = False break - + if PhactoriDbg(100): myDebugPrint3("trying: " + str(operationName) + "\n" + \ "depends on: " + str(inputOperationNames) + "\n" + \ @@ -4132,7 +4132,7 @@ def MakeFiltersFromViewMapOperationsC(ioPipeAndViewsState, inOperationBlocksJson operationBlock.mHasBeenConstructed = True if PhactoriDbg(100): myDebugPrint3("done constructing all operation blocks\n",100) - + #helper method: given a block A which potentially contains a key B with @@ -4195,7 +4195,7 @@ def CreateParaViewRepresentationAndViewFromInfoC(inImageset, inLookDirection, in raise Exception(errStr) meshRenderControl = theRepresentation.mMeshRenderControl - + showColorLegend = theRepresentation.mColorLegendFlag colorLegendPositionAndSize = theRepresentation.mColorLegendPositionAndSize showDataCubeAxes = theRepresentation.mDataCubeAxesFlag @@ -4225,7 +4225,7 @@ def CreateParaViewRepresentationAndViewFromInfoC(inImageset, inLookDirection, in numArrays = pvPvGeomFilterFromOp.PointData.GetNumberOfArrays() for ii in range (0, numArrays): myDebugPrint3(" " + str(ii) + ": " + pvPvGeomFilterFromOp.PointData.GetArray(ii).GetName() + "\n") - + if PhactoriDbg(): myDebugPrint3(" operation cell data arrays:\n") numArrays = pvPvGeomFilterFromOp.CellData.GetNumberOfArrays() @@ -4421,7 +4421,7 @@ def ParseOneCameraBlockC(ioCameraBlock, ioCameraBlockJson, inPipeAndViewsState): ioCameraBlock.mLookDirectionSpecifiedFlag = True else: ioCameraBlock.mLookDirectionSpecifiedFlag = False - + #get text to add to each image created with this camera, if any if "image name addon" in ioCameraBlockJson: ioCameraBlock.mFilenameAddon = ioCameraBlockJson["image name addon"] @@ -4473,7 +4473,7 @@ def ParseOneCameraBlockC(ioCameraBlock, ioCameraBlockJson, inPipeAndViewsState): 'lock camera call count', -1) if "lockingcamera" in ioCameraBlock.mName: ioCameraBlock.LockAfterNCalls = 1 - + def localGet1or0(inJsn, inKey, inDefault): value = getParameterFromBlock(inJsn, inKey, inDefault) @@ -5230,7 +5230,7 @@ def GetCurrentGeometricPoint(self, inParaViewSource, ioViewBounds, if PhactoriDbg(): myDebugPrint3(errStr) raise Exception(errStr) - + if PhactoriDbg(100): myDebugPrint3("GetCurrentGeometricPoint returning: " + \ str(returnXyz) + "\n", 100) @@ -5310,7 +5310,7 @@ def ParseParametersFromJson(self, inJsn): if 'auto size 1 view angle delta in degrees' in inJsn: angleInDegrees = inJsn['auto size 1 view angle delta in degrees'] self.mAutoSize1ViewAngleDeltaInRadians = math.radians(angleInDegrees) - + def SetUpIfEnabled(self, inRenderView, ioCameraPosition, ioLookAtPoint, inViewUpVector): @@ -5410,7 +5410,7 @@ def ChangeEyeAndFocusInModelSpaceForStereo(self, lookDirection = vecFromAToB(ioEyePosition, ioFocalPoint) axisBetweenEyes = vecCrossProduct(lookDirection, inViewUpVector) axisBetweenEyesNorm = vecNormalize(axisBetweenEyes) - + if self.mLeftEyeFlag: modelCsHalfIpd = -self.mIpdInModelUnits * \ self.mVirtualSelfSizeMultiplier * 0.5 @@ -5615,7 +5615,7 @@ class PhactoriCameraBlock: look at the point where pressure is maximum: -:: +:: "mycam10":{ "type":"camera", @@ -5740,7 +5740,7 @@ def DcoaiParseParametersFromJson(self, parentAxesInfo, inJsn, inXyzKey): if theKey in inJsn: self.mUseLabelFlag = True self.mAxisLabel = getParameterFromBlock(inJsn, theKey, "") - + if PhactoriDbg(): myDebugPrint3('DcoaiParseParametersFromJson ' + inXyzKey + ' ' \ + str(parentAxesInfo.mShowTicks) + ' ' \ @@ -6104,13 +6104,13 @@ def IntersectWithOneRayViaBSPTree(self, inIndex, inRayStart, inRayDirection, if inPointOrCellData <= 0: oldvv = ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ GetValue(inIndex) - if (oldvv < 0.0) or (hitdist < oldvv): + if (oldvv < 0.0) or (hitdist < oldvv): ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitdist) else: oldvv = ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ GetValue(inIndex) - if (oldvv < 0.0) or (hitdist < oldvv): + if (oldvv < 0.0) or (hitdist < oldvv): ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitdist) @@ -6179,14 +6179,14 @@ def IntersectWithOneRay(self, inIndex, inRayStart, inRayDirection, oldvv = ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ GetValue(inIndex) newvv = hitPoint[3] - if (oldvv < 0.0) or (newvv < oldvv): + if (oldvv < 0.0) or (newvv < oldvv): ioRaycastOperation.mPointNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitPoint[3]) else: oldvv = ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ GetValue(inIndex) newvv = hitPoint[3] - if (oldvv < 0.0) or (newvv < oldvv): + if (oldvv < 0.0) or (newvv < oldvv): ioRaycastOperation.mCellNormalRayIntersectDistanceArray.\ SetValue(inIndex, hitPoint[3]) @@ -6477,7 +6477,7 @@ def TestAndSet(self, inLengthSquared, inPt1, inPt2): self.LengthSquared = inLengthSquared vecCopy(self.Point1, inPt1) vecCopy(self.Point2, inPt2) - + class PhactoriSegmentGroup1: """manage a set of segments for purposes of showing raycast results""" def __init__(self): @@ -6568,7 +6568,7 @@ def __init__(self): self.mCellNormalRayIntersectDistanceArray = None self.SegmentsFromPointRays = PhactoriSegmentGroup1() - self.SegmentsFromTriangleRays = PhactoriSegmentGroup1() + self.SegmentsFromTriangleRays = PhactoriSegmentGroup1() def ParseParametersFromJson(self, inJson): if "target operation" in inJson: @@ -6616,7 +6616,7 @@ def CreateParaViewFilter(self, inInputFilter): self.mTriangleRayLineSource = PVTrivialProducer() self.mTriangleRayLineSource.GetClientSideObject().SetOutput( self.SegmentsFromTriangleRays.mVtkPolyData) - + #newParaViewFilter = GroupDatasets(Input = []) #self.mGroupLineSource = newParaViewFilter @@ -6631,7 +6631,7 @@ def CreateParaViewFilter(self, inInputFilter): else: newParaViewFilter = PVTrivialProducer() passthru = inInputFilter.GetClientSideObject().GetOutputDataObject(0) - + numpts = passthru.GetNumberOfPoints() newvar = vtk.vtkDoubleArray() @@ -6742,7 +6742,7 @@ def RunCalculationToCastRays(self, ioPipeAndViewsState): #now loop through all processes; one process at a time share the triangles #from each process to the others and intersect with the local surface - #portion + #portion mypid = SmartGetLocalProcessId() @@ -6800,7 +6800,7 @@ def ExportOperationData(self, datadescription): class should override this method if it wants so do something. For PhactoriIntersectNodeNormalsWithSurface we will output information about the nearest and furthest intersections""" - + if PhactoriDbg(100): myDebugPrint3( "PhactoriIntersectNodeNormalsWithSurface::ExportOperationData " @@ -6986,7 +6986,7 @@ def CreateParaViewFilter(self, inInputFilter): newParaViewFilter = Line() newParaViewFilter.Point1 = [0.0, 0.0, 0.0] newParaViewFilter.Point2 = [0.01, 0.01, 0.01] - + SetActiveSource(newParaViewFilter) SetActiveSource(savedActiveSource) @@ -7089,7 +7089,7 @@ def RunCalculationToFindNearestPoints(self, ioPipeAndViewsState): tgty = self.mClosestNPointsFromEachProcess.mTargetMatchXyzs.GetValue(pndx+1) tgtz = self.mClosestNPointsFromEachProcess.mTargetMatchXyzs.GetValue(pndx+2) - self.mLineSource.Point1 = [srcx, srcy, srcz] + self.mLineSource.Point1 = [srcx, srcy, srcz] self.mLineSource.Point2 = [tgtx, tgty, tgtz] self.mLineSource.UpdatePipeline() @@ -7132,7 +7132,7 @@ def OutputToTextAnnotation(self, ioPipeAndViewsState): tgty = clstpts.mTargetMatchXyzs.GetValue(pndx+1) tgtz = clstpts.mTargetMatchXyzs.GetValue(pndx+2) - if self.mTxtAntnFormatString == None: + if self.mTxtAntnFormatString == None: self.mTextAnnotationOutputTarget.mTextString = \ "nearest: " + str(dist) + "\n" \ "node id 1: " + str(srcndid) + "\n" \ @@ -8118,7 +8118,7 @@ def CreateParaViewStuff(self, inColor, inImageset = None): "to work off, and None was supplied\n") return self.mInputOperation = inImageset.mOperation - + savedActiveSource = GetActiveSource() inOprtn = self.mInputOperation if(inOprtn.mParaViewTimeAnnotationSource == None): @@ -8268,11 +8268,11 @@ def SetSizeScale(self, inNewSizeScale): def SetWindowLocation(self, inNewPosition): global gParaViewCatalystVersionFlag if gParaViewCatalystVersionFlag < 51000: - validPositions = ['UpperLeftCorner', 'UpperRightCorner', + validPositions = ['UpperLeftCorner', 'UpperRightCorner', 'LowerLeftCorner', 'LowerRightCorner', 'UpperCenter', 'LowerCenter'] else: - validPositions = ['Upper Left Corner', 'Upper Right Corner', + validPositions = ['Upper Left Corner', 'Upper Right Corner', 'Lower Left Corner', 'Lower Right Corner', 'Upper Center', 'Lower Center'] if inNewPosition in validPositions: @@ -8404,7 +8404,7 @@ def GetImageFilename(self, datadescription, inImageSettings, inImageBasedirectory = inImageSettings.mImageBasedirectory inNumCounterDigits = inImageSettings.mNumCounterDigits inImageFormat = inImageSettings.mImageFormat - + timestep = datadescription.GetTimeStep() lastImagesetName = "" @@ -8439,7 +8439,7 @@ def GetImageFilename(self, datadescription, inImageSettings, while len(timestepString) < inNumCounterDigits: timestepString = "0" + timestepString myDebugPrint2("image fname: " + fname + "\ndigit count: " + str(inNumCounterDigits) + "\ntimestepString: " + timestepString + "\n") - + rplstr1 = None if self.mUseDateTime: ttnow = gPipeAndViewsState.mCallbackDateTime @@ -8469,7 +8469,7 @@ def GetImageFilename(self, datadescription, inImageSettings, fnameRR = fname.replace("%t", rplstr1) else: fnameRR = None - + fname = fname.replace("%t", timestepString) myDebugPrint2("fname after replace: ->" + fname + "<-\n") @@ -8498,7 +8498,7 @@ class PhactoriPlot1Base: def __init__(self): self.mName = "" self.m_DataCubeAxesInfo = PhactoriDataCubeAxesInfo() - + self.m_PlotType = "PhactoriPlot1Base" self.mImageSettings = PhactoriImageSettings() self.mImageSettings.mPixelBorderRatioXY = [0.175 / self.mImageSettings.GetAspectRatio(), 0.175] @@ -8559,7 +8559,7 @@ def WriteImages(self, datadescription): oneLookDirectionFilenameAddon = "" else: oneLookDirectionFilenameAddon = "" - + fname, fnameRR = self.mImageFileNameCountSettings.GetImageFilename( datadescription, self.mImageSettings, oneLookDirectionFilenameAddon, @@ -8712,7 +8712,7 @@ def __init__(self): def SetFromRestartInfo(self, inJson): """given a map (json format), use the info in the map to set the - plot state--this reads the info created by out in + plot state--this reads the info created by out in GetRestartInfo. It should only occur on a restart, and it fills in the data that had been generated during the earlier run of the system""" @@ -9465,7 +9465,7 @@ def ParseOperationAndRepresentationPair(self, ioPipeAndViewsState, ioJson, "inOperationKey: " + str(inOperationKey) + "\n" "inRepresentationKey: " + str(inRepresentationKey) + "\n" "incoming json:\n" + str(ioJson) + "\n") - + if inOperationKey not in ioJson: if inSkipIfOperationKeyNotPresent: @@ -9774,7 +9774,7 @@ def PerRendersetInitialization(datadescription): #cellDataInfo = paraviewSource.GetCellDataInformation() myDebugPrint3(" PerRendersetInitialization:\n num cells: " + str(pvsDi.GetNumberOfCells()) + "\n num points: " + str(pvsDi.GetNumberOfPoints()) + "\n") - #we assume to begin with that all global data bounds in operations are + #we assume to begin with that all global data bounds in operations are #invalid as data may have changed for oneOperationName, oneOperation in \ gPipeAndViewsState.mOperationBlocks.items(): @@ -9810,7 +9810,7 @@ def UpdateRepresentationColorBy(ioPhactoriImagesetBlock): if PhactoriDbg(100): myDebugPrint3("in PhactoriImagsetBlock named: " + \ ioPhactoriImagesetBlock.mName + "\n" + \ - "mColorLegendRepRefs " + str(ii) + + "mColorLegendRepRefs " + str(ii) + "is set to " + str(retVal) + "\n") ioPhactoriImagesetBlock.mColorLegendRepRefs[ii] = retVal @@ -9843,7 +9843,7 @@ def UpdateRepresentationColorBySub1(inPvView, inPvRep, if PhactoriDbg(100): myDebugPrint3('bad element type: returning\n', 100) return None - + if colorVarName != '': if inPhactoriRep.mColorVariableInfo.mVariableIsVectorComponent: ColorByVariableComponentOrMagnitudeXX(inPvRep, inPhactoriRep, @@ -10102,7 +10102,7 @@ def HandleRestartUpdateForOutputResultsBlock(ioPipeAndViewsState): """this method is a companion to SaveRestartInfoCallback. It is called after the pipeline is first initialized for the given output block, and it will read the data stored by SaveRestartInfoCallback in a file. - The presumption is that the pipeline will be initialized for the + The presumption is that the pipeline will be initialized for the given output block only once when the system starts or only once when the system restarts. The intent is to deal with restart by allowing persistent @@ -10167,7 +10167,7 @@ def SaveRestartInfoCallback(): for onePlotOtName, onePlotOt in \ gPipeAndViewsState.mPlotOverTimeBlocks.items(): if PhactoriDbg(): - myDebugPrint3("making end vis callback json for plot over time: " + + myDebugPrint3("making end vis callback json for plot over time: " + onePlotOtName + "\n") plotsOverTimeJsonOut[onePlotOtName] = onePlotOt.GetRestartInfo() @@ -10274,7 +10274,7 @@ def HandleOperationShortcuts2(inBlockName, inJson, ioOperationBlocks, inCount): if PhactoriDbg(): myDebugPrint3(errStr) raise Exception(errStr) - #stuff should have 4 items + #stuff should have 4 items #[scalar|vector magnitude|vector component|tensor #component, component, namekeep between|keep above|keep #below, [, ]] @@ -10294,7 +10294,7 @@ def HandleOperationShortcuts2(inBlockName, inJson, ioOperationBlocks, inCount): if PhactoriDbg(): myDebugPrint3(errStr) raise Exception(errStr) - + if PhactoriDbg(): myDebugPrint3('got threshold operation shortcut ' + str(newOperationJson) + '\n') if lastShortcutOperationName != None: @@ -10919,7 +10919,7 @@ def CreateViewSetFromPhactoriViewMapC(inViewMapC): myDebugPrint3(str(inViewMapC) + "\n") global gPipeAndViewsState gPipeAndViewsState.mJsonDescription = inViewMapC - + #get pointers to the various block types (currently 6, camera, #representation, operation, imageset, plot over time, and scatter plot) @@ -11513,7 +11513,7 @@ def ColorByBlock(inParaViewDataSource, inParaViewDataRepresentation, ColorByBlockRecurse1(csdata, blockAndLeafBlockCounter, inParaViewDataRepresentation.BlockColor, False) #inParaViewDataRepresentation.BlockColor = blockColorData - + if PhactoriDbg(100): myDebugPrint3(' block color data: ' + str(inParaViewDataRepresentation.BlockColor) + '\n', 100) if PhactoriDbg(100): @@ -11564,8 +11564,8 @@ def UseDataRangeForColorValues(inPvDataRepresentation, inRepresentation, if PhactoriDbg(): myDebugPrint3(" input:" + str(input) + "\n") UpdatePipelineWithCurrentTimeArgument(input) - - #assume point info + + #assume point info #datainformation = rep.Input.GetPointDataInformation() if pointsOrCellsType == gPointsString: @@ -11769,7 +11769,7 @@ def helpFindNewRgbPoint(inBaseRgbPts, inRatio): #print "deltaPt: ", deltaPt #print "ratioPt: ", ratioPt - subrangePt1 = [inRatio, + subrangePt1 = [inRatio, rr1 + ratioPt * (rr2 - rr1), gg1 + ratioPt * (gg2 - gg1), bb1 + ratioPt * (bb2 - bb1)] @@ -12096,7 +12096,7 @@ def ShowCubeAxesXX(inPvRenderView, inOnOrOff, inShowDataCubeAxesInfo = None): SetAxesGridVisibility(inPvRenderView, 0) if PhactoriDbg(100): myDebugPrint3("ShowCubeAxesXX returning\n", 100) - + def ShowDataColorLegendXX(inPvView, inOnOffSetting, inColorLegendPositionAndSize, inColorSettings, @@ -12247,7 +12247,7 @@ def ShowDataColorLegendXX(inPvView, defaultMidPos = 0.5 - 0.5*defaultLegendLength #legendFontSize = 16 #legendSize = 1.0 - #validPositions = ['UpperLeftCorner', 'UpperRightCorner', + #validPositions = ['UpperLeftCorner', 'UpperRightCorner', # 'LowerLeftCorner', 'LowerRightCorner', # 'UpperCenter', 'LowerCenter'] legendPosition=[0.0, 0.0] @@ -12289,7 +12289,7 @@ def ShowDataColorLegendXX(inPvView, defaultMidPos = 0.5 - 0.5*defaultLegendLength #legendFontSize = 16 #legendSize = 1.0 - #validPositions = ['UpperLeftCorner', 'UpperRightCorner', + #validPositions = ['UpperLeftCorner', 'UpperRightCorner', # 'LowerLeftCorner', 'LowerRightCorner', # 'UpperCenter', 'LowerCenter'] legendPosition=[0.0, 0.0] @@ -12537,9 +12537,9 @@ def ExtractComponentFromVectorVariable(inVariableName, inWhichComponent, inResul newFunctionString = "" if(inWhichComponent == 0): newFunctionString = inVariableName + '_X' - elif(inWhichComponent == 1): + elif(inWhichComponent == 1): newFunctionString = inVariableName + '_Y' - elif(inWhichComponent == 2): + elif(inWhichComponent == 2): newFunctionString = inVariableName + '_Z' else: if PhactoriDbg(): @@ -12625,7 +12625,7 @@ def CollectCells2(inClientSideData, inBlockIndex, ioCollectList, ioTotalCellCoun appendCount += 1 if PhactoriDbg(): myDebugPrint3(' proc ' + str(SmartGetLocalProcessId()) + ' Leaving CollectCells2\n') - + def CollectCells1(cellVariableName, thresholdValue, thresholdDir): if PhactoriDbg(): @@ -12727,7 +12727,7 @@ def UseReduceToSpreadValues(ioListOfValues): if value != 0.0: value = -value ioListOfValues[ii] = value - + if PhactoriDbg(): myDebugPrint3(' ' + 'proc ' + str(SmartGetLocalProcessId()) + ' final values: ' + str(ioListOfValues) + '\n') if PhactoriDbg(100): @@ -13127,7 +13127,7 @@ def GetRestartInfo(self): # def SetRepresentationAndViewColors(self, ioRenderViewInfo): # myDebugPrint3('PlotColorInfo.SetRepresentationColors entered\n', 100) # rep1 = ioRenderViewInfo.DataRepresentation1 -# view1 = ioRenderViewInfo.RenderView1 +# view1 = ioRenderViewInfo.RenderView1 # view1.Background = self.m_BackgroundColor # rep1.EdgeColor = self.m_EdgeColor # rep1.DiffuseColor = self.m_DiffuseColor @@ -13136,7 +13136,7 @@ def GetRestartInfo(self): # rep1.BackfaceDiffuseColor = self.m_BackfaceDiffuseColor # rep1.CubeAxesColor = self.m_CubeAxesColor # myDebugPrint3('PlotColorInfo.SetRepresentationColors returning\n', 100) - + #global gPlotColorInfoPreset #gPlotColorInfoPreset = PlotColorInfo() @@ -13524,7 +13524,7 @@ def FindNodeOrElementIdForMinMax(inputcsData, inVariableInfo): myDebugPrint3("min/max not available, calculating\n", 100) DataMinMax = [0.0, 0.0, False] DataSumCnt = [0.0, 0] - FindMinMaxSumCntFromData(inputcsData, inVariableInfo, + FindMinMaxSumCntFromData(inputcsData, inVariableInfo, None, DataMinMax, DataSumCnt, None, None) else: @@ -13551,7 +13551,7 @@ def FindNodeOrElementIdForMinMax(inputcsData, inVariableInfo): inVariableInfo.mStats.mMaxId = idForMinAndidForMax[1] #mark done for this catalyst callback, so we won't do extra mpi - #communication if we call this routine again + #communication if we call this routine again inVariableInfo.mStats.mIdsTestCounter = gPipeAndViewsState.mFrameTagCounter if PhactoriDbg(100): @@ -14061,7 +14061,7 @@ def FindThisProcessorMinMaxForVar(inOperation, inVariableInfo): return myDataMinMax -def FindMinMaxSumCntFromData(inputcsData, inVariableInfo, +def FindMinMaxSumCntFromData(inputcsData, inVariableInfo, inSecondaryVariableInfo, DataMinMax, DataSumCnt, DataForIds, inPlotIdLineList): """fairly complex high level mpi-operation routine. This takes a paraview @@ -14077,7 +14077,7 @@ def FindMinMaxSumCntFromData(inputcsData, inVariableInfo, if PhactoriDbg(): myDebugPrint3("FindMinMaxSumCntFromData entered\n") - FindMinMaxSumCntFromDataRecurse1(inputcsData, inVariableInfo, + FindMinMaxSumCntFromDataRecurse1(inputcsData, inVariableInfo, inSecondaryVariableInfo, DataMinMax, DataSumCnt, DataForIds, inPlotIdLineList) @@ -14150,7 +14150,7 @@ def SetPlotOverTimePointsFromData(ioPlotInfo): DataForIds = None FindMinMaxSumCntFromData(inputcsData, - ioPlotInfo.m_YAxisVariableInfo, ioPlotInfo.m_XAxisVariableInfo, + ioPlotInfo.m_YAxisVariableInfo, ioPlotInfo.m_XAxisVariableInfo, DataMinMax, DataSumCnt, DataForIds, ioPlotInfo.m_IdPlotLineList) if DataSumCnt[1] == 0: @@ -14246,7 +14246,7 @@ def SetPlotPointsFromData(ioPlotInfo): #myDebugPrint3(' done updating ids\n') - + FindPlotXYZMinMax(plotPts, ioPlotInfo.m_xyzMinMaxTrkC) ScalePlotYForFit(plotPts, ioPlotInfo.m_xyzMinMaxTrkC, @@ -14962,7 +14962,7 @@ def HandleUserInteractionIfEnabled(ioPipeAndViewsState): trigger which will cause a read-and-update of the state. Provides control to skip interaction when it is not enabled, the default case. Allows for a wait for an interaction trigger of N tries at M seconds - per try, mainly to deal with situations where images are being + per try, mainly to deal with situations where images are being rendered quickly. Eventually may be altered to help deal with cases where we want to keep re-rendering with changed pipeline states until we are happy and then let the simulation return to operation""" @@ -15208,7 +15208,7 @@ def TestForTruth(self, ioPipeAndViewsState): DataMinMax = [0.0, 0.0, False] DataSumCnt = [0.0, 0] - FindMinMaxSumCntFromData(inputcsData, self.mVariableInfo, None, + FindMinMaxSumCntFromData(inputcsData, self.mVariableInfo, None, DataMinMax, DataSumCnt, None, None) #just return false if there is no min/max found @@ -15572,16 +15572,16 @@ def InitializePerPipeRoot(datadescription, inCoprocessor): sa4 = sa[4] sa5 = sa[5] dbDummyFname = sa[6] - if(len(sa) > 7): + if(len(sa) > 7): defaultDirectory = sa[7] else: defaultDirectory = "" - if(len(sa) > 8): + if(len(sa) > 8): catalyst_script_extra_file = sa[8] else: catalyst_script_extra_file = "" - outputResultBaseId, remeshRestartTag = parseDbDummyFname(dbDummyFname) + outputResultBaseId, remeshRestartTag = parseDbDummyFname(dbDummyFname) if PhactoriDbg(): myDebugPrint3(" extra data list:\n") if PhactoriDbg(): @@ -15872,5 +15872,3 @@ def GetColorMapInfoFromColorLegendCollection(inColorMapSettings, inMin, inMax): myDebugPrint3("gParaViewCatalystVersionFlag is: " + str(gParaViewCatalystVersionFlag) +"\n") - - From 4721ae62821bb2f5eb4214e74818e8135788945a Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 16 Oct 2024 09:46:28 -0600 Subject: [PATCH 08/11] CONJOIN: Fix typo --- packages/seacas/applications/conjoin/Conjoin.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/seacas/applications/conjoin/Conjoin.C b/packages/seacas/applications/conjoin/Conjoin.C index cf5930106a..00564c918f 100644 --- a/packages/seacas/applications/conjoin/Conjoin.C +++ b/packages/seacas/applications/conjoin/Conjoin.C @@ -1535,7 +1535,7 @@ namespace { global->elementCount = goffset; global_element_map.resize(goffset); - if (goffest == 0) { + if (goffset == 0) { return; } From 432d1916845e27ccb37398936a16b4463b96e309 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 16 Oct 2024 09:46:48 -0600 Subject: [PATCH 09/11] CI: Use different trailing whitespace detection --- .github/workflows/trailing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trailing.yml b/.github/workflows/trailing.yml index de1108494a..e2fd15cde1 100644 --- a/.github/workflows/trailing.yml +++ b/.github/workflows/trailing.yml @@ -16,7 +16,7 @@ jobs: - name: Find Trailing Whitespace run: | set +e - lines=$(git grep --cached -In '[[:blank:]]$') + lines=$(git grep --cached -In '[[:blank:]]$' packages/seacas/applications packages/seacas/libraries) if [ ! -z "$lines" ]; then echo -e "\n The following lines contain trailing whitespace: \n" echo -e "${lines}" From 16e73424d632ea0a42ab484c7490a6fd6640c80c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 16 Oct 2024 09:59:58 -0600 Subject: [PATCH 10/11] TESTING: Added ws to see if detected [ci skip] --- packages/seacas/applications/conjoin/Conjoin.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/seacas/applications/conjoin/Conjoin.C b/packages/seacas/applications/conjoin/Conjoin.C index 00564c918f..f33a4a40d7 100644 --- a/packages/seacas/applications/conjoin/Conjoin.C +++ b/packages/seacas/applications/conjoin/Conjoin.C @@ -1535,7 +1535,7 @@ namespace { global->elementCount = goffset; global_element_map.resize(goffset); - if (goffset == 0) { + if (goffset == 0) { return; } @@ -1546,7 +1546,7 @@ namespace { // The global_element_map may or may not be globally sorted; however, each // block is sorted, so if we do the iteration by blocks, we can // use lower_bound instead of doing global searches... - for (auto &glob_block : glob_blocks) { + for (auto &glob_block : glob_blocks) { auto gm_begin = global_element_map.begin() + glob_block.offset_; auto gm_end = gm_begin + glob_block.elementCount; From 180d1998c108901c64d8959f9a6294680ca08089 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 16 Oct 2024 10:01:33 -0600 Subject: [PATCH 11/11] TESTING: removed ws. Was detected in workflow [ci skip] --- packages/seacas/applications/conjoin/Conjoin.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/seacas/applications/conjoin/Conjoin.C b/packages/seacas/applications/conjoin/Conjoin.C index f33a4a40d7..00564c918f 100644 --- a/packages/seacas/applications/conjoin/Conjoin.C +++ b/packages/seacas/applications/conjoin/Conjoin.C @@ -1535,7 +1535,7 @@ namespace { global->elementCount = goffset; global_element_map.resize(goffset); - if (goffset == 0) { + if (goffset == 0) { return; } @@ -1546,7 +1546,7 @@ namespace { // The global_element_map may or may not be globally sorted; however, each // block is sorted, so if we do the iteration by blocks, we can // use lower_bound instead of doing global searches... - for (auto &glob_block : glob_blocks) { + for (auto &glob_block : glob_blocks) { auto gm_begin = global_element_map.begin() + glob_block.offset_; auto gm_end = gm_begin + glob_block.elementCount;