Some clean-up that was missing after the removal of the tspLabels class

MODFLOW-USGS · Nov 7, 2023 · f3e87f0 · f3e87f0
1 parent 3efca8c
commit f3e87f0
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 12 deletions.
diff --git a/src/Model/GroundWaterTransport/gwt1.f90 b/src/Model/GroundWaterTransport/gwt1.f90
@@ -793,16 +793,20 @@ subroutine package_create(this, filtyp, ipakid, ipaknum, pakname, mempath, &
       call src_create(packobj, ipakid, ipaknum, inunit, iout, this%name, pakname)
     case ('LKT6')
       call lkt_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
-                      pakname, this%fmi, this%eqnsclfac)
+                      pakname, this%fmi, this%eqnsclfac, this%depvartype, &
+                      this%depvarunit, this%depvarunitabbrev)
     case ('SFT6')
       call sft_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
-                      pakname, this%fmi, this%eqnsclfac)
+                      pakname, this%fmi, this%eqnsclfac, this%depvartype, &
+                      this%depvarunit, this%depvarunitabbrev)
     case ('MWT6')
       call mwt_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
-                      pakname, this%fmi, this%eqnsclfac)
+                      pakname, this%fmi, this%eqnsclfac, this%depvartype, &
+                      this%depvarunit, this%depvarunitabbrev)
     case ('UZT6')
       call uzt_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
-                      pakname, this%fmi, this%eqnsclfac)
+                      pakname, this%fmi, this%eqnsclfac, this%depvartype, &
+                      this%depvarunit, this%depvarunitabbrev)
     case ('IST6')
       call ist_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
                       pakname, this%fmi, this%mst)

diff --git a/src/Model/GroundWaterTransport/gwt1lkt1.f90 b/src/Model/GroundWaterTransport/gwt1lkt1.f90
@@ -34,7 +34,7 @@
 module GwtLktModule
 
   use KindModule, only: DP, I4B
-  use ConstantsModule, only: DZERO, DONE, LINELENGTH
+  use ConstantsModule, only: DZERO, DONE, LINELENGTH, LENVARNAME
   use SimModule, only: store_error
   use BndModule, only: BndType, GetBndFromList
   use TspFmiModule, only: TspFmiType
@@ -95,7 +95,7 @@ module GwtLktModule
   !> @brief Create a new lkt package
   !<
   subroutine lkt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
-                        fmi, eqnsclfac)
+                        fmi, eqnsclfac, dvt, dvu, dvua)
     ! -- dummy
     class(BndType), pointer :: packobj
     integer(I4B), intent(in) :: id
@@ -106,6 +106,9 @@ subroutine lkt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     character(len=*), intent(in) :: pakname
     type(TspFmiType), pointer :: fmi
     real(DP), intent(in), pointer :: eqnsclfac !< governing equation scale factor
+    character(len=LENVARNAME), intent(in) :: dvt !< For GWT, set to "CONCENTRATION" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvu !< For GWT, set to "mass" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvua !< For GWT, set to "M" in TspAptType
     ! -- local
     type(GwtLktType), pointer :: lktobj
     !
@@ -138,6 +141,11 @@ subroutine lkt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     ! -- Store pointer to governing equation scale factor
     lktobj%eqnsclfac => eqnsclfac
     !
+    ! -- Set labels that will be used in generalized APT class
+    lktobj%depvartype = dvt
+    lktobj%depvarunit = dvu
+    lktobj%depvarunitabbrev = dvua
+    !
     ! -- Return
     return
   end subroutine lkt_create

diff --git a/src/Model/GroundWaterTransport/gwt1mwt1.f90 b/src/Model/GroundWaterTransport/gwt1mwt1.f90
@@ -35,7 +35,7 @@
 module GwtMwtModule
 
   use KindModule, only: DP, I4B
-  use ConstantsModule, only: DZERO, LINELENGTH
+  use ConstantsModule, only: DZERO, LINELENGTH, LENVARNAME
   use SimModule, only: store_error
   use BndModule, only: BndType, GetBndFromList
   use TspFmiModule, only: TspFmiType
@@ -88,7 +88,7 @@ module GwtMwtModule
   !> Create new MWT package
   !<
   subroutine mwt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
-                        fmi, eqnsclfac)
+                        fmi, eqnsclfac, dvt, dvu, dvua)
     ! -- dummy
     class(BndType), pointer :: packobj
     integer(I4B), intent(in) :: id
@@ -99,6 +99,9 @@ subroutine mwt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     character(len=*), intent(in) :: pakname
     type(TspFmiType), pointer :: fmi
     real(DP), intent(in), pointer :: eqnsclfac !< governing equation scale factor
