diff --git a/model/src/w3iogomd.F90 b/model/src/w3iogomd.F90
index 3422b6bf5..f51b77ca9 100644
--- a/model/src/w3iogomd.F90
+++ b/model/src/w3iogomd.F90
@@ -2569,7 +2569,7 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
     !/ Local parameters
     !/
     INTEGER                 :: IGRD, IERR, I, J, IX, IY, MOGRP,     &
-         MGRPP, ISEA, MOSWLL, IK, IFI, IFJ
+         MGRPP, ISEA, MOSWLL, IFI, IFJ
     INTEGER, ALLOCATABLE    :: MAPTMP(:,:)
 #ifdef W3_S
     INTEGER, SAVE           :: IENT = 0
diff --git a/model/src/w3iogrmd.F90 b/model/src/w3iogrmd.F90
index f292c1eb0..55b75c2d9 100644
--- a/model/src/w3iogrmd.F90
+++ b/model/src/w3iogrmd.F90
@@ -331,11 +331,8 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
     !/ ------------------------------------------------------------------- /
     !/ Local parameters
     !/
-    INTEGER                 :: IGRD, IERR, I, J, MTH, MK, ISEA, IX, IY
+    INTEGER                 :: IGRD, IERR, I, MTH, MK, IX, IY
     INTEGER                 :: IEXT, IPRE
-#ifdef W3_ST4
-    INTEGER                 :: IK, ITH, IK2, ITH2
-#endif
     INTEGER, ALLOCATABLE    :: MAPTMP(:,:)
 #ifdef W3_MPI
     INTEGER                 :: IERR_MPI, IP
@@ -344,12 +341,22 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
     INTEGER, SAVE           :: IENT = 0
 #endif
 #ifdef W3_T
-    INTEGER                 :: K
+    INTEGER                 :: K, ISEA
+#endif
+#if defined(W3_T) || defined(W3_SMC)
+    INTEGER                 :: J
+#endif
+    LOGICAL                 :: WRITE, FLTEST = .FALSE.
+#if defined(W3_NL2) || defined(W3_MPI)
+    LOGICAL                 :: FLSNL2 = .FALSE.
+#endif
+    LOGICAL, SAVE           :: FLDISP = .FALSE.
+#if defined(W3_ST2) || defined(W3_ST3)
+    LOGICAL, SAVE           :: FLINP = .FALSE.
+#endif
+#ifdef W3_IS2
+    LOGICAL, SAVE           :: FLIS  = .FALSE.
 #endif
-    LOGICAL                 :: WRITE, FLTEST = .FALSE., TESTLL,     &
-         FLSNL2 = .FALSE.
-    LOGICAL, SAVE           :: FLINP = .FALSE. , FLDISP = .FALSE.,  &
-         FLIS  = .FALSE.
     CHARACTER(LEN=10)       :: VERTST
     CHARACTER(LEN=13)       :: TEMPXT
     CHARACTER(LEN=30)       :: TNAME0, TNAME1, TNAME2, TNAME3,      &
@@ -360,7 +367,6 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
          FNAMEP, FNAMEG, FNAMEF, FNAMEI
     CHARACTER(LEN=35)       :: IDTST
     CHARACTER(LEN=60)       :: MESSAGE(5)
-    LOGICAL                 :: GLOBAL
 
     REAL, ALLOCATABLE       :: XGRD4(:,:), YGRD4(:,:)
 
diff --git a/model/src/w3iorsmd.F90 b/model/src/w3iorsmd.F90
index fad2b98ec..c07ffd0da 100644
--- a/model/src/w3iorsmd.F90
+++ b/model/src/w3iorsmd.F90
@@ -302,7 +302,7 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT )
          UBA, UBD, PHIBBL, TAUBBL, TAUOCX, TAUOCY,   &
          WNMEAN
     !/
-    USE W3GDATMD, ONLY: NX, NY, NSEA, NSEAL, NSPEC, MAPSTA, MAPST2, &
+    USE W3GDATMD, ONLY: NX, NY, NSEA, NSPEC, MAPSTA, MAPST2, &
          GNAME, FILEXT, GTYPE, UNGTYPE
     USE W3TRIAMD, ONLY: SET_UG_IOBP
     USE W3WDATMD, only : DINIT, VA, TIME, TLEV, TICE, TRHO, ICE, UST
