Merge branch 'develop'

.gitignore

@@ -3,7 +3,6 @@
 #################
 
 *.pydevproject
-*.o
 .project
 .metadata
 bin/
@@ -51,7 +50,6 @@ local.properties
 *_p.c
 *.ilk
 *.meta
-*.obj
 *.pch
 *.pdb
 *.pgc
@@ -130,6 +128,13 @@ Thumbs.db
 Desktop.ini
 
 
+#############
+## Fortran
+#############
+*.o
+*.obj
+*.mod
+
 #############
 ## Python
 #############

autotest/config.py

@@ -19,6 +19,10 @@
 if platform.system() in 'Windows':
     target_extension = '.exe'
 
+fflags = None
+if fc == 'gfortran':
+    fflags = 'Werror Wtabs Wline-truncation Wcharacter-truncation'
+
 # Development version information
 testpaths = [os.path.join('..', 'test-cmp'), os.path.join('..', 'test-reg')]
 srcdir = os.path.join('..', 'src')

autotest/t000_test.py

@@ -98,7 +98,8 @@ def test_compile_dev():
     target = config.target
     pymake.main(config.srcdir, target, config.fc, 'gcc', makeclean=True,
                 expedite=False, dryrun=False, double=False, debug=False,
-                include_subdirs=False, arch=config.target_arch)
+                include_subdirs=False, arch=config.target_arch,
+                fflags=config.fflags)
 
     # Ensure target has been built
     assert os.path.isfile(target) is True, 'Target {} does not exist.'.format(target)

mt3dms/src/mt_adv5.for

@@ -739,6 +739,9 @@ C
       COMMON /AD/PERCEL,ITRACK,WD,ISEED,DCEPS,NPLANE,NPL,NPH,
      &           NPMIN,NPMAX,SRMULT,INTERP,NLSINK,NPSINK,DCHMOC
 C
+C--INITIALIZE
+      V(:)=0.
+C
 C--SET DT TO NEGATIVE FOR BACKWARD TRACKING
       DT=-DTRANS
 C

mt3dms/src/mt_hss5.for

@@ -212,12 +212,12 @@ c distribute to multiple cells
           enddo              
 c                            
           num=0
-          area_total=0	    
+          area_total=0    
           do i=1,nrow
             do j=1,ncol
               R=sqrt((xbc(j)-xbc(jsource))**2+(ybc(i)-ybc(isource))**2)
               R=R-0.5*sqrt(delr(j)**2+delc(i)**2)
-              if(R.gt.1.5*radius_lnapl) cycle  !1.5 is a safety factor             			 
+              if(R.gt.1.5*radius_lnapl) cycle  !1.5 is a safety factor 
               call GetArea(ncol,nrow,nPoint,p,nSubGrid,delr,xbc,
      &         delc,ybc,j,i,area_cell)
 c            
@@ -324,9 +324,9 @@ C
 C
 C--LOOP over all HSS_LNAPL sources
         DO is=1,nHSSSource               
-c	  
+c  
           iHSSComp=int(HSSData(4,1,is))
-	        if(iHSSComp.ne.ICOMP) cycle            
+            if(iHSSComp.ne.ICOMP) cycle            
 c
   666     DO icell=1,MaxHSSCells                
 c  
@@ -389,7 +389,7 @@ c
 c--get interpolated conc at beginning and ending of transport step         
       cTime1=0.
       if(iTime1.lt.MaxHSSStep) then                
-	      cstart=HSSData(4+icell,iTime1,  isource)
+        cstart=HSSData(4+icell,iTime1,  isource)
         cend=  HSSData(4+icell,iTime1+1,isource)
         tstart=HSSData(1,iTime1,  isource)
         tend  =HSSData(1,iTime1+1,isource)       
@@ -400,11 +400,11 @@ c--get interpolated conc at beginning and ending of transport step
 c      
       cTime2=0.
       if(iTime2.lt.MaxHSSStep) then                     
-	      cstart=HSSData(4+icell,iTime2,  isource)
+        cstart=HSSData(4+icell,iTime2,  isource)
         cend=  HSSData(4+icell,iTime2+1,isource)
         tstart=HSSData(1,iTime2,  isource)
         tend  =HSSData(1,iTime2+1,isource)       
