Address flang-new common block padding warnings

sandialabs · Mar 7, 2024 · 0a8141a · 0a8141a
1 parent 44bb507
commit 0a8141a
Show file tree

Hide file tree

Showing 102 changed files with 169 additions and 431 deletions.
diff --git a/packages/seacas/applications/algebra/ag_dbnumq.blk b/packages/seacas/applications/algebra/ag_dbnumq.blk
@@ -3,7 +3,7 @@ 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
-      COMMON /DBNUMQ/ EXODUS, NQAREC, NINFO
+      COMMON /DBNUMQ/ NQAREC, NINFO, EXODUS
       LOGICAL EXODUS
 C      --EXODUS - true iff EXODUS versus GENESIS database
 C      --NQAREC - the number of QA records

diff --git a/packages/seacas/applications/algebra/ag_filter.blk b/packages/seacas/applications/algebra/ag_filter.blk
@@ -3,7 +3,7 @@ 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
-      COMMON /FILTER/   ISFILTER, IDXFLT, CMPFLT, VALFLT, TIMFLT
+      COMMON /FILTER/   IDXFLT, CMPFLT, VALFLT, TIMFLT, ISFILTER
       LOGICAL ISFILTER
       INTEGER IDXFLT
       INTEGER CMPFLT

diff --git a/packages/seacas/applications/blot/allal2.f b/packages/seacas/applications/blot/allal2.f
@@ -23,8 +23,7 @@ SUBROUTINE ALLAL2 (LENF, IF2EL, IE2ELB, NEWELB)
 C   --   Uses NELBLK of /DBNUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER LENF(0:NELBLK+2)
       INTEGER IF2EL(*)

diff --git a/packages/seacas/applications/blot/allal3.f b/packages/seacas/applications/blot/allal3.f
@@ -30,8 +30,7 @@ SUBROUTINE ALLAL3 (LENF, IF2EL, IF2EL2, IE2ELB, NEWELB)
 C   --   Uses NELBLK of /DBNUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER LENF(0:NELBLK+2)
       INTEGER IF2EL(*), IF2EL2(*)

diff --git a/packages/seacas/applications/blot/allcut.f b/packages/seacas/applications/blot/allcut.f
@@ -24,8 +24,7 @@ SUBROUTINE ALLCUT (IE2ELB, LENF, IF2EL, IF2EL2, NEWELB)
 C   --   Uses NELBLK of /DBNUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER IE2ELB(NUMEL)
       INTEGER LENF(0:NELBLK+3)

