restore makedefaults

Author: mjreno

autotest/test_gwt_henry_nr.py

@@ -167,45 +167,49 @@ def get_model(ws, name, array_input=False):
     drnspd = {}
     if array_input:
         bheadspd = {}
-        condspd = {}
-        auxspd = {}
+        ghbcondspd = {}
+        ghbauxspd = {}
     else:
         ghbspd = {}
     for kper in range(nper):
         if kper == 0:
             sl = sealevel
         else:
             sl = sealevelts[kper]
+        sl = np.round(sl, decimals=8)
         drnlist = []
         if array_input:
-            abhead = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
-            acond = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
-            aconc = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
-            adens = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
+            bhead = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
+            ghbcond = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
+            ghbconc = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
+            ghbdens = np.full((nlay, nrow, ncol), DNODATA, dtype=float)
         else:
             ghblist = []
-        nbound = 0
+        ghbbnd = 0
+        drnbnd = 0
         for k, i, j in zip(kidx, iidx, jidx):
             zcell = zcellcenters[k, i, j]
             cond = 864.0 * (delz * delc) / (0.5 * delr)
             if zcell > sl:
                 drnlist.append([(k, i, j), zcell, 864.0, 0.0])
+                drnbnd += 1
             else:
                 if array_input:
-                    abhead[k, i, j] = sl
-                    acond[k, i, j] = 864.0
-                    aconc[k, i, j] = 35.0
-                    adens[k, i, j] = 1024.5
+                    bhead[k, i, j] = sl
+                    ghbcond[k, i, j] = 864.0
+                    ghbconc[k, i, j] = 35.0
+                    ghbdens[k, i, j] = 1024.5
                 else:
                     ghblist.append([(k, i, j), sl, 864.0, 35.0, 1024.5])
-                nbound += 1
-        if array_input and zcell <= sl:
-            bheadspd[kper] = abhead
-            condspd[kper] = acond
-            auxspd[kper] = [aconc, adens]
-        elif len(ghblist) > 0:
-            ghbspd[kper] = ghblist
-        if len(drnlist) > 0:
+                ghbbnd += 1
+        if ghbbnd > 0:
+            if array_input:
+                bheadspd[kper] = bhead
+                ghbcondspd[kper] = ghbcond
+                ghbauxspd[kper] = [ghbconc, ghbdens]
+            else:
+                ghbspd[kper] = ghblist
+        if drnbnd > 0:
             drnspd[kper] = drnlist
 
     # drn
@@ -230,8 +234,8 @@ def get_model(ws, name, array_input=False):
             pname="GHB-1",
             auxiliary=["CONCENTRATION", "DENSITY"],
             bhead=bheadspd,
-            cond=condspd,
-            aux=auxspd,
+            cond=ghbcondspd,
+            aux=ghbauxspd,
         )
     else:
         ghb1 = flopy.mf6.ModflowGwfghb(

make/makedefaults

@@ -57,11 +57,11 @@ OPTLEVEL ?= -O2
 # set the fortran flags
 ifeq ($(detected_OS), Windows)
 	ifeq ($(FC), gfortran)
-		FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2018 -cpp
+		FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
 	endif
 else
 	ifeq ($(FC), gfortran)
-		FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2018 -cpp
+		FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
 	endif
 	ifeq ($(FC), $(filter $(FC), ifort mpiifort))
 		FFLAGS ?= -no-heap-arrays -fpe0 -traceback -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp

src/Model/ModelUtilities/BoundaryPackageExt.f90

@@ -201,6 +201,10 @@ subroutine bndext_da(this)
     call mem_setptr(this%auxvar, 'AUXVAR', this%memoryPath)
     !
     ! -- scalars
+    deallocate (this%readarraygrid)
+    deallocate (this%readarraylayer)
+    nullify (this%readarraygrid)
+    nullify (this%readarraylayer)
     nullify (this%iper)
     !
     ! -- deallocate

utils/zonebudget/make/makedefaults

@@ -57,11 +57,11 @@ OPTLEVEL ?= -O2
 # set the fortran flags
 ifeq ($(detected_OS), Windows)
 	ifeq ($(FC), gfortran)
-		FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2018 -cpp
+		FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
 	endif
 else
 	ifeq ($(FC), gfortran)
-		FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2018 -cpp
+		FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
 	endif
 	ifeq ($(FC), $(filter $(FC), ifort mpiifort))
 		FFLAGS ?= -no-heap-arrays -fpe0 -traceback -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp