Skip to content

Commit bb6ed5b

Browse files
gsjaardemagdsjaargithub-actions[bot]
authored
Exodiff/EPU/io_shell changeset modifications (#547)
* EXODIFF: Modifications to support changesets * EXODUS: Minor cleanup * EXODUS: Possible change for changeset support. Need to decide if this is right * Committing clang-format changes * EXODIFF: Clean up change-set handling * Committing clang-format changes * EXODIFF: Fix memory issue with cached static vector size * Clean up compiler warnings * EXODUS: Handle cleanup of files with groups on ex_close * Committing clang-format changes * EXODIFF: Do not open file if empty name * EXODIFF: Support summary flag, refactor changeset parsing * Committing clang-format changes * EXODIFF: Handle compare 1 file with cs, other with none * EXODIFF: Need different method for supporting changesets with variable changes * EXODIFF: Better handling of changeset with differing variable counts per changeset * Committing clang-format changes * IOSS: Get group writing working for parallel composed output * Committing clang-format changes * IOSS: Refactor some uses of IOSS_ERROR * Committing clang-format changes * EPU: Refactor template int / double handling * EPU: Refactor and initial changeset * Detect changesets in input file(s) and error if count is different. * If contain changesets, open first changeset * Throw from initialize instead of returning bool and then throwing. * EPU: Add option to select a specific change set on input file * EPU: Working with change sets now (alpha) * Committing clang-format changes * CI: Install x11 * CI: Another try at fixing x11 dependency * CI: Fix x11 dependency * EPU: Clean up of change set handling * Committing clang-format changes * EPU: Fix change set selection logic for files with no change sets * CI: Rebuild intel cache to see if fixes fmt issue * CI: See if affects intel build * CI: See if affects intel build * CI: Another try at intel - rebuild cache * CI: Update intel compiler name * CI: Update kokkos version * CI: Fix kokkos tpl install * CI: See if can get parallel threadsafe running * CI: fix syntax * APREPRO: Fix compiler warning * CONJOIN: first handling of change set files * Committing clang-format changes * CONJOIN: Do not read sets if there are not any * IOSS: Add tinit and tdelta to generated mesh to control timestep output * IOSS: Add two conjoin changeset tests * Committing clang-format changes * CONJOIN: Fix potential memory issue in group name inquiry * Committing clang-format changes * CI: Add testing of cs decomp/compose/epu * CONJOIN: Fix integer 64/32 bit handling * CONJOIN: Enable using single input file with no change sets * Committing clang-format changes * Fix spelling errors * EXPLORE: Basic support for change sets * EXODUS_FOR: Basic support for change sets * Committing clang-format changes * IOSS: cgns - minor tweak to decomposition algorithm to avoid 0 intervals * GREPOS: Add selection of input change set * EXPLORE: If invalid change set selected, exit * Committing clang-format changes * basic support for change sets in fortran codes * SVDI: Remove some very old ignored debug output * SCRIPTS: Change set support for blot, remove tabs * SCRIPTS: Unify blot and blot.in * Committing clang-format changes * EXO_FORMAT: Output change set count; refactor better C * ALGEBRA: Basic change set support * Clean up copyright dates * EXO2MAT: basic change set support; minor refactoring * SLICE: Fix argument parsing * Committing clang-format changes * NEM_SLICE: Allow selecting input change set * NEM_SPREAD: Basic support for reading a specific change set index * SCRIPTS: Support change set selection in decomp script * Committing clang-format changes * IOSS: Minor formatting improvement * APREPRO: Add basic support for change sets * Committing clang-format changes * APREPRO: Clang-format files * CI: Also format cc files * Committing clang-format changes * CI: Make filenames unique so multiple tests can be run simultaneously * Committing clang-format changes * EXODUS_FOR: Handle large integer parameter correctly * EXODUS_FOR: Use new style parameter statements * SCRIPTS: Use braces when passing arg >= 10 * NEM_SLICE, NEM_SPREAD: Use correct variable in error message * Committing clang-format changes * APREPRO: Add exodus_query_change_sets function * Committing clang-format changes * Committing clang-format changes * Committing clang-format changes * Committing clang-format changes --------- Signed-off-by: Greg Sjaardema <gsjaardema@gmail.com> Co-authored-by: Greg Sjaardema <gdsjaar@sandia.gov> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent a31653d commit bb6ed5b

File tree

114 files changed

+13610
-3228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+13610
-3228
lines changed

‎.github/workflows/clang-format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
source: 'packages/seacas'
4343
exclude: 'packages/seacas/doc-source'
44-
extensions: 'c,C,h,cpp,hpp'
44+
extensions: 'c,C,cc,h,cpp,hpp'
4545
clangFormatVersion: 18
4646
inplace: True
4747
style: file

‎TPL/compiler.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ else
4646
fi
4747
if [ "$COMPILER" == "intel" ]
4848
then
49-
export CC=icc
50-
export CXX=icc
49+
export CC=icx
50+
export CXX=icpx
5151
fi
5252
if [ "$COMPILER" == "analyzer" ]
5353
then

‎install-tpl.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,6 @@ then
815815
then
816816
echo "${txtgrn}+++ Downloading...${txtrst}"
817817
rm -rf kokkos
818-
819818
wget --no-check-certificate https://github.com/kokkos/kokkos/releases/download/${kokkos_version}/kokkos-${kokkos_version}.tar.gz
820819
tar -zxf kokkos-${kokkos_version}.tar.gz
821820
rm -f kokkos-${kokkos_version}.tar.gz

‎packages/seacas/#tmp.txt#‎

Lines changed: 1638 additions & 0 deletions
Large diffs are not rendered by default.

‎packages/seacas/applications/algebra/ag_qainfo.blk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C Copyright(C) 1999-2022, 2024 National Technology & Engineering Solutions
1+
C Copyright(C) 1999-2025 National Technology & Engineering Solutions
22
C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
33
C NTESS, the U.S. Government retains certain rights in this software.
44
C
@@ -18,7 +18,7 @@ C -- (6) = time of current run
1818
QAINFO(4) = ' '
1919
QAINFO(5) = ' '
2020
QAINFO(6) = ' '
21-
QAINFO(2) = '2024/03/21 '
22-
QAINFO(3) = ' 1.54 '
21+
QAINFO(2) = '2025/02/03 '
22+
QAINFO(3) = ' 1.55 '
2323

2424
c ------------------------.-.

‎packages/seacas/applications/algebra/algebra.f‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C Copyright(C) 1999-2022 National Technology & Engineering Solutions
1+
C Copyright(C) 1999-2025 National Technology & Engineering Solutions
22
C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
33
C NTESS, the U.S. Government retains certain rights in this software.
44
C
@@ -82,6 +82,7 @@ PROGRAM ALGEBRA2
8282
REAL VERS
8383
LOGICAL MEMBUG
8484
CHARACTER*2048 FILNAM, SCRATCH
85+
character*256 option, value
8586

8687
CHARACTER*8 STR8
8788

@@ -137,23 +138,15 @@ PROGRAM ALGEBRA2
137138
if (narg .lt. 2) then
138139
CALL PRTERR ('FATAL', 'Filenames not specified.')
139140
CALL PRTERR ('CMDSPEC',
140-
* 'Syntax is: "algebra file_in file_out"')
141-
CALL PRTERR ('CMDSPEC',
142-
* 'Documentation: https://sandialabs.github.io' //
143-
$ '/seacas-docs/sphinx/html/index.html#algebra')
144-
GOTO 150
145-
else if (narg .gt. 2) then
146-
CALL PRTERR ('FATAL', 'Too many arguments specified.')
147-
CALL PRTERR ('CMDSPEC',
148-
* 'Syntax is: "algebra file_in file_out"')
141+
* 'Syntax is: "algebra [-change_set #] file_in file_out"')
149142
CALL PRTERR ('CMDSPEC',
150143
* 'Documentation: https://sandialabs.github.io' //
151144
$ '/seacas-docs/sphinx/html/index.html#algebra')
152145
GOTO 150
153146
end if
154147