@@ -323,6 +323,10 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT )
          VAAUX
     USE W3ADATMD, ONLY: MPI_COMM_WCMP
     USE mpi_f08 
+#endif
+    !/
+#if defined(W3_T) || defined(W3_MPI)
+    USE W3GDATMD, ONLY: NSEAL
 #endif
     !/
     USE W3SERVMD, ONLY: EXTCDE, EXTIOF
diff --git a/model/src/w3iosfmd.F90 b/model/src/w3iosfmd.F90
index e3cdc9bf4..eaf874a16 100644
--- a/model/src/w3iosfmd.F90
+++ b/model/src/w3iosfmd.F90
@@ -441,7 +441,6 @@ SUBROUTINE W3IOSF ( NDSPT, IMOD )
          IPASS => IPASS6, FLFORM, FNMPRE, OUTPTS,     &
          IX0, IXN, IXS, IY0, IYN, IYS, DIMP
     USE W3ADATMD, ONLY: DW, U10, U10D, CX, CY
-    USE W3ADATMD, ONLY: NSEALM
     USE W3PARALL, ONLY: INIT_GET_JSEA_ISPROC
 #ifdef W3_MPI
     USE W3ADATMD, ONLY: MPI_COMM_WAVE
@@ -449,6 +448,9 @@ SUBROUTINE W3IOSF ( NDSPT, IMOD )
 #endif
 #ifdef W3_T
     USE W3ODATMD, ONLY: NDST
+#endif
+#if defined(W3_T) || defined(W3_MPI)
+    USE W3ADATMD, ONLY: NSEALM
 #endif
     !
 #ifdef W3_MPI
