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

…GS#1400)

make/makefile

@@ -194,6 +194,7 @@ $(OBJDIR)/SimStages.o \
 $(OBJDIR)/NumericalModel.o \
 $(OBJDIR)/FlowModelInterface.o \
 $(OBJDIR)/OutputControlData.o \
+$(OBJDIR)/gwf3ic8.o \
 $(OBJDIR)/Xt3dAlgorithm.o \
 $(OBJDIR)/gwf3tvbase8.o \
 $(OBJDIR)/gwf3sfr8.o \
@@ -210,7 +211,7 @@ $(OBJDIR)/BaseExchange.o \
 $(OBJDIR)/tsp1fmi1.o \
 $(OBJDIR)/GwtSpc.o \
 $(OBJDIR)/OutputControl.o \
-$(OBJDIR)/gwf3ic8.o \
+$(OBJDIR)/tsp1ic1.o \
 $(OBJDIR)/TspAdvOptions.o \
 $(OBJDIR)/UzfCellGroup.o \
 $(OBJDIR)/Xt3dInterface.o \
@@ -225,8 +226,8 @@ $(OBJDIR)/CellWithNbrs.o \
 $(OBJDIR)/NumericalExchange.o \
 $(OBJDIR)/tsp1ssm1.o \
 $(OBJDIR)/tsp1oc1.o \
+$(OBJDIR)/tsp1obs1.o \
 $(OBJDIR)/tsp1mvt1.o \
-$(OBJDIR)/tsp1ic1.o \
 $(OBJDIR)/tsp1adv1.o \
 $(OBJDIR)/gwf3disv8.o \
 $(OBJDIR)/gwf3disu8.o \
@@ -254,7 +255,6 @@ $(OBJDIR)/tsp1.o \
 $(OBJDIR)/gwt1uzt1.o \
 $(OBJDIR)/gwt1src1.o \
 $(OBJDIR)/gwt1sft1.o \
-$(OBJDIR)/gwt1obs1.o \
 $(OBJDIR)/gwt1mwt1.o \
 $(OBJDIR)/gwt1lkt1.o \
 $(OBJDIR)/gwt1ist1.o \

msvs/mf6core.vfproj

@@ -175,7 +175,6 @@
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1lkt1.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1mst1.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1mwt1.f90"/>
-		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1obs1.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1sft1.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1src1.f90"/>
 		<File RelativePath="..\src\Model\GroundWaterTransport\gwt1uzt1.f90"/></Filter>
@@ -207,6 +206,7 @@
 		<File RelativePath="..\src\Model\TransportModel\tsp1fmi1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1ic1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1mvt1.f90"/>
+		<File RelativePath="..\src\Model\TransportModel\tsp1obs1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1oc1.f90"/>
 		<File RelativePath="..\src\Model\TransportModel\tsp1ssm1.f90"/></Filter>
 		<File RelativePath="..\src\Model\BaseModel.f90"/>

src/Model/Connection/GwtInterfaceModel.f90

@@ -12,7 +12,7 @@ module GwtInterfaceModelModule
   use GwtDspModule, only: dsp_cr, GwtDspType
   use GwtDspOptionsModule, only: GwtDspOptionsType
   use GwtMstModule, only: mst_cr
-  use GwtObsModule, only: gwt_obs_cr
+  use TspObsModule, only: tsp_obs_cr
   use GridConnectionModule
 
   implicit none
@@ -87,7 +87,7 @@ subroutine gwtifmod_cr(this, name, iout, gridConn)
     call adv_cr(this%adv, this%name, adv_unit, this%iout, this%fmi, &
                 this%ieqnsclfac)
     call dsp_cr(this%dsp, this%name, '', -dsp_unit, this%iout, this%fmi)
-    call gwt_obs_cr(this%obs, inobs)
+    call tsp_obs_cr(this%obs, inobs)
 
   end subroutine gwtifmod_cr