-  	    if(tend.ne.tstart.and.time2.ge.tstart.and.time2.le.tend) then
+        if(tend.ne.tstart.and.time2.ge.tstart.and.time2.le.tend) then
           cTime2=((cend-cstart)/(tend-tstart))*(time2-tstart)+cstart
         endif
       endif      
@@ -459,8 +459,8 @@ c
       real      delr,delc,xbc,ybc,area,pmin,pmax,p,subpoint,
      &          x0,y0,dx,dy
       logical   inside
-      dimension delr(ncol),delc(nrow),xbc(ncol),ybc(nrow),                
-     &		p(2,npoint),subpoint(2),pmin(2),pmax(2)
+      dimension delr(ncol),delc(nrow),xbc(ncol),ybc(nrow),
+     &          p(2,npoint),subpoint(2),pmin(2),pmax(2)
 c
       pmin(1)=0
       pmin(2)=0
@@ -479,7 +479,7 @@ c
           if(inside(npoint,p,subpoint,pmin) .and.
      &     inside(npoint,p,subpoint,pmax)) then
              nsub=nsub+1
-	  endif
+          endif
         enddo
       enddo
       if(nsub.gt.0) then

mt3dms/src/mt_utl5.for

@@ -16,7 +16,7 @@ C
       IMPLICIT  NONE
       INTEGER   IN,ISTAT,I,IDFL
       LOGICAL   LOP
-      CHARACTER FINDEX*30,FLNAME*50,FLFORM*15,FLSTAT*15,FILACT*20,
+      CHARACTER FINDEX*30,FLNAME*50,FLFORM*20,FLSTAT*15,FILACT*20,
      &          ACCARG*20
 C
       INCLUDE  'FILESPEC.INC'

src/adv1.f

@@ -73,7 +73,7 @@ SUBROUTINE ADV1AR(IN)
 C
       WRITE(IOUT,2038) PERCEL
       IF(PERCEL.LE.1.E-5) THEN
-        WRITE(*,1040)
+        WRITE(*,2040)
         CALL USTOP(' ')
       ENDIF
       IF(MIXELM.LT.0.AND.PERCEL.GT.1.0) THEN
@@ -131,7 +131,7 @@ SUBROUTINE ADV1AR(IN)
      &       /1X,'ENTER A VALUE BETWEEN -1 AND 3')
  2038 FORMAT( 1X,'COURANT NUMBER ALLOWED IN SOLVING',
      &          ' THE ADVECTION TERM =',G10.3)
