refactor(tsp): Elevate APT to generalized transport class (MODFLOW-US…

…GS#1428)

* refactor(tsp): Elevate APT to generalized transport class

* advanced packages need eqnsclfac parameter, updated docstrings in advanced transport packages

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

* changes in response to:
MODFLOW-USGS#1428 (comment)
MODFLOW-USGS#1428 (comment)
MODFLOW-USGS#1428 (comment)

make/makefile

@@ -236,7 +236,7 @@ $(OBJDIR)/gwf3disv8.o \
 $(OBJDIR)/gwf3disu8.o \
 $(OBJDIR)/gwf3dis8.o \
 $(OBJDIR)/gwf3uzf8.o \
-$(OBJDIR)/gwt1apt1.o \
+$(OBJDIR)/tsp1apt1.o \
 $(OBJDIR)/gwt1mst1.o \
 $(OBJDIR)/GwtDspOptions.o \
 $(OBJDIR)/gwf3npf8.o \

msvs/mf6core.vfproj

@@ -164,7 +164,6 @@
 		<File RelativePath="..\src\Model\GroundWaterFlow\gwf3wel8idm.f90"/></Filter>
 		<Filter Name="GroundWaterTransport">
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1.f90"/>
-		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1apt1.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1cnc1.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1cnc1idm.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1dis1idm.f90"/>
@@ -206,6 +205,7 @@
 		<Filter Name="TransportModel">
 		<File RelativePath="..\src\Model\TransportModel\tsp1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1adv1.f90"/>
+		<File RelativePath="..\src\Model\TransportModel\tsp1apt1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1fmi1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1ic1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1mvt1.f90"/>

src/Model/GroundWaterTransport/gwt1.f90

@@ -794,16 +794,20 @@ subroutine package_create(this, filtyp, ipakid, ipaknum, pakname, mempath, &
                       this%depvartype, pakname)
     case ('LKT6')
       call lkt_create(packobj, ipakid, ipaknum, inunit, iout, this%name, &
-                      pakname, this%fmi)
+                      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)
+                      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)
+                      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)
+                      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)