Skip to content

Commit

Permalink
Merge branch 'master' into DynamicTopology-PhaseIV
Browse files Browse the repository at this point in the history
Signed-off-by: Greg Sjaardema <gsjaardema@gmail.com>
  • Loading branch information
gsjaardema authored Oct 16, 2024
2 parents 697207b + 180d199 commit 9d55a3f
Show file tree
Hide file tree
Showing 102 changed files with 1,364 additions and 1,387 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/trailing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ 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}"
Expand Down
6 changes: 3 additions & 3 deletions packages/seacas/applications/aprepro/test.inp_app
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)"}
Expand Down
48 changes: 24 additions & 24 deletions packages/seacas/applications/aprepro/test_standard.out
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/blot/grpcom.blk
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/blot/mshcol.f
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions packages/seacas/applications/conjoin/Conjoin.C
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,9 @@ namespace {

global->elementCount = goffset;
global_element_map.resize(goffset);
if (goffset == 0) {
return;
}

size_t max_id = global_element_map[global->elementCount - 1].first;
bool is_contiguous = max_id == global_element_map.size();
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/applications/explore/exp_comand.f
Original file line number Diff line number Diff line change
Expand Up @@ -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 ',
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/explore/exp_dbsbel.f
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions packages/seacas/applications/explore/exp_preb1.f
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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, :, /,
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/explore/exp_prelem.f
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/explore/exp_rmixint.f
Original file line number Diff line number Diff line change
@@ -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=======================================================================
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/gjoin/gj_munnps.f
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -51,7 +51,7 @@ SUBROUTINE MUNNPS (NUMNPS, ISTAT, LNPSNL,
INTEGER NODSCR(*)
character*(namlen) namns(*)
character*(namlen) namsc(*)

IF (NUMNPS .LE. 0) RETURN

JNPS = 0
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/grepos/gp_attrot.blk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/applications/grepos/gp_mapvar.f
Original file line number Diff line number Diff line change
Expand Up @@ -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) )
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/mapvar-kd/mapvar-kd.f
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/mapvar/mapvar.f
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions packages/seacas/applications/numbers/nu_multi_cavity.f
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -128,4 +128,4 @@ SUBROUTINE MULTI_CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS,

RETURN
END

2 changes: 1 addition & 1 deletion packages/seacas/libraries/aprepro_lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/libraries/aprepro_lib/aprepro.ll
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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";
}
Expand Down
6 changes: 3 additions & 3 deletions packages/seacas/libraries/aprepro_lib/test.inp_app
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)"}
Expand Down
Loading

0 comments on commit 9d55a3f

Please sign in to comment.