- 2040 FORMAT(/1X,'ERROR: COURANT NUMBER [PERCEL] MUST BE >0.',
+ 2040 FORMAT(/1X,'ERROR: COURANT NUMBER [PERCEL] MUST BE >1.E-5 ',
      &       /1X,'ENTER A VALID VALUE OF [PERCEL] IN ADVECTION INPUT ',
      &           'FILE.')
  2043 FORMAT(/1X,'WARNING: COURANT NUMBER [PERCEL] MUST NOT EXCEED 1.0',
@@ -520,7 +520,7 @@ SUBROUTINE SADV1M(NCOL,NROW,NLAY,MXPART,NCOUNT,NPCHEK,XP,YP,ZP,
 C LEVEL DUE TO ADVECTION USING THE FORWARD TRACKING MOC PROCEDURE.
 C **********************************************************************
 C
-	USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ,
+      USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ,
      &          PERCEL,ITRACK,WD,ISEED,DCEPS,NPLANE,NPL,NPH,
      &          NPMIN,NPMAX,SRMULT,INTERP,NLSINK,NPSINK,DCHMOC
 C
@@ -825,7 +825,7 @@ SUBROUTINE SADV1B(NCOL,NROW,NLAY,MIXELM,ICBUND,DELR,DELC,DZ,
 C LEVEL DUE TO ADVECTION WITH THE BACKWARD TRACKING MMOC PROCEDURE.
 C **********************************************************************
 C
-	USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ,
+      USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ,
      &          PERCEL,ITRACK,WD,ISEED,DCEPS,NPLANE,NPL,NPH,
      &          NPMIN,NPMAX,SRMULT,INTERP,NLSINK,NPSINK,DCHMOC
 C
@@ -847,6 +847,9 @@ SUBROUTINE SADV1B(NCOL,NROW,NLAY,MIXELM,ICBUND,DELR,DELC,DZ,
      &          CNEW(NCOL,NROW,NLAY),BUFF(NCOL,NROW,NLAY),
      &          XTMP(NMAX),YTMP(NMAX),ZTMP(NMAX),P(3),V(3)
 C
+C--INITIALIZE
+      V(:)=0.
+C
 C--SET DT TO NEGATIVE FOR BACKWARD TRACKING
       DT=-DTRANS
 C
@@ -1268,7 +1271,7 @@ SUBROUTINE PARMGR(IOUT,NCOL,NROW,NLAY,MIXELM,MXPART,NCOUNT,NPINS,
 C DELETING OR INSERTING PARTICLES AS NECESSARY.
 C **********************************************************************
 C
-	USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ,
+      USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ,
      &          PERCEL,ITRACK,WD,ISEED,DCEPS,NPLANE,NPL,NPH,
      &          NPMIN,NPMAX,SRMULT,INTERP,NLSINK,NPSINK,DCHMOC
 C
@@ -1933,7 +1936,7 @@ SUBROUTINE VRK4(P,V,DT,J0,I0,K0,NCOL,NROW,NLAY,ICBUND,
 C PARTICLE P OVER DT USING THE 4TH-ORDER RUNGE-KUTTA SOLUTION.
 C *******************************************************************
 C
-	USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ
+      USE MT3DMS_MODULE, ONLY : HORIGN,XMAX,YMAX,ZMAX,UNIDX,UNIDY,UNIDZ
 C
       IMPLICIT  NONE
       INTEGER   NCOL,NROW,NLAY,ICBUND,JP,IP,KP,J0,I0,K0,J,I,K,N

src/btn1.f

@@ -271,7 +271,7 @@ SUBROUTINE BTN1AR(IN)
 C***********************************************************************
 C
       USE UZTVARS, ONLY: PRSITYSAV,IUZFOPTG
-	USE MT3DMS_MODULE
+      USE MT3DMS_MODULE
       USE MIN_SAT                
       USE RCTMOD, ONLY: IREACTION
       USE MT3DUTIL
@@ -301,13 +301,13 @@ SUBROUTINE BTN1AR(IN)
       ALLOCATE(TUNIT)
       ALLOCATE(LUNIT)
       ALLOCATE(MUNIT)
-	ALLOCATE(ISOTHM)
-	ALLOCATE(HT1)
-	ALLOCATE(HT2)
-	ALLOCATE(DTRANS)
-	ALLOCATE(DELT)
-	ALLOCATE(TIME1)
-	ALLOCATE(TIME2)
+      ALLOCATE(ISOTHM)
+      ALLOCATE(HT1)
+      ALLOCATE(HT2)
+      ALLOCATE(DTRANS)
+      ALLOCATE(DELT)
+      ALLOCATE(TIME1)
+      ALLOCATE(TIME2)
       ALLOCATE(CINACT)
       ALLOCATE(THKMIN)
       ALLOCATE(RFMIN)
@@ -344,7 +344,7 @@ SUBROUTINE BTN1AR(IN)
       ALLOCATE(IUZFOPTG)
 C
 C--INITIALIZE VARIABLES THAT DEPEND ON OTHER PACKAGES
-	ISOTHM=0
+      ISOTHM=0
       IF(FPRT.EQ.' ') FPRT='N'
 C
 C--READ AND PRINT HEADING

src/cts1.f

@@ -389,7 +389,8 @@ SUBROUTINE CTS1FM(ICOMP)
           ENDDO
 C
 C--SKIP IF NOT ACTIVE CELL
-          IF(ICBUND(JJ,II,KK,ICOMP).LE.0.OR.IQ.LE.0) THEN !EXTRACTION IS FORMULATED IN SSM PACKAGE
+          IF(ICBUND(JJ,II,KK,ICOMP).LE.0.OR.IQ.LE.0) THEN
+            ! EXTRACTION IS FORMULATED IN SSM PACKAGE
             IF(ICBUND(JJ,II,KK,ICOMP).EQ.0.AND.IQ.GT.0) THEN
               IF(DRYON) THEN
                 Q=SS(5,IWELL)*DELR(JJ)*DELC(II)*ABS(DH(JJ,II,KK))
@@ -416,7 +417,7 @@ SUBROUTINE CTS1FM(ICOMP)
         IF(ITRTINJ(ICTS).EQ.0) THEN               !NO TREATMENT
           CINJ=CCTS(ICOMP,ICTS)
         ELSEIF(ITRTINJ(ICTS).EQ.1) THEN           !SAME TREATMENT TO ALL
-          IF(IOPTINJ(ICOMP,1,ICTS).EQ.1) THEN     !PERCENT REMOVAL/ADDITION
+          IF(IOPTINJ(ICOMP,1,ICTS).EQ.1) THEN  !PERCENT REMOVAL/ADDITION
             CINJ=CCTS(ICOMP,ICTS)*(1.0E0+CMCHGINJ(ICOMP,1,ICTS))
           ELSEIF(IOPTINJ(ICOMP,1,ICTS).EQ.2) THEN !CONC REMOVAL/ADDITION
             CINJ=CCTS(ICOMP,ICTS)+CMCHGINJ(ICOMP,1,ICTS)
@@ -480,12 +481,16 @@ SUBROUTINE CTS1FM(ICOMP)
             ENDIF
           ENDDO
 C
-          IF(ITRTINJ(ICTS).EQ.2) THEN               !SEPARATE TREATMENT TO EACH INJ WELL
-            IF(IOPTINJ(ICOMP,I,ICTS).EQ.1) THEN     !PERCENT REMOVAL/ADDITION
+          IF(ITRTINJ(ICTS).EQ.2) THEN
+            !SEPARATE TREATMENT TO EACH INJ WELL
+            IF(IOPTINJ(ICOMP,I,ICTS).EQ.1) THEN
+              !PERCENT REMOVAL/ADDITION
               CINJ=CCTS(ICOMP,ICTS)*(1.0E0+CMCHGINJ(ICOMP,I,ICTS))
-            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.2) THEN !CONC REMOVAL/ADDITION
+            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.2) THEN
+              !CONC REMOVAL/ADDITION
               CINJ=CCTS(ICOMP,ICTS)+CMCHGINJ(ICOMP,I,ICTS)
-            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.3) THEN !MASS REMOVAL/ADDITION
+            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.3) THEN
+              !MASS REMOVAL/ADDITION
               IF(ABS(Q).LT.1.0E-20) THEN
                 WRITE(IOUT,*) '***WARNING: FLOW SET TO 1E-20 FOR CTS',
      &            ICTS
@@ -711,7 +716,7 @@ SUBROUTINE CTS1BD(KSTP,KPER,ICOMP,DTRANS,NTRANS)
         IF(ITRTINJ(ICTS).EQ.0) THEN               !NO TREATMENT
           CINJ=CCTS(ICOMP,ICTS)
         ELSEIF(ITRTINJ(ICTS).EQ.1) THEN           !SAME TREATMENT TO ALL
-          IF(IOPTINJ(ICOMP,1,ICTS).EQ.1) THEN     !PERCENT REMOVAL/ADDITION
+          IF(IOPTINJ(ICOMP,1,ICTS).EQ.1) THEN  !PERCENT REMOVAL/ADDITION
             CINJ=CCTS(ICOMP,ICTS)*(1.0E0+CMCHGINJ(ICOMP,1,ICTS))
           ELSEIF(IOPTINJ(ICOMP,1,ICTS).EQ.2) THEN !CONC REMOVAL/ADDITION
             CINJ=CCTS(ICOMP,ICTS)+CMCHGINJ(ICOMP,1,ICTS)
@@ -773,12 +778,16 @@ SUBROUTINE CTS1BD(KSTP,KPER,ICOMP,DTRANS,NTRANS)
           ENDDO
 C
 C
-          IF(ITRTINJ(ICTS).EQ.2) THEN               !SEPARATE TREATMENT TO EACH INJ WELL
-            IF(IOPTINJ(ICOMP,I,ICTS).EQ.1) THEN     !PERCENT REMOVAL/ADDITION
+          IF(ITRTINJ(ICTS).EQ.2) THEN
+            !SEPARATE TREATMENT TO EACH INJ WELL
+            IF(IOPTINJ(ICOMP,I,ICTS).EQ.1) THEN
+              !PERCENT REMOVAL/ADDITION
               CINJ=CCTS(ICOMP,ICTS)*(1.0E0+CMCHGINJ(ICOMP,I,ICTS))
-            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.2) THEN !CONC REMOVAL/ADDITION
+            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.2) THEN
+              !CONC REMOVAL/ADDITION
               CINJ=CCTS(ICOMP,ICTS)+CMCHGINJ(ICOMP,I,ICTS)
-            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.3) THEN !MASS REMOVAL/ADDITION
+            ELSEIF(IOPTINJ(ICOMP,I,ICTS).EQ.3) THEN
+              !MASS REMOVAL/ADDITION
               IF(ABS(Q).LT.1.0E-20) THEN
                 WRITE(IOUT,*) '***WARNING: FLOW SET TO 1E-20 FOR CTS',
      &                        ICTS

src/fmi1.f

@@ -130,6 +130,7 @@ SUBROUTINE FMI1AR()
               READ(INFTL,*) TEXT1
             ENDIF
 C       
+            !NSY: NOT SUPPORTED YET
             IF(TEXT1.EQ.'                 STR') FSTR=.TRUE.
             IF(TEXT1.EQ.'                 RES') FRES=.TRUE.
             IF(TEXT1.EQ.'                 FHB') FFHB=.TRUE.
@@ -140,7 +141,7 @@ SUBROUTINE FMI1AR()
             IF(TEXT1.EQ.'                 LAK') FLAK=.TRUE. 
             IF(TEXT1.EQ.'           LAK FLOWS') FLAKFLOWS=.TRUE.
             IF(TEXT1.EQ.'                 MNW') FMNW=.TRUE.
-            IF(TEXT1.EQ.'           MNW FLOWS') FMNWFLOWS=.TRUE. !NOT SUPPORTED YET
+            IF(TEXT1.EQ.'           MNW FLOWS') FMNWFLOWS=.TRUE. !NSY
             IF(TEXT1.EQ.'                 SWT') FSWT=.TRUE.
             IF(TEXT1.EQ.'                 SFR') FSFR=.TRUE.
             IF(TEXT1.EQ.'        SFR FLOWS SS' .OR.
@@ -152,7 +153,7 @@ SUBROUTINE FMI1AR()
             IF(TEXT1.EQ.'                 UZF') FUZF=.TRUE.
             IF(TEXT1.EQ.'           UZF FLOWS') FUZFFLOWS=.TRUE.
             IF(TEXT1.EQ.'                 SWR') FSWR=.TRUE.
-            IF(TEXT1.EQ.'           SWR FLOWS') FSWRFLOWS=.TRUE. !NOT SUPPORTED YET
+            IF(TEXT1.EQ.'           SWR FLOWS') FSWRFLOWS=.TRUE. !NSY
             IF(TEXT1.EQ.'     CONNECT SFR LAK') FSFRLAK=.TRUE.
             IF(TEXT1.EQ.'     CONNECT SFR UZF') FSFRUZF=.TRUE.
             IF(TEXT1.EQ.'     CONNECT LAK UZF') FLAKUZF=.TRUE.
@@ -295,7 +296,8 @@ SUBROUTINE FMI1AR()
               READ(INFTL,*) KKPER,KKSTP,NC,NR,NL,LABEL
             ENDIF
 C
-            ! file pointer will be on recognizable values if single precision
+            ! file pointer will be on recognizable values
+            ! if single precision
             IF (KKPER.ne.KPER .or. NC.ne.NCOL .or.
      &          NR.ne.NROW .or. NL.ne.NLAY) THEN
               WRITE(IOUT,11)
@@ -339,7 +341,7 @@ SUBROUTINE FMI1AR()
      &           'Possibly Caused by:',
      &       /1X,'1. Incompatible Styles of Unformatted Files ',
      &           'Used by MODFLOW and MT3D-USGS, ensure usage ',
-     &       /1X 'of FREE in MT3D-USGS name file matches LMT;',
+     &       /1X,'of FREE in MT3D-USGS name file matches LMT;',
      &       /1X,'2. Unformatted Flow-Transport Link File Saved by ',
      &           'Version 1 of LinkMT3D',
      &       /1X,'   Package Which Is No Longer Supported by ',
@@ -586,7 +588,8 @@ SUBROUTINE FMI1RP1(KPER,KSTP)
       ENDDO
 C
   420 IF(NLAY.LT.2) GOTO 430
-      IF(FUZFFLOWS) GOTO 430  ! THIS CALCULATION IS REPEATED IN RP2 WHEN FUZFFLOWS>0
+      IF(FUZFFLOWS) GOTO 430  ! THIS CALCULATION IS REPEATED
+                              ! IN RP2 WHEN FUZFFLOWS>0
       DO J=1,NCOL
         DO I=1,NROW
           DO K=2,NLAY