155148
C Open the input database; Exit on error
156-
CALL get_argument(1,FILNAM, LFIL)
149+
CALL get_argument(narg - 1,FILNAM, LFIL)
157150
ndbin = exopen(filnam(:lfil), EXREAD, cpuws, iows,
158151
& vers, ierr)
159152
IF (IERR .NE. 0) THEN
@@ -162,6 +155,35 @@ PROGRAM ALGEBRA2
162155
GOTO 150
163156
END IF
164157

158+
if (narg .gt. 2) then
159+
do i=1, narg-2, 2
160+
CALL get_argument(i+0,option, lo)
161+
CALL get_argument(i+1,value, lv)
162+
if (option(:lo) .eq. '-change_set' .or.
163+
* option(:lo) .eq. '--change_set') then
164+
C ... Convert `value` to an integer.
165+
read (value(:lv), '(i10)') nchange
166+
C ... Check that file contains at least that many change sets...
167+
ndbr = iand(ndbin, EX_FILE_ID_MASK)
168+
call exinq(ndbr, EX_INQ_NUM_CHILD_GROUPS,
169+
$ idum, rdum, cdum, ierr)
170+
if (nchange .gt. idum) then
171+
write (SCRATCH,*) 'Selected change set', nchange,
172+
$ 'but there are only ', idum, ' change sets in file.'
173+
call sqzstr(scratch, lscratch)
174+
call PRTERR('CMDERR', SCRATCH(:LSCRATCH))
175+
goto 150
176+
else
177+
ndbin = ndbr + nchange
178+
write (scratch,99) nchange
179+
99 format(1x,'NOTE: Selecting change set ', i3)
180+
call sqzstr(scratch, lscratch)
181+
call PRTERR('CMDSPEC', scratch(:lscratch))
182+
end if
183+
end if
184+
end do
185+
end if
186+
165187
call exinq(ndbin, EXDBMXUSNM, namlen, rdum, cdum, ierr)
166188
call exmxnm(ndbin, namlen, ierr)
167189