diff --git a/model/src/w3profsmd.F90 b/model/src/w3profsmd.F90
index 63d0108ee..e1118b8b9 100644
--- a/model/src/w3profsmd.F90
+++ b/model/src/w3profsmd.F90
@@ -344,8 +344,8 @@ SUBROUTINE W3CFLUG ( ISEA, NKCFL, FACX, FACY, DT, MAPFS, CFLXYMAX,    &
     !
     USE W3TIMEMD, ONLY: DSEC21
     !
-    USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, CLATS,                 &
-         NTH, ECOS, ESIN, IEN, INDEX_CELL,                          &
+    USE W3GDATMD, ONLY: NX, NY, MAPSF, CLATS,                 &
+         NTH, ECOS, ESIN, IEN, INDEX_CELL,                    &
          TRIGP, IE_CELL, POS_CELL, SI, IOBP
 
     USE W3ADATMD, ONLY: CG, CX, CY
@@ -1323,9 +1323,9 @@ SUBROUTINE W3XYPFSFCT2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
     !/ ------------------------------------------------------------------- /
     !/
     USE W3GDATMD, ONLY : NTH, NTRI, NX, SI,                      &
-         IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBPA, IOBDP
+         IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBDP
 #ifdef W3_REF1
-    USE W3GDATMD, ONLY : REFPARS
+    USE W3GDATMD, ONLY : REFPARS, IOBPA
 #endif
     USE W3ADATMD, ONLY: CG, ITER
     USE W3ODATMD, ONLY: FLBPI, NBI, ISBPI, BBPI0, BBPIN
@@ -1626,7 +1626,7 @@ SUBROUTINE SETDEPTH
     USE W3SERVMD, ONLY: STRACE
 #endif
     !
-    USE W3GDATMD, ONLY: DMIN, IOBDP, MAPFS, NX
+    USE W3GDATMD, ONLY: DMIN, IOBDP, NX
     USE W3ADATMD, ONLY: DW
 
     IMPLICIT NONE
diff --git a/model/src/w3snl1md.F90 b/model/src/w3snl1md.F90
index 09f8cee35..11eb954ac 100644
--- a/model/src/w3snl1md.F90
+++ b/model/src/w3snl1md.F90
@@ -836,8 +836,9 @@ SUBROUTINE W3SNLGQM(A,CG,WN,DEPTH,TSTOTn,TSDERn)
     REAL             :: q_dfac, SATVAL(NK), SUME, ACCVAL, ACCMAX, AMPFAC
     DOUBLE PRECISION :: RAISF, FREQ(NK)
     DOUBLE PRECISION :: TSTOT(NTH,NK) , TSDER(NTH,NK), F(NTH,NK)
+#ifdef W3_TGQM
     DOUBLE PRECISION :: TEMP
-
+#endif
     !.....LOCAL VARIABLES
     INTEGER             JF    , JT    , JF1   , JT1  , IQ_OM2 &
          , JFM0  , JFM1  , JFM2  , JFM3  , IXF1 , IXF2   &
diff --git a/model/src/w3src4md.F90 b/model/src/w3src4md.F90
index 3d21d5895..982014960 100644
--- a/model/src/w3src4md.F90
+++ b/model/src/w3src4md.F90
@@ -229,7 +229,7 @@ SUBROUTINE W3SPR4 (A, CG, WN, EMEAN, FMEAN, FMEAN1, WNMEAN,     &
     USE CONSTANTS, ONLY: TPIINV, GRAV, nu_air
     USE W3GDATMD, ONLY: NK, NTH, NSPEC, SIG, DDEN, WWNMEANP, &
          WWNMEANPTAIL, FTE, FTF, SSTXFTWN,&
-         SSTXFTFTAIL, ESIN, ECOS, ZZWND, SSDSC
+         SSTXFTFTAIL, ESIN, ECOS, SSDSC
 #ifdef W3_S
     USE W3SERVMD, ONLY: STRACE
 #endif
@@ -240,6 +240,7 @@ SUBROUTINE W3SPR4 (A, CG, WN, EMEAN, FMEAN, FMEAN1, WNMEAN,     &
     !
 #ifdef W3_FLX5
     USE W3FLX5MD
+    USE W3GDATMD, ONLY: ZZWND
 #endif
     IMPLICIT NONE
     !/
@@ -550,8 +551,10 @@ SUBROUTINE W3SIN4 (A, CG, K, U, USTAR, DRAT, AS, USDIR, Z0, CD,    &
     REAL                    :: COSU, SINU, TAUX, TAUY, USDIRP, USTP
     REAL                    :: TAUPX, TAUPY, UST2, TAUW, TAUWB
     REAL   , PARAMETER      :: EPS1 = 0.00001, EPS2 = 0.000001
+#if defined(W3_T) || defined(W3_STAB3)
     REAL                    :: Usigma           !standard deviation of U due to gustiness
     REAL                    :: USTARsigma       !standard deviation of USTAR due to gustiness
+#endif
     REAL                    :: CM,UCN,ZCN, &
          Z0VISC, Z0NOZ, EB,  &
          EBX, EBY, AORB, AORB1, FW, UORB,  &
diff --git a/model/src/w3srcemd.F90 b/model/src/w3srcemd.F90
index 020786987..671617500 100644
--- a/model/src/w3srcemd.F90
+++ b/model/src/w3srcemd.F90
@@ -497,11 +497,13 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD,          &
     USE CONSTANTS, ONLY: DWAT, srce_imp_post, srce_imp_pre,         &
          srce_direct, GRAV, TPI, TPIINV
     USE W3GDATMD, ONLY: NK, NTH, NSPEC, SIG, TH, DMIN, DTMAX,       &
-         DTMIN, FACTI1, FACTI2, FACSD, FACHFA, FACP, &
-         XFLT, XREL, FXFM, FXPM, DDEN,     &
-         FHMAX, ECOS, ESIN, IICEDISP,      &
+         DTMIN, FACTI1, FACTI2, FACSD, FACHFA, FACP,                &
+         XFLT, XREL, DDEN, FHMAX, ECOS, ESIN, IICEDISP,             &
          ICESCALES, IICESMOOTH
     USE W3GDATMD, ONLY: IC_NUMERICS
+#if defined(W3_ST1) || defined(W3_ST6)
+    USE W3GDATMD, ONLY: FXFM, FXPM
+#endif
 #if defined(W3_NL5) || defined(W3_NNT)
     USE W3WDATMD, ONLY: TIME
 #endif
diff --git a/model/src/w3triamd.F90 b/model/src/w3triamd.F90
index cc38b5fc4..df5a14538 100644
--- a/model/src/w3triamd.F90
+++ b/model/src/w3triamd.F90
@@ -2070,11 +2070,12 @@ SUBROUTINE UG_GRADIENTS (PARAM, DIFFX, DIFFY)
     ! 10. Source code :
     USE CONSTANTS
     USE W3GDATMD, ONLY : TRIGP, NTRI, NX, NSEA, MAPFS, CLATIS, &
-         FLAGLL,  IEN, TRIA, NSEAL, NTRI
+         FLAGLL,  IEN, TRIA, NTRI
 #ifdef W3_PDLIB
     USE yowElementpool
     use yowNodepool,    only: PDLIB_IEN, PDLIB_TRIA, NPA
     USE yowExchangeModule, only : PDLIB_exchange1Dreal
+    USE W3GDATMD, ONLY : NSEAL
 #endif
 
     IMPLICIT NONE
diff --git a/model/src/w3uqckmd.F90 b/model/src/w3uqckmd.F90
index edcf0e0de..d5307bd8a 100644
--- a/model/src/w3uqckmd.F90
+++ b/model/src/w3uqckmd.F90
@@ -220,7 +220,7 @@ SUBROUTINE W3QCK1 (MX, MY, NX, NY, CFLL, Q, CLOSE, INC,         &
     !/ ------------------------------------------------------------------- /
     !/ Local parameters
     !/
-    INTEGER                 :: IXY, IP, IXYC, IXYU, IXYD, IY, IX,   &
+    INTEGER                 :: IXY, IP, IXYC, IXYU, IXYD, IY,    &
          IAD00, IAD02, IADN0, IADN1, IADN2
 #ifdef W3_S
     INTEGER, SAVE           :: IENT = 0
@@ -238,6 +238,9 @@ SUBROUTINE W3QCK1 (MX, MY, NX, NY, CFLL, Q, CLOSE, INC,         &
 #endif
 #ifdef W3_T2
     REAL                    :: QOLD
+#endif
+#if defined(W3_T0) || defined(W3_T1)
+    INTEGER                 :: IX
 #endif
     !/
     !/ ------------------------------------------------------------------- /
@@ -615,7 +618,7 @@ SUBROUTINE W3QCK2 (MX, MY, NX, NY, VELO, DT, DX1, DX2, Q, CLOSE,&
     !/ ------------------------------------------------------------------- /
     !/ Local parameters
     !/
-    INTEGER                 :: IXY, IP, IXYC, IXYU, IXYD, IY, IX,   &
+    INTEGER                 :: IXY, IP, IXYC, IXYU, IXYD, IY,       &
          IAD00, IAD02, IADN0, IADN1, IADN2
 #ifdef W3_S
     INTEGER, SAVE           :: IENT
@@ -633,6 +636,9 @@ SUBROUTINE W3QCK2 (MX, MY, NX, NY, VELO, DT, DX1, DX2, Q, CLOSE,&
 #endif
 #ifdef W3_T2
     REAL                    :: QOLD
+#endif
+#if defined(W3_T0) || defined(W3_T1)
+    INTEGER                 :: IX
 #endif
     !/
     !/ ------------------------------------------------------------------- /
@@ -1017,7 +1023,7 @@ SUBROUTINE W3QCK3 (MX, MY, NX, NY, CFLL, TRANS, Q, CLOSE,       &
     !/ ------------------------------------------------------------------- /
     !/ Local parameters
     !/
-    INTEGER                 :: IXY, IP, IXYC, IXYU, IXYD, IY, IX,   &
+    INTEGER                 :: IXY, IP, IXYC, IXYU, IXYD, IY,       &
          IAD00, IAD02, IADN0, IADN1, IADN2,   &
          JN, JP
 #ifdef W3_S
@@ -1036,6 +1042,9 @@ SUBROUTINE W3QCK3 (MX, MY, NX, NY, CFLL, TRANS, Q, CLOSE,       &
 #endif
 #ifdef W3_T2
     REAL                    :: QOLD
+#endif
+#if defined(W3_T0) || defined(W3_T1)
+    INTEGER                 :: IX
 #endif
     !/
     !/ ------------------------------------------------------------------- /