changes now through _rp() routine, _ad() up next

Author: emorway-usgs

src/Model/GroundWaterEnergy/PbstBase.f90

@@ -342,7 +342,6 @@ end subroutine subpck_set_stressperiod
 
   !> @brief Read the SHF-specific options from the OPTIONS block
   !<
-<<<<<<< HEAD
   !subroutine read_options(this)
   !  ! -- dummy
   !  class(PbstBaseType) :: this
@@ -407,73 +406,6 @@ end subroutine subpck_set_stressperiod
   !      'END OF '//trim(adjustl(this%packName))//' OPTIONS'
   !  end if
   !end subroutine read_options
-=======
-  subroutine read_options(this)
-    ! -- dummy
-    class(PbstBaseType) :: this
-    ! -- local
-    character(len=LINELENGTH) :: keyword
-    character(len=MAXCHARLEN) :: fname
-    logical :: isfound
-    logical :: endOfBlock
-    logical(LGP) :: found
-    integer(I4B) :: ierr
-    ! -- formats
-    character(len=*), parameter :: fmtts = &
-      &"(4x, 'TIME-SERIES DATA WILL BE READ FROM FILE: ', a)"
-    !
-    ! -- Get options block
-    call this%parser%GetBlock('OPTIONS', isfound, ierr, &
-                              blockRequired=.false., supportOpenClose=.true.)
-    !
-    ! -- Parse options block if detected
-    if (isfound) then
-      write (this%iout, '(1x,a)') &
-        'PROCESSING '//trim(adjustl(this%packName))//' OPTIONS'
-      do
-        call this%parser%GetNextLine(endOfBlock)
-        if (endOfBlock) then
-          exit
-        end if
-        call this%parser%GetStringCaps(keyword)
-        select case (keyword)
-        case ('PRINT_INPUT')
-          this%iprpak = 1
-          write (this%iout, '(4x,a)') 'TIME-VARYING INPUT WILL BE PRINTED.'
-        case ('TS6')
-          !
-          ! -- Add a time series file
-          call this%parser%GetStringCaps(keyword)
-          if (trim(adjustl(keyword)) /= 'FILEIN') then
-            errmsg = &
-              'TS6 keyword must be followed by "FILEIN" then by filename.'
-            call store_error(errmsg)
-            call this%parser%StoreErrorUnit()
-            call ustop()
-          end if
-          call this%parser%GetString(fname)
-          write (this%iout, fmtts) trim(fname)
-          call this%tsmanager%add_tsfile(fname, this%inunit)
-        case default
-          !
-          ! -- Check for child class options
-          call this%pbst_options(keyword, found)
-          !
-          ! -- Defer to subtype to read the option;
-          ! -- if the subtype can't handle it, report an error
-          if (.not. found) then
-            write (errmsg, '(a,3(1x,a),a)') &
-              'Unknown', trim(adjustl(this%packName)), "option '", &
-              trim(keyword), "'."
-            call store_error(errmsg)
-          end if
-        end select
-      end do
-      write (this%iout, '(1x,a)') &
-        'END OF '//trim(adjustl(this%packName))//' OPTIONS'
-    end if
-  end subroutine read_options
->>>>>>> 4baf8469ab (read shf options block; will need to circle back and test TS functionality later)
 
   !> @ brief Read additional options for sub-package
   !!

src/Model/GroundWaterEnergy/gwe-shf.f90

@@ -167,7 +167,6 @@ end function shf_get_pointer_to_value
   !!
   !! This routine overrides PbstBaseType%bnd_options
   !<
-<<<<<<< HEAD
   !subroutine shf_options(this, option, found)
   !  ! -- dummy
   !  class(ShfType), intent(inout) :: this
@@ -234,56 +233,6 @@ subroutine shf_cq(this, ifno, tstrm, shflx)
     shflx = shf_const * this%wspd(ifno) * (this%tatm(ifno) - tstrm)
   end subroutine shf_cq
 
-=======
-  subroutine shf_options(this, option, found)
-    ! -- dummy
-    class(ShfType), intent(inout) :: this
-    character(len=*), intent(inout) :: option
-    logical, intent(inout) :: found
-    !
-    found = .true.
-    select case (option)
-    case ('DENSITY_AIR')
-      this%rhoa = this%parser%GetDouble()
-      if (this%rhoa <= 0.0) then
-        write (errmsg, '(a)') 'Specified value for the density of &
-          &the atmosphere must be greater than 0.0.'
-        call store_error(errmsg)
-        call this%parser%StoreErrorUnit()
-      else
-        write (this%iout, '(4x,a,1pg15.6)') &
-          "The density of the atmosphere has been set to: ", this%rhoa
-      end if
-    case ('HEAT_CAPACITY_AIR')
-      this%cpa = this%parser%GetDouble()
-      if (this%cpa <= 0.0) then
-        write (errmsg, '(a)') 'Specified value for the heat capacity of &
-          &the atmosphere must be greater than 0.0.'
-        call store_error(errmsg)
-        call this%parser%StoreErrorUnit()
-      else
-        write (this%iout, '(4x,a,1pg15.6)') &
-          "The heat capacity of the atmosphere has been set to: ", this%cpa
-      end if
-    case ('DRAG_COEFFICIENT')
-      this%cd = this%parser%GetDouble()
-      if (this%cd <= 0.0) then
-        write (errmsg, '(a)') 'Specified value for the drag coefficient &
-          &must be greater than 0.0.'
-        call store_error(errmsg)
-        call this%parser%StoreErrorUnit()
-      else
-        write (this%iout, '(4x,a,1pg15.6)') &
-          "The heat capacity of the atmosphere has been set to: ", this%cpa
-      end if
-    case default
-      write (errmsg, '(a,a)') 'Unknown SHF option: ', trim(option)
-      call store_error(errmsg)
-      call this%parser%StoreErrorUnit()
-    end select
-  end subroutine shf_options
-  
->>>>>>> 4baf8469ab (read shf options block; will need to circle back and test TS functionality later)
   !> @brief Deallocate package memory
   !!
   !! Deallocate TVK package scalars and arrays.