Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
emorway-usgs committed Sep 14, 2023
1 parent 2b07c0e commit 0865083
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 252 deletions.
228 changes: 0 additions & 228 deletions src/Model/ModelUtilities/GweInputData.f90

This file was deleted.

13 changes: 1 addition & 12 deletions src/Model/TransportModel/tsp1cnc1.f90
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ module TspCncModule
!
type, extends(BndType) :: TspCncType

type(GweInputDataType), pointer :: gwecommon => null() !< pointer to shared gwe data used by multiple packages but set in mst

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)
character(len=LENVARNAME) :: depvartype = '' !< stores string of dependent variable type, depending on model type
Expand Down Expand Up @@ -53,7 +51,7 @@ module TspCncModule
!! Routine points packobj to the newly created package
!<
subroutine cnc_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
depvartype, gwecommon)
depvartype)
! -- dummy
class(BndType), pointer :: packobj
integer(I4B), intent(in) :: id
Expand All @@ -63,7 +61,6 @@ subroutine cnc_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
character(len=*), intent(in) :: namemodel
character(len=*), intent(in) :: pakname
character(len=LENVARNAME), intent(in) :: depvartype
type(GweInputDataType), intent(in), target, optional :: gwecommon !< shared data container for use by multiple GWE packages
! -- local
type(TspCncType), pointer :: cncobj
! ------------------------------------------------------------------------------
Expand Down Expand Up @@ -93,11 +90,6 @@ subroutine cnc_create(packobj, id, ibcnum, inunit, iout, namemodel, pakname, &
! -- Store the appropriate label based on the dependent variable
cncobj%depvartype = depvartype
!
! -- Give package access to the shared heat transport variables assigned in MST
if (present(gwecommon)) then
cncobj%gwecommon => gwecommon
end if
!
! -- Return
return
end subroutine cnc_create
Expand Down Expand Up @@ -389,9 +381,6 @@ subroutine cnc_da(this)
call mem_deallocate(this%ratecncin)
call mem_deallocate(this%ratecncout)
!
! -- pointers
nullify (this%gwecommon)
!
! -- Return
return
end subroutine cnc_da
Expand Down
13 changes: 1 addition & 12 deletions src/Model/TransportModel/tsp1ssm1.f90
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ module TspSsmModule
!<
type, extends(NumericalPackageType) :: TspSsmType

type(GweInputDataType), pointer :: gwecommon => null() !< pointer to shared gwe data used by multiple packages but set in mst

integer(I4B), pointer :: nbound !< total number of flow boundaries in this time step
integer(I4B), dimension(:), pointer, contiguous :: isrctype => null() !< source type 0 is unspecified, 1 is aux, 2 is auxmixed, 3 is ssmi, 4 is ssmimixed
integer(I4B), dimension(:), pointer, contiguous :: iauxpak => null() !< aux col for concentration
Expand Down Expand Up @@ -84,7 +82,7 @@ module TspSsmModule
!! and initializing the parser.
!<
subroutine ssm_cr(ssmobj, name_model, inunit, iout, fmi, eqnsclfac, &
depvartype, gwecommon)
depvartype)
! -- dummy
type(TspSsmType), pointer :: ssmobj !< TspSsmType object
character(len=*), intent(in) :: name_model !< name of the model
Expand All @@ -93,7 +91,6 @@ subroutine ssm_cr(ssmobj, name_model, inunit, iout, fmi, eqnsclfac, &
type(TspFmiType), intent(in), target :: fmi !< Transport FMI package
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
!
! -- Create the object
allocate (ssmobj)
Expand All @@ -117,11 +114,6 @@ subroutine ssm_cr(ssmobj, name_model, inunit, iout, fmi, eqnsclfac, &
! package has access to the corresponding dependent variable type
ssmobj%depvartype = depvartype
!
! -- Give package access to the shared heat transport variables assigned in MST
if (present(gwecommon)) then
ssmobj%gwecommon => gwecommon
end if
!
! -- Return
return
end subroutine ssm_cr
Expand Down Expand Up @@ -728,9 +720,6 @@ subroutine ssm_da(this)
! -- Scalars
call mem_deallocate(this%nbound)
!
! -- Pointers
nullify (this%gwecommon)
!
! -- deallocate parent
call this%NumericalPackageType%da()
!
Expand Down

0 comments on commit 0865083

Please sign in to comment.