diff --git a/packages/seacas/applications/blot/cfv2nv.f b/packages/seacas/applications/blot/cfv2nv.f
@@ -36,8 +36,7 @@ SUBROUTINE CFV2NV (LENF, NLNKF, LINKF, IELBST, ISEVOK, VARFAC,
 C   --   Uses NUMNPF, IS3DIM of /D3NUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER LENF(0:NELBLK)
       INTEGER NLNKF(NELBLK)

diff --git a/packages/seacas/applications/blot/ckcntr.f b/packages/seacas/applications/blot/ckcntr.f
@@ -20,10 +20,6 @@ SUBROUTINE CKCNTR (OK)
 C   --   Uses CINTOK, LINCON, NCNTR, CINTV of /CNTR/
 
       include 'cntr.blk'
-C     FLAG FOR EXACT CONTOUR VALUES FOR EACH PLOT
-C     COMMON /CNTR/   CINTOK, LINCON, NCNTR, CMIN, CMAX, DELC,
-C    &   CINTV(256), NOCMIN, NOCMAX, LABINC, MAXMIN, MAXMAX
-C     LOGICAL CINTOK, LINCON, NOCMIN, NOCMAX
 
       LOGICAL OK
 

diff --git a/packages/seacas/applications/blot/cntri.f b/packages/seacas/applications/blot/cntri.f
@@ -20,9 +20,7 @@ REAL FUNCTION CNTRI (ICNTR)
 C   --Common Variables:
 C   --   Uses CINTOK, CMIN, DELC, CINTV of /CNTR/
 
-      COMMON /CNTR/   CINTOK, LINCON, NCNTR, CMIN, CMAX, DELC,
-     &   CINTV(256), NOCMIN, NOCMAX, LABINC, MAXMIN, MAXMAX
-      LOGICAL CINTOK, LINCON, NOCMIN, NOCMAX
+      include 'cntr.blk'
 
       IF (.NOT. CINTOK) THEN
          CNTRI = CMIN + (ICNTR-1) * DELC

diff --git a/packages/seacas/applications/blot/conlab.f b/packages/seacas/applications/blot/conlab.f
@@ -35,8 +35,7 @@ SUBROUTINE CONLAB (ICNTR, CNTR, NHIT, LABINC, LINSET,
 
       PARAMETER (DXO = .0015, DYO = .0015)
 
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER LINSET(3)
       REAL VARNP(*)

diff --git a/packages/seacas/applications/blot/contf.f b/packages/seacas/applications/blot/contf.f
@@ -32,8 +32,7 @@ SUBROUTINE CONTF (CNTR, VARNP, NLNKF, LINKF1,
 C   --Common Variables:
 C   --   Uses IS3DIM of /D3NUMS/
 
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       REAL VARNP(*)
       INTEGER LINKF1(NLNKF)

diff --git a/packages/seacas/applications/blot/contor.f b/packages/seacas/applications/blot/contor.f
@@ -54,11 +54,8 @@ SUBROUTINE CONTOR (VARNP, LENF, NLNKF, LINKF, HIDEF,
 C   --   Uses NCNTR, LABINC, MAXMIN, MAXMAX of /CNTR/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
-      COMMON /CNTR/   CINTOK, LINCON, NCNTR, CMIN, CMAX, DELC,
-     &   CINTV(256), NOCMIN, NOCMAX, LABINC, MAXMIN, MAXMAX
-      LOGICAL CINTOK, LINCON, NOCMIN, NOCMAX
+      include 'd3nums.blk'
+      include 'cntr.blk'
 
       REAL VARNP(*)
       INTEGER LENF(0:NELBLK)

diff --git a/packages/seacas/applications/blot/d3nums.blk b/packages/seacas/applications/blot/d3nums.blk
@@ -4,7 +4,7 @@ C    NTESS, the U.S. Government retains certain rights in this software.
 C
 C    See packages/seacas/LICENSE for details
 
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
+      COMMON /D3NUMS/ NNPSUR, NUMNPF, LLNSET, IS3DIM
       LOGICAL IS3DIM
 C      --IS3DIM - true if and only if 3D versus 2D mesh
 C      --NNPSUR - the number of nodes in the surface faces

diff --git a/packages/seacas/applications/blot/dbnumgq.blk b/packages/seacas/applications/blot/dbnumgq.blk
@@ -12,7 +12,7 @@ C   --   LESSEL - the length of the side sets element list
 C   --   LESSNL - the length of the side sets node list
 C   --   LNPSDF - the length of the side set distribution list
 
-      COMMON /DBNUMQ/ EXODUS, NQAREC, NINFO
+      COMMON /DBNUMQ/ NQAREC, NINFO, EXODUS
       LOGICAL EXODUS
 C   --   EXODUS - true iff EXODUS versus GENESIS database
 C   --   NQAREC - the number of QA records

diff --git a/packages/seacas/applications/blot/deadup.F b/packages/seacas/applications/blot/deadup.F
@@ -27,8 +27,7 @@ SUBROUTINE DEADUP (HIDENP, XN, YN, ZN, IDN2B, *)
 C   --   Uses IS3DIM, NUMNPF of /D3NUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       LOGICAL HIDENP(NUMNPF)
       REAL XN(NUMNPF), YN(NUMNPF), ZN(NUMNPF)

diff --git a/packages/seacas/applications/blot/defxyz.f b/packages/seacas/applications/blot/defxyz.f
@@ -34,11 +34,8 @@ SUBROUTINE DEFXYZ (A, ISTEP, FACTOR, SURONL, NPSURF,
 C   --   Sets IXDEF, IYDEF, IZDEF of /DEFORM/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
-      COMMON /DEFORM/ DEFPRO, DEFOK, DEFFAC, DDFAC, DFAC,
-     &   IXDEF, IYDEF, IZDEF
-      LOGICAL DEFPRO, DEFOK
+      include 'd3nums.blk'
+      include 'deform.blk'
 
       DIMENSION A(*)
       LOGICAL SURONL

diff --git a/packages/seacas/applications/blot/dtread.f b/packages/seacas/applications/blot/dtread.f
@@ -36,8 +36,7 @@ SUBROUTINE DTREAD (A, ISTEP, IDTVAR, NNDVAR, NEDVAR,
 C   --   Uses NUMNP, NUMEL, NELBLK of /DBNUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       DIMENSION A(*)
       INTEGER IDTVAR(*)

diff --git a/packages/seacas/applications/blot/elesta.f b/packages/seacas/applications/blot/elesta.f
@@ -34,8 +34,7 @@ SUBROUTINE ELESTA (ISYTYP, VARFAC, LENF, NLNKF, LINKF, HIDEF,
 C   --   Uses IS3DIM of /D3NUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       CHARACTER*(*) ISYTYP
       REAL VARFAC(*)

diff --git a/packages/seacas/applications/blot/epaint.f b/packages/seacas/applications/blot/epaint.f
@@ -38,11 +38,8 @@ SUBROUTINE EPAINT (VARFAC, LENF, NLNKF, LINKF, NXFAC, IXFAC,
 C   --   Uses NCNTR, NOCMIN, NOCMAX of /CNTR/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
-      COMMON /CNTR/   CINTOK, LINCON, NCNTR, CMIN, CMAX, DELC,
-     &   CINTV(256), NOCMIN, NOCMAX, LABINC, MAXMIN, MAXMAX
-      LOGICAL CINTOK, LINCON, NOCMIN, NOCMAX
+      include 'd3nums.blk'
+      include 'cntr.blk'
 
       REAL VARFAC(*)
       INTEGER LENF(0:NELBLK)

diff --git a/packages/seacas/applications/blot/fixal2.f b/packages/seacas/applications/blot/fixal2.f
@@ -25,8 +25,7 @@ SUBROUTINE FIXAL2 (ALIVE, LENF, IF2EL, IE2ELB, NEWELB)
 C   --   Uses NELBLK of /DBNUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       LOGICAL ALIVE(NUMEL)
       INTEGER LENF(0:NELBLK+2)

diff --git a/packages/seacas/applications/blot/fixal3.f b/packages/seacas/applications/blot/fixal3.f
@@ -36,8 +36,7 @@ SUBROUTINE FIXAL3 (ALIVE, LENF, IF2EL, IF2EL2, IE2ELB, NEWELB)
 C   --   Uses NELBLK of /DBNUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       LOGICAL ALIVE(NUMEL)
       INTEGER LENF(0:NELBLK+2)

diff --git a/packages/seacas/applications/blot/fixcut.f b/packages/seacas/applications/blot/fixcut.f
@@ -44,8 +44,7 @@ SUBROUTINE FIXCUT (CUTPT, CUTNRM, X, Y, Z,
       PARAMETER (ISIN = +1, ISOUT = -1, ISCUT = 0, ISON = -2, ISSURF=2)
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       REAL CUTPT(3), CUTNRM(3)
       REAL X(NUMNP), Y(NUMNP), Z(NUMNP)

diff --git a/packages/seacas/applications/blot/fixelb.f b/packages/seacas/applications/blot/fixelb.f
@@ -26,8 +26,7 @@ SUBROUTINE FIXELB (IELBST, LENF, IF2EL, IF2EL2, IE2ELB, NEWELB)
 C   --   Uses NELBLK of /DBNUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER IELBST(NELBLK)
       INTEGER LENF(0:NELBLK+4)

diff --git a/packages/seacas/applications/blot/fndsel.f b/packages/seacas/applications/blot/fndsel.f
@@ -34,8 +34,7 @@ SUBROUTINE FNDSEL (NODVAR, NNENUM, NENUM,
 C   --   Uses NNPSUR, NUMNPF of /D3NUMS/
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       LOGICAL NODVAR
       INTEGER NENUM(NNENUM)

diff --git a/packages/seacas/applications/blot/gauss.f b/packages/seacas/applications/blot/gauss.f
@@ -39,10 +39,9 @@ SUBROUTINE GAUSS_BL (ISYTYP, VARFAC, LENF, NLNKF, LINKF, HIDEF,
       PARAMETER (KSCHSZ=2)
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
-      COMMON /ETCOPT/ VECSCL
-      COMMON /DEVDAT/ DTW, VWSCL
+      include 'd3nums.blk'
+      include 'etcopt.blk'
+      include 'devdat.blk'
 
       CHARACTER*(*) ISYTYP
       INTEGER LENF(0:NELBLK)

diff --git a/packages/seacas/applications/blot/geom2d.f b/packages/seacas/applications/blot/geom2d.f
@@ -46,8 +46,7 @@ SUBROUTINE GEOM2D (LENF, NLNKF, LINKF, IF2EL,
       character*8 cdebug
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER LENF(0:NELBLK)
       INTEGER NLNKF(NELBLK)

diff --git a/packages/seacas/applications/blot/geom3d.f b/packages/seacas/applications/blot/geom3d.f
@@ -39,8 +39,7 @@ SUBROUTINE GEOM3D (LENF, NLNKF, LINKF, IF2EL,
       character*8 cdebug
 
       include 'dbnums.blk'
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
+      include 'd3nums.blk'
 
       INTEGER LENF(0:NELBLK)
       INTEGER NLNKF(NELBLK)

diff --git a/packages/seacas/applications/blot/getdst.f b/packages/seacas/applications/blot/getdst.f
@@ -25,11 +25,9 @@ SUBROUTINE GETDST( NODE1, NODE2, XN, YN, ZN, DIST)
 
 C=======================================================================
 
+      include 'd3nums.blk'
       REAL XN(*), YN(*), ZN(*)
 
-      COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET
-      LOGICAL IS3DIM
-
       XDIST = XN(NODE2) - XN(NODE1)
       YDIST = YN(NODE2) - YN(NODE1)
       IF(IS3DIM) THEN

diff --git a/packages/seacas/applications/blot/grcaln.f b/packages/seacas/applications/blot/grcaln.f
@@ -27,13 +27,7 @@ SUBROUTINE GRCALN (STRING, LSTR)
 C   --Routines Called:
 C   --   LENSTR - (STRLIB) Find string length
 
-      COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2)
-      CHARACTER*3 DEVNAM
-      CHARACTER*8 DEVCOD
-      COMMON /GRPCOM/ ICURDV, ISHARD, DEVOK(2), TALKOK(2),
-     &   NSNAP(2), IFONT(2), SOFTCH(2), AUTOPL(2),
-     &   MAXCOL(2), NUMCOL(0:1,2), MAPALT(2), MAPUSE(2)
-      LOGICAL ISHARD, DEVOK, TALKOK, SOFTCH, AUTOPL
+      include 'grpcom.blk'
 
       CHARACTER*(*) STRING
 

diff --git a/packages/seacas/applications/blot/grcolr.f b/packages/seacas/applications/blot/grcolr.f
@@ -37,15 +37,7 @@ SUBROUTINE GRCOLR (INDX)
       PARAMETER (KCOLIN=6, KCOSYM=44)
       include 'params.blk'
       include 'cmap-lst.blk'
-
-      COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2)
-      CHARACTER*3 DEVNAM
-      CHARACTER*8 DEVCOD
-      COMMON /GRPCOM/ ICURDV, ISHARD, DEVOK(2), TALKOK(2),
-     &   NSNAP(2), IFONT(2), SOFTCH(2), AUTOPL(2),
-     &   MAXCOL(2), NUMCOL(0:1,2), MAPALT(2), MAPUSE(2)
-      LOGICAL ISHARD, DEVOK, TALKOK, SOFTCH, AUTOPL
-
+      include 'grpcom.blk'
       include 'grcol.blk'
 
       INTEGER INDX

diff --git a/packages/seacas/applications/blot/grcolu.f b/packages/seacas/applications/blot/grcolu.f
@@ -22,13 +22,7 @@ SUBROUTINE GRCOLU (MAP)
 C   --   Uses DEVOK, ICURDV, NUMCOL, MAPALT of /GRPCOM/
 C   --   Sets MAPUSE of /GRPCOM/
 
-      COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2)
-      CHARACTER*3 DEVNAM
-      CHARACTER*8 DEVCOD
-      COMMON /GRPCOM/ ICURDV, ISHARD, DEVOK(2), TALKOK(2),
-     &   NSNAP(2), IFONT(2), SOFTCH(2), AUTOPL(2),
-     &   MAXCOL(2), NUMCOL(0:1,2), MAPALT(2), MAPUSE(2)
-      LOGICAL ISHARD, DEVOK, TALKOK, SOFTCH, AUTOPL
+      include 'grpcom.blk'
 
       CHARACTER*(*) MAP
 

diff --git a/packages/seacas/applications/blot/grexit.f b/packages/seacas/applications/blot/grexit.f
@@ -22,13 +22,7 @@ SUBROUTINE GREXIT
 
       PARAMETER (KDVDI=10000)
 
-      COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2)
-      CHARACTER*3 DEVNAM
-      CHARACTER*8 DEVCOD
-      COMMON /GRPCOM/ ICURDV, ISHARD, DEVOK(2), TALKOK(2),
-     &   NSNAP(2), IFONT(2), SOFTCH(2), AUTOPL(2),
-     &   MAXCOL(2), NUMCOL(0:1,2), MAPALT(2), MAPUSE(2)
-      LOGICAL ISHARD, DEVOK, TALKOK, SOFTCH, AUTOPL
+      include 'grpcom.blk'
 
       IF (DEVOK(1)) CALL GRSNAP ('EXIT', 1)
       IF (DEVOK(2)) CALL GRSNAP ('EXIT', 2)

diff --git a/packages/seacas/applications/blot/grgpar.f b/packages/seacas/applications/blot/grgpar.f
@@ -46,13 +46,7 @@ SUBROUTINE GRGPAR (PARTYP, INDEV, IPARMS, IPSTR)
 C   --   Uses ICURDV, DEVOK, DEVNAM, NSNAP, IFONT, SOFTCH, AUTOPL,
 C   --      MAXCOL, NUMCOL, MAPALT of /GRPCOM/
 
-      COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2)
-      CHARACTER*3 DEVNAM
-      CHARACTER*8 DEVCOD
-      COMMON /GRPCOM/ ICURDV, ISHARD, DEVOK(2), TALKOK(2),
-     &   NSNAP(2), IFONT(2), SOFTCH(2), AUTOPL(2),
-     &   MAXCOL(2), NUMCOL(0:1,2), MAPALT(2), MAPUSE(2)
-      LOGICAL ISHARD, DEVOK, TALKOK, SOFTCH, AUTOPL
+      include 'grpcom.blk'
 
       CHARACTER*(*) PARTYP
       INTEGER INDEV

diff --git a/packages/seacas/applications/blot/grgpard.f b/packages/seacas/applications/blot/grgpard.f
@@ -10,13 +10,7 @@ SUBROUTINE GRGPARD (PARTYP, INDEV, IPARMS, IPSTR)
 C     .. Same as GRGPAR, but only handles 'DEVICE' and 'SOFTCHAR'for PARTYP
 C     .. this is to avoid issues with passing logical or integer for `iparms`
 
-      COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2)
-      CHARACTER*3 DEVNAM
-      CHARACTER*8 DEVCOD
-      COMMON /GRPCOM/ ICURDV, ISHARD, DEVOK(2), TALKOK(2),
-     &   NSNAP(2), IFONT(2), SOFTCH(2), AUTOPL(2),
-     &   MAXCOL(2), NUMCOL(0:1,2), MAPALT(2), MAPUSE(2)
-      LOGICAL ISHARD, DEVOK, TALKOK, SOFTCH, AUTOPL
+      include 'grpcom.blk'
 
       CHARACTER*(*) PARTYP
       INTEGER INDEV