+    character(len=LENVARNAME), intent(in) :: dvt !< For GWT, set to "CONCENTRATION" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvu !< For GWT, set to "mass" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvua !< For GWT, set to "M" in TspAptType
     ! -- local
     type(GwtMwtType), pointer :: mwtobj
     !
@@ -131,6 +134,11 @@ subroutine mwt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     ! -- Store pointer to governing equation scale factor
     mwtobj%eqnsclfac => eqnsclfac
     !
+    ! -- Set labels that will be used in generalized APT class
+    mwtobj%depvartype = dvt
+    mwtobj%depvarunit = dvu
+    mwtobj%depvarunitabbrev = dvua
+    !
     ! -- Return
     return
   end subroutine mwt_create

diff --git a/src/Model/GroundWaterTransport/gwt1sft1.f90 b/src/Model/GroundWaterTransport/gwt1sft1.f90
@@ -33,7 +33,7 @@
 module GwtSftModule
 
   use KindModule, only: DP, I4B
-  use ConstantsModule, only: DZERO, DONE, LINELENGTH
+  use ConstantsModule, only: DZERO, DONE, LINELENGTH, LENVARNAME
   use SimModule, only: store_error
   use BndModule, only: BndType, GetBndFromList
   use TspFmiModule, only: TspFmiType
@@ -92,7 +92,7 @@ module GwtSftModule
   !> @brief Create a new sft package
   !<
   subroutine sft_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
-                        fmi, eqnsclfac)
+                        fmi, eqnsclfac, dvt, dvu, dvua)
     ! -- dummy
     class(BndType), pointer :: packobj
     integer(I4B), intent(in) :: id
@@ -103,6 +103,9 @@ subroutine sft_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     character(len=*), intent(in) :: pakname
     type(TspFmiType), pointer :: fmi
     real(DP), intent(in), pointer :: eqnsclfac !< governing equation scale factor
+    character(len=LENVARNAME), intent(in) :: dvt !< For GWT, set to "CONCENTRATION" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvu !< For GWT, set to "mass" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvua !< For GWT, set to "M" in TspAptType
     ! -- local
     type(GwtSftType), pointer :: sftobj
     !
@@ -135,6 +138,11 @@ subroutine sft_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     ! -- Store pointer to governing equation scale factor
     sftobj%eqnsclfac => eqnsclfac
     !
+    ! -- Set labels that will be used in generalized APT class
+    sftobj%depvartype = dvt
+    sftobj%depvarunit = dvu
+    sftobj%depvarunitabbrev = dvua
+    !
     ! -- Return
     return
   end subroutine sft_create

diff --git a/src/Model/GroundWaterTransport/gwt1uzt1.f90 b/src/Model/GroundWaterTransport/gwt1uzt1.f90
@@ -27,7 +27,7 @@
 module GwtUztModule
 
   use KindModule, only: DP, I4B
-  use ConstantsModule, only: DZERO, DONE, LINELENGTH
+  use ConstantsModule, only: DZERO, DONE, LINELENGTH, LENVARNAME
   use SimModule, only: store_error
   use BndModule, only: BndType, GetBndFromList
   use TspFmiModule, only: TspFmiType
@@ -80,7 +80,7 @@ module GwtUztModule
   !> @brief Create a new UZT package
   !<
   subroutine uzt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
-                        fmi, eqnsclfac)
+                        fmi, eqnsclfac, dvt, dvu, dvua)
     ! -- dummy
     class(BndType), pointer :: packobj
     integer(I4B), intent(in) :: id
@@ -91,6 +91,9 @@ subroutine uzt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     character(len=*), intent(in) :: pakname
     type(TspFmiType), pointer :: fmi
     real(DP), intent(in), pointer :: eqnsclfac !< governing equation scale factor
+    character(len=LENVARNAME), intent(in) :: dvt !< For GWT, set to "CONCENTRATION" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvu !< For GWT, set to "mass" in TspAptType
+    character(len=LENVARNAME), intent(in) :: dvua !< For GWT, set to "M" in TspAptType
     ! -- local
     type(GwtUztType), pointer :: uztobj
     !
@@ -123,6 +126,11 @@ subroutine uzt_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
     ! -- Store pointer to governing equation scale factor
     uztobj%eqnsclfac => eqnsclfac
     !
+    ! -- Set labels that will be used in generalized APT class
+    uztobj%depvartype = dvt
+    uztobj%depvarunit = dvu
+    uztobj%depvarunitabbrev = dvua
+    !
     ! -- Return
     return
   end subroutine uzt_create