From 8594698950823bfdb481c66961ef64e13f96376b Mon Sep 17 00:00:00 2001 From: mjreno Date: Wed, 6 Dec 2023 08:08:05 -0500 Subject: [PATCH 1/2] base stress packages should not allocate bound 2d array --- src/Model/GroundWaterFlow/gwf3chd8.f90 | 2 -- src/Model/GroundWaterFlow/gwf3drn8.f90 | 2 -- src/Model/GroundWaterFlow/gwf3evt8.f90 | 2 -- src/Model/GroundWaterFlow/gwf3ghb8.f90 | 2 -- src/Model/GroundWaterFlow/gwf3rch8.f90 | 2 -- src/Model/GroundWaterFlow/gwf3riv8.f90 | 2 -- src/Model/GroundWaterFlow/gwf3wel8.f90 | 2 -- 7 files changed, 14 deletions(-) diff --git a/src/Model/GroundWaterFlow/gwf3chd8.f90 b/src/Model/GroundWaterFlow/gwf3chd8.f90 index 73ea6390a61..dd40cd3fab1 100644 --- a/src/Model/GroundWaterFlow/gwf3chd8.f90 +++ b/src/Model/GroundWaterFlow/gwf3chd8.f90 @@ -82,8 +82,6 @@ subroutine chd_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 1 - packobj%iscloc = 1 packobj%ictMemPath = create_mem_path(namemodel, 'NPF') ! ! -- Return diff --git a/src/Model/GroundWaterFlow/gwf3drn8.f90 b/src/Model/GroundWaterFlow/gwf3drn8.f90 index afe58158f47..64a7f1240d3 100644 --- a/src/Model/GroundWaterFlow/gwf3drn8.f90 +++ b/src/Model/GroundWaterFlow/gwf3drn8.f90 @@ -88,8 +88,6 @@ subroutine drn_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 2 ! drnelev, conductance - packobj%iscloc = 2 !sfac applies to conductance packobj%ictMemPath = create_mem_path(namemodel, 'NPF') ! ! -- Return diff --git a/src/Model/GroundWaterFlow/gwf3evt8.f90 b/src/Model/GroundWaterFlow/gwf3evt8.f90 index 54e39301aaf..7befb1e6c21 100644 --- a/src/Model/GroundWaterFlow/gwf3evt8.f90 +++ b/src/Model/GroundWaterFlow/gwf3evt8.f90 @@ -97,8 +97,6 @@ subroutine evt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 3 ! Assumes NSEG = 1 and SURF_RATE_SPECIFIED=False - packobj%iscloc = 2 ! sfac applies to max. ET rate packobj%ictMemPath = create_mem_path(namemodel, 'NPF') ! ! -- Return diff --git a/src/Model/GroundWaterFlow/gwf3ghb8.f90 b/src/Model/GroundWaterFlow/gwf3ghb8.f90 index 2942493b795..f4f4cc3dda2 100644 --- a/src/Model/GroundWaterFlow/gwf3ghb8.f90 +++ b/src/Model/GroundWaterFlow/gwf3ghb8.f90 @@ -75,8 +75,6 @@ subroutine ghb_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 2 - packobj%iscloc = 2 packobj%ictMemPath = create_mem_path(namemodel, 'NPF') ! ! -- Return diff --git a/src/Model/GroundWaterFlow/gwf3rch8.f90 b/src/Model/GroundWaterFlow/gwf3rch8.f90 index 38d83efbfbd..40920754da9 100644 --- a/src/Model/GroundWaterFlow/gwf3rch8.f90 +++ b/src/Model/GroundWaterFlow/gwf3rch8.f90 @@ -90,8 +90,6 @@ subroutine rch_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 1 - packobj%iscloc = 1 ! sfac applies to recharge rate packobj%ictMemPath = create_mem_path(namemodel, 'NPF') ! ! -- Return diff --git a/src/Model/GroundWaterFlow/gwf3riv8.f90 b/src/Model/GroundWaterFlow/gwf3riv8.f90 index 62fcc2462ee..5822f72944f 100644 --- a/src/Model/GroundWaterFlow/gwf3riv8.f90 +++ b/src/Model/GroundWaterFlow/gwf3riv8.f90 @@ -78,8 +78,6 @@ subroutine riv_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 3 ! stage, conductance, rbot - packobj%iscloc = 2 !sfac applies to conductance packobj%ictMemPath = create_mem_path(namemodel, 'NPF') ! ! -- Return diff --git a/src/Model/GroundWaterFlow/gwf3wel8.f90 b/src/Model/GroundWaterFlow/gwf3wel8.f90 index b92c71f447b..9bc5281412f 100644 --- a/src/Model/GroundWaterFlow/gwf3wel8.f90 +++ b/src/Model/GroundWaterFlow/gwf3wel8.f90 @@ -102,8 +102,6 @@ subroutine wel_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 1 - packobj%iscloc = 1 packobj%ictMemPath = create_mem_path(namemodel, 'NPF') ! ! -- return From df9af82115d89c3582f4c2f16d363ec5cb71a7d0 Mon Sep 17 00:00:00 2001 From: mjreno Date: Fri, 8 Dec 2023 11:00:05 -0500 Subject: [PATCH 2/2] additional ncolbnd cleanup in EVT and CNC --- src/Model/GroundWaterFlow/gwf3evt8.f90 | 11 ----------- src/Model/GroundWaterTransport/gwt1cnc1.f90 | 2 -- 2 files changed, 13 deletions(-) diff --git a/src/Model/GroundWaterFlow/gwf3evt8.f90 b/src/Model/GroundWaterFlow/gwf3evt8.f90 index 7befb1e6c21..66ce0154798 100644 --- a/src/Model/GroundWaterFlow/gwf3evt8.f90 +++ b/src/Model/GroundWaterFlow/gwf3evt8.f90 @@ -346,18 +346,7 @@ subroutine evt_source_dimensions(this) call store_error(errmsg) call store_error_filename(this%input_fname) end if - ! -- Recalculate number of columns required in bound array. - if (this%surfratespecified) then - this%ncolbnd = 4 + 2 * (this%nseg - 1) - else - this%ncolbnd = 3 + 2 * (this%nseg - 1) - end if ! - elseif (this%nseg == 1) then - ! if surf_rate_specified is true, will still read petm0 - if (this%surfratespecified) then - this%ncolbnd = this%ncolbnd + 1 - end if end if end if ! diff --git a/src/Model/GroundWaterTransport/gwt1cnc1.f90 b/src/Model/GroundWaterTransport/gwt1cnc1.f90 index 71ea56c25fa..366a094c2a1 100644 --- a/src/Model/GroundWaterTransport/gwt1cnc1.f90 +++ b/src/Model/GroundWaterTransport/gwt1cnc1.f90 @@ -87,8 +87,6 @@ subroutine cnc_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, & packobj%iout = iout packobj%id = id packobj%ibcnum = ibcnum - packobj%ncolbnd = 1 - packobj%iscloc = 1 ! ! -- Store the appropriate label based on the dependent variable cncobj%depvartype = depvartype