Adding a new test for issue #39. Also closes #39 and #29

autotest/t002_test.py

@@ -99,5 +99,6 @@ def test_mfusg():
         exclude = list(config.exclude)
     exclude.append('.cmp')
     namefiles = get_namefiles(config.testpaths[2], exclude=exclude)
+    #namefiles = ['../test-cmp/test054_gwfu-cln/model01.nam']
     for namefile in namefiles:
         run_mfusg(namefile)

autotest/t999_test.py

@@ -20,6 +20,10 @@ def test_teardown():
         print('Removing ' + config.target_release)
         os.remove(config.target_release)
 
+    if os.path.isfile(config.zbudusg_target):
+        print('Removing ' + config.zbudusg_target)
+        os.remove(config.zbudusg_target)
+
     return
 
 if __name__ == '__main__':

src/glo2basu1.f

@@ -602,8 +602,7 @@ SUBROUTINE SGLO2BAS8ARDIS(IUDIS,IOUT,IUCLN,IUGNC,IUGNC2,IUGNCn)
         ENDDO
       ELSE
 C10B----read IVC, for IVSD. GT. 0.
-        IF(NLAY.GT.1) 
-     *  CALL U1DINTNJA(IVC,IATMP,ANAME,NJATMP,INDIS,IOUT,IDSYMRD)
+        CALL U1DINTNJA(IVC,IATMP,ANAME,NJATMP,INDIS,IOUT,IDSYMRD)
       ENDIF
 C      
 C--------------------------------------------------------------------------

src/gwf2bcf-lpf-u1.f

@@ -1999,7 +1999,9 @@ SUBROUTINE GWF2BCFU1BDADJ(KSTP,KPER)
           END IF
           HD=HNEW(JJ)
           IF(IVC(IIS).EQ.1.AND.JJ.GT.N)THEN !VERTICAL DIRECTION DOWN
-            IF(LAYCON(K+1).NE.3 .AND. LAYCON(K+1).NE.2) GO TO 122 !CSP 2 SHOULD BE 1
+            KK = K+1
+            IF(NLAY.EQ.1) KK = K
+            IF(LAYCON(KK).NE.3 .AND. LAYCON(KK).NE.2) GO TO 122 !CSP 2 SHOULD BE 1
             TMP=HD
             IF(NOVFC.EQ.0)THEN
               IF(TMP.LT.TOP(JJ)) HD=TOP(JJ)
@@ -3629,6 +3631,7 @@ SUBROUTINE SGWF2LPFU1VCONDV(K)
               ISLOC = ISYM(II)
               IF(IBOUND(JJ).NE.0) THEN
                 KK = K+1
+                IF(NLAY.EQ.1) KK = K
 C
 C4--------------CALCULATE VERTICAL HYDRAULIC CONDUCTIVITY FOR CELL.
                 IF(LAYVKA(K).EQ.0) THEN

src/utl7u1.f

@@ -2740,23 +2740,24 @@ SUBROUTINE U1DRELNJA(ARRAY,IAG,ANAME,NJAG,IN,IOUT,IDSYMRD)
           RETURN
         ENDIF
 C
-        NJAGS = (NJAG - NODES) / 2
+        NJAGS = (NJAG - NODES) / 2    
         ALLOCATE(TEMP(NJAGS))
 C1-------READ SYMMETRIC DATA IN TEMP LOCATION FOR SUBSURFACE NODES
         CALL U1DREL(TEMP,ANAME,NJAGS,K,IN,IOUT)
 C1A------FILL INTO UNSYMMETRIC TEMPU LOCATION
-        ALLOCATE(TEMPU(NJAG))
         DO N=1,NODES
+          IIC = 0  ! ITERATION COUNTER OF GROUNDWATER CONNECTIONS 
           DO II = IA(N)+1,IA(N+1)-1
             JJ = JA(II)
-            IF(JJ.GT.N)THEN
+            IF(JJ.GT.N.AND. JJ.LE. NODES)THEN
+              IIC = IIC + 1  
               IIS = JAS(II)
-              TEMPU(II) = TEMP(IIS)
-              TEMPU(ISYM(II)) = TEMP(IIS)
+              ARRAY(IIS) = TEMP(IIC)
             ENDIF
           ENDDO
         ENDDO
         DEALLOCATE(TEMP)
+        RETURN
       ELSE
 C2------READ UNSYMMETRIC DATA IN TEMPU LOCATION AND TRANSFER
         ALLOCATE(TEMPU(NJAG))