@@ -504,7 +526,7 @@ PROGRAM ALGEBRA2
504526
C *************************************************************
505527
C Open the Output Database
506528
C *************************************************************
507-
CALL get_argument(2,FILNAM, LFIL)
529+
CALL get_argument(narg,FILNAM, LFIL)
508530
ndbout = excre(filnam(:lfil), EXCLOB, CPUWS, IOWS, IERR)
509531
IF (IERR .NE. 0) THEN
510532
SCRATCH = 'Problems creating database "'//FILNAM(:LFIL)//'".'

‎packages/seacas/applications/blot/bl_version.f‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions
1+
C Copyright(C) 1999-2020, 2024, 2025 National Technology & Engineering Solutions
22
C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
33
C NTESS, the U.S. Government retains certain rights in this software.
44
C
@@ -11,8 +11,8 @@ SUBROUTINE VERSION(QAINFO)
1111
CHARACTER*(MXQARC) QAINFO(6)
1212

1313
QAINFO(1) = 'blot '
14-
QAINFO(2) = '2024/03/25 '
15-
QAINFO(3) = ' 3.1415 '
14+
QAINFO(2) = '2025/01/03 '
15+
QAINFO(3) = ' 3.14159 '
1616
QAINFO(4) = ' '
1717

1818
RETURN

