meson swr (#14)

Author: skfogg

src/Model/GroundWaterEnergy/gwe-swr.f90

@@ -6,7 +6,7 @@
 !! can be invoked from the NPF package.  Once this package is completed in its
 !! prototyped form, it will likely be moved around.
 !<
-
+    
 module ShortwaveModule
   use ConstantsModule, only: LINELENGTH, LENMEMPATH, DZERO, LENVARNAME
   use KindModule, only: I4B, DP
@@ -26,23 +26,23 @@ module ShortwaveModule
   character(len=16) :: text = '          SWR'
 
   type, extends(PbstBaseType) :: SwrType
-
+      
     real(DP), dimension(:), pointer, contiguous :: solr => null() !< solar radiation
     real(DP), dimension(:), pointer, contiguous :: shd => null() !< shade fraction
     real(DP), dimension(:), pointer, contiguous :: swrefl => null() !< shortwave reflectance of water surface
-
+      
   contains
-
+  
     procedure :: da => swr_da
     procedure :: read_option => swr_read_option
     !procedure :: pbst_options => swr_options
     procedure :: subpck_set_stressperiod => swr_set_stressperiod
     procedure :: pbst_allocate_arrays => swr_allocate_arrays
     !procedure, private :: swr_allocate_scalars
     procedure, public :: swr_cq
-
+  
   end type SwrType
-
+  
 contains
 
   !> @brief Create a new SwrType object
@@ -65,28 +65,28 @@ subroutine swr_cr(swr, name_model, inunit, iout, ncv)
     ! -- allocate scalars
     !call swr%swr_allocate_scalars()
   end subroutine swr_cr
-
+  
   !> @brief Allocate scalars specific to the streamflow energy transport (SFE)
   !! package.
   !! NO SCALARS IN THIS YET
   !<
   !subroutine swr_allocate_scalars(this)
-  ! -- modules
-  !use MemoryManagerModule, only: mem_allocate
-  ! -- dummy
-  !class(SwrType) :: this
-  !
-  ! -- allocate
-  !call mem_allocate(this%solr, 'SOLR', this%memoryPath)
-  !call mem_allocate(this%shd, 'SHD', this%memoryPath)
-  !call mem_allocate(this%swrefl, 'SWREFL', this%memoryPath)
-  !
-  ! -- initialize to default values
-  !this%solr = 600 ! W/m3
-  !this%shd = 0.25 ! dimensionless fraction
-  !this%swrefl = 0.03 ! dimensionless fraction
+    ! -- modules
+    !use MemoryManagerModule, only: mem_allocate
+    ! -- dummy
+    !class(SwrType) :: this
+    !
+    ! -- allocate
+    !call mem_allocate(this%solr, 'SOLR', this%memoryPath)
+    !call mem_allocate(this%shd, 'SHD', this%memoryPath)
+    !call mem_allocate(this%swrefl, 'SWREFL', this%memoryPath)
+    !
+    ! -- initialize to default values
+    !this%solr = 600 ! W/m3
+    !this%shd = 0.25 ! dimensionless fraction
+    !this%swrefl = 0.03 ! dimensionless fraction
   !end subroutine swr_allocate_scalars
-
+  
   !> @brief Allocate arrays specific to the sensible heat flux (SWR) package
   !<
   subroutine swr_allocate_arrays(this)
@@ -109,18 +109,18 @@ subroutine swr_allocate_arrays(this)
       this%swrefl(n) = DZERO
     end do
   end subroutine
-
+  
   !> @brief Set options specific to the SwrType
   !!
   ! NOT USED RIGHT NOW BECAUSE NO CONSTANTS
   !! This routine overrides PbstBaseType%bnd_options
   !<
   !subroutine swr_options(this, option, found)
-  ! -- dummy
+    ! -- dummy
   !  class(SwrType), intent(inout) :: this
   !  character(len=*), intent(inout) :: option
   !  logical, intent(inout) :: found
-  !
+    !
   !  found = .true.
   !  select case (option)
   !  case ('DENSITY_AIR')
@@ -161,7 +161,7 @@ subroutine swr_allocate_arrays(this)
   !    call store_error(errmsg)
   !    call this%parser%StoreErrorUnit()
   !  end select
-  ! end subroutine swr_options
+ ! end subroutine swr_options
 
   !> @brief Calculate Shortwave Radiation Heat Flux
   !!
@@ -177,9 +177,9 @@ subroutine swr_cq(this, ifno, swrflx)
     !real(DP) :: swr_const
     !
     ! -- calculate shortwave radiation heat flux (version: user input of sol rad data)
-    swrflx = (1 - this%shd(ifno)) * (1 - this%swrefl(ifno)) * this%solr(ifno)
+    swrflx = (1-this%shd(ifno)) * (1-this%swrefl(ifno)) * this%solr(ifno)
   end subroutine swr_cq
-
+  
   !> @brief Deallocate package memory
   !!
   !! Deallocate TVK package scalars and arrays.
@@ -203,7 +203,7 @@ subroutine swr_da(this)
     ! -- Deallocate parent
     call pbstbase_da(this)
   end subroutine swr_da
-
+  
   !> @brief Read a SWR-specific option from the OPTIONS block
   !!
   !! Process a single SWR-specific option. Used when reading the OPTIONS block
@@ -219,7 +219,7 @@ function swr_read_option(this, keyword) result(success)
     ! -- There are no SWR-specific options, so just return false
     success = .false.
   end function swr_read_option
-
+  
   !> @brief Set the stress period attributes based on the keyword
   !<
   subroutine swr_set_stressperiod(this, itemno, keyword, found)
@@ -274,7 +274,7 @@ subroutine swr_set_stressperiod(this, itemno, keyword, found)
       bndElem => this%solr(itemno)
       call read_value_or_time_series_adv(text, itemno, jj, bndElem, &
                                          this%packName, 'BND', this%tsManager, &
-                                         this%iprpak, 'SOLR')
+                                         this%iprpak, 'SOLR') 
     case default
       !
       ! -- Keyword not recognized so return to caller with found = .false.
@@ -283,5 +283,5 @@ subroutine swr_set_stressperiod(this, itemno, keyword, found)
     !
 999 continue
   end subroutine swr_set_stressperiod
-
-end module ShortwaveModule
+  
+end module ShortwaveModule

src/meson.build

@@ -173,6 +173,7 @@ modflow_sources = files(
     'Model' / 'GroundWaterEnergy' / 'gwe-mwe.f90',
     'Model' / 'GroundWaterEnergy' / 'gwe-sfe.f90',
     'Model' / 'GroundWaterEnergy' / 'gwe-shf.f90',
+	'Model' / 'GroundWaterEnergy' / 'gwe-swr.f90',
     'Model' / 'GroundWaterEnergy' / 'gwe-uze.f90',
     'Model' / 'GroundWaterEnergy' / 'PbstBase.f90',
     'Model' / 'GroundWaterFlow' / 'gwf.f90',