Skip to content

Commit

Permalink
refactor(tsp): Elevate APT to generalized transport class (#1428)
Browse files Browse the repository at this point in the history
* 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:
#1428 (comment)
#1428 (comment)
#1428 (comment)
  • Loading branch information
emorway-usgs authored Nov 9, 2023
1 parent a8d4894 commit f04ab0e
Show file tree
Hide file tree
Showing 9 changed files with 911 additions and 1,219 deletions.
2 changes: 1 addition & 1 deletion make/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion msvs/mf6core.vfproj
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down
12 changes: 8 additions & 4 deletions src/Model/GroundWaterTransport/gwt1.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit f04ab0e

Please sign in to comment.