From d8796b4dd9ee13cbc369ebf407b70fab86ffd711 Mon Sep 17 00:00:00 2001
From: Eric Morway <emorway@usgs.gov>
Date: Tue, 15 Aug 2023 15:37:14 -0700
Subject: [PATCH] addresses:
 https://github.com/MODFLOW-USGS/modflow6/pull/1306#discussion_r1272314552
 https://github.com/MODFLOW-USGS/modflow6/pull/1306#discussion_r1272310528

---
 src/Model/GroundWaterTransport/gwt1.f90 | 2 +-
 src/Model/TransportModel/tsp1apt1.f90   | 2 +-
 src/Model/TransportModel/tsp1cnc1.f90   | 7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Model/GroundWaterTransport/gwt1.f90 b/src/Model/GroundWaterTransport/gwt1.f90
index 65aa9b1c063..2741b8fd694 100644
--- a/src/Model/GroundWaterTransport/gwt1.f90
+++ b/src/Model/GroundWaterTransport/gwt1.f90
@@ -771,7 +771,7 @@ subroutine package_create(this, filtyp, ipakid, ipaknum, pakname, inunit, &
     select case (filtyp)
     case ('CNC6')
       call cnc_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
-                      pakname, this%eqnsclfac, dvt)
+                      pakname, dvt)
     case ('SRC6')
       call src_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
                       pakname, dvt)
diff --git a/src/Model/TransportModel/tsp1apt1.f90 b/src/Model/TransportModel/tsp1apt1.f90
index 07dec873f1b..4af6eae0137 100644
--- a/src/Model/TransportModel/tsp1apt1.f90
+++ b/src/Model/TransportModel/tsp1apt1.f90
@@ -2864,7 +2864,7 @@ subroutine apt_rp_obs(this)
               ' must be assigned to a feature with a unique boundname.'
             call store_error(errmsg)
           end if
-        case ('LKT', 'SFT', 'MWT', 'UZT', 'UZE', 'LKE', 'SFE')
+        case ('LKT', 'SFT', 'MWT', 'UZT', 'LKE', 'SFE', 'MWE', 'UZE')
           call this%rp_obs_budterm(obsrv, &
                                    this%flowbudptr%budterm(this%idxbudgwf))
         case ('FLOW-JA-FACE')
diff --git a/src/Model/TransportModel/tsp1cnc1.f90 b/src/Model/TransportModel/tsp1cnc1.f90
index bc77fc921a0..c0d45397a8b 100644
--- a/src/Model/TransportModel/tsp1cnc1.f90
+++ b/src/Model/TransportModel/tsp1cnc1.f90
@@ -25,7 +25,6 @@ module TspCncModule
 
     real(DP), dimension(:), pointer, contiguous :: ratecncin => null() !simulated flows into constant conc (excluding other concs)
     real(DP), dimension(:), pointer, contiguous :: ratecncout => null() !simulated flows out of constant conc (excluding to other concs)
-    real(DP), pointer :: eqnsclfac => null() !< governing equation scale factor; =1. for solute; =rhow*cpw for energy
     character(len=LENVARNAME) :: depvartype = '' !< stores string of dependent variable type, depending on model type
 
   contains
@@ -54,7 +53,7 @@ module TspCncModule
   !! Routine points packobj to the newly created package
   !<
   subroutine cnc_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
-                        eqnsclfac, depvartype, gwecommon)
+                        depvartype, gwecommon)
     ! -- dummy
     class(BndType), pointer :: packobj
     integer(I4B), intent(in) :: id
@@ -63,7 +62,6 @@ subroutine cnc_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     integer(I4B), intent(in) :: iout
     character(len=*), intent(in) :: namemodel
     character(len=*), intent(in) :: pakname
-    real(DP), intent(in), pointer :: eqnsclfac !< governing equation scale factor
     character(len=LENVARNAME), intent(in) :: depvartype
     type(GweInputDataType), intent(in), target, optional :: gwecommon !< shared data container for use by multiple GWE packages
     ! -- local
@@ -95,9 +93,6 @@ subroutine cnc_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     ! -- Store the appropriate label based on the dependent variable
     cncobj%depvartype = depvartype
     !
-    ! -- Give access to governing equation scale factor
-    cncobj%eqnsclfac => eqnsclfac
-    !
     ! -- Give package access to the shared heat transport variables assigned in MST
     if (present(gwecommon)) then
       cncobj%gwecommon => gwecommon