‎packages/seacas/applications/blot/blot.f‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions
1+
C Copyright(C) 1999-2020, 2022, 2025 National Technology & Engineering Solutions
22
C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
33
C NTESS, the U.S. Government retains certain rights in this software.
44
C
@@ -239,7 +239,8 @@ PROGRAM BLOTII
239239
CALL PRTERR ('FATAL', 'Filename not specified.')
240240
CALL PRTERR ('CMDSPEC',
241241
* 'Syntax is: "blot.dev [-basename basename] [-ps_option num]'//
242-
* ' [-nomap node|element|all] filename"')
242+
* ' [-change_set cs_#] [-nomap node|element|all]'//
243+
$ ' [-show_filename] filename"')
243244
CALL PRTERR ('CMDSPEC',
244245
* 'Documentation: https://sandialabs.github.io' //
245246
$ '/seacas-docs/sphinx/html/index.html#blot')
@@ -254,7 +255,8 @@ PROGRAM BLOTII
254255
CALL PRTERR ('FATAL', SCRATCH(:LENSTR(SCRATCH)))
255256
CALL PRTERR ('CMDSPEC',
256257
* 'Syntax is: "blot.dev [-basename basename] [-ps_option num]'//
257-
* ' [-nomap node|element|all] [-show_filename] filename"')
258+
* ' [-change_set cs_#] [-nomap node|element|all]'//
259+
$ ' [-show_filename] filename"')
258260
CALL PRTERR ('CMDSPEC',
259261
* 'Documentation: https://sandialabs.github.io' //
260262
$ '/seacas-docs/sphinx/html/index.html#blot')
@@ -323,6 +325,29 @@ PROGRAM BLOTII
323325
mapnd = .false.
324326
mapel = .false.
325327
end if
328+
else if (option(:lo) .eq. '-change_set' .or.
329+
* option(:lo) .eq. '--change_set') then
330+
C ... Convert `value` to an integer.
331+
CALL get_argument(i,value, lv)
332+
i = i + 1
333+
read (value(:lv), '(i10)') nchange
334+
C ... Check that file contains at least that many change sets...
335+
ndbr = iand(ndb, EX_FILE_ID_MASK)
336+
call exinq(ndbr, EX_INQ_NUM_CHILD_GROUPS,
337+
$ idum, rdum, cdum, ierr)
338+
if (nchange .gt. idum) then
339+
write (SCRATCH,*) 'Selected change set', nchange,
340+
$ 'but there are only ', idum, ' change sets in file.'
341+
call sqzstr(scratch, lscratch)
342+
call PRTERR('CMDERR', SCRATCH(:LSCRATCH))
343+
goto 170
344+
else
345+
write (scratch,99) nchange
346+
99 format(1x,'NOTE: Selecting change set ', i3)
347+
call sqzstr(scratch, lscratch)
348+
call PRTERR('CMDSPEC', scratch(:lscratch))
349+
ndb = ndbr + nchange
350+
end if
326351
end if
327352
if (i .gt. narg) exit
328353
end do

‎packages/seacas/applications/blot/cgi/vdicps.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C Copyright(C) 1999-2020 National Technology & Engineering Solutions
1+
C Copyright(C) 1999-2020, 2025 National Technology & Engineering Solutions
22
C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
33
C NTESS, the U.S. Government retains certain rights in this software.
44
C
@@ -1659,7 +1659,7 @@ SUBROUTINE VDSTLA(LOCX,LOCY)
16591659
C All Batch Devices.
16601660

16611661
C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is
1662-
C initilaized to.
1662+
C initialized to.
16631663

16641664
C CALLS -
16651665

‎packages/seacas/applications/blot/cgi/vdicps_dual.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C Copyright(C) 1999-2020 National Technology & Engineering Solutions
1+
C Copyright(C) 1999-2020, 2025 National Technology & Engineering Solutions
22
C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
33
C NTESS, the U.S. Government retains certain rights in this software.
44
C
@@ -1657,7 +1657,7 @@ SUBROUTINE WCPSLA(LOCX,LOCY)
16571657
C All Batch Devices.
16581658

16591659
C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is
1660-
C initilaized to.
1660+
C initialized to.
16611661

16621662
C CALLS -
16631663

0 commit comments

Comments
 (0)