Skip to content
This repository has been archived by the owner on Oct 23, 2020. It is now read-only.

Commit

Permalink
Cleans up unneeded code
Browse files Browse the repository at this point in the history
  • Loading branch information
@vanroekel
vanroekel committed Apr 15, 2017
1 parent 1e94188 commit 74f8f66
Showing 1 changed file with 0 additions and 72 deletions.
72 changes: 0 additions & 72 deletions src/core_ocean/analysis_members/mpas_ocn_layer_volume_weighted_averages.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ subroutine ocn_init_layer_volume_weighted_averages(domain, err)!{{{
call mpas_pool_get_subpool(domain % blocklist % structs, 'layerVolumeWeightedAverageAM', layerVolumeWeightedAverageAMPool)

call mpas_pool_get_array(layerVolumeWeightedAverageAMPool, 'layerVolumeMask', layerVolumeMask)
print *, '88234'
call mpas_pool_get_dimension(domain % blocklist % dimensions, 'nOceanRegionsTmp', nOceanRegionsTmp)
call mpas_pool_get_dimension(domain % blocklist % dimensions, 'nLayerVolWeightedAvgFields', nLayerVolWeightedAvgFields)
call mpas_pool_get_dimension(domain % blocklist % dimensions, 'nVertLevels', nVertLevels)
Expand Down Expand Up @@ -147,26 +146,21 @@ subroutine compute_mask(nVertLevels, maxLevelCell, nCells, nCellsSolve, nOceanRe

dtr = 4.0_RKIND*atan(1.0_RKIND) / 180.0_RKIND
workMask(:,:,:) = 0.0_RKIND
write(stderrUnit,*), 'blah1123213123123'
do iCell=1,nCellsSolve
do iLevel=1,nVertLevels
if(iLevel.le.maxLevelCell(iCell)) workMask(iCell,:,iLevel) = 1.0_RKIND
enddo
enddo

write(stderrUnit,*), 'blah1'

! Arctic
do iCell=1,nCellsSolve
if(latCell(iCell).lt. 60.0_RKIND*dtr) workMask(iCell,1,:) = 0.0_RKIND
enddo
write(stderrUnit,*), 'blah2'
! Equatorial
do iCell=1,nCellsSolve
if(latCell(iCell).gt. 15.0_RKIND*dtr) workMask(iCell,2,:) = 0.0_RKIND
if(latCell(iCell).lt.-15.0_RKIND*dtr) workMask(iCell,2,:) = 0.0_RKIND
enddo
write(stderrUnit,*), 'blah3'
! Southern Ocean
do iCell=1,nCellsSolve
if(latCell(iCell).gt.-50.0_RKIND*dtr) workMask(iCell,3,:) = 0.0_RKIND
Expand All @@ -179,15 +173,13 @@ subroutine compute_mask(nVertLevels, maxLevelCell, nCells, nCellsSolve, nOceanRe
if(lonCell(iCell).gt.270.0_RKIND*dtr) workMask(iCell,4,:) = 0.0_RKIND
enddo
! Nino 4
write(stderrUnit,*), 'blah4'
do iCell=1,nCellsSolve
if(latCell(iCell).gt. 5.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
if(latCell(iCell).lt. -5.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
if(lonCell(iCell).lt.160.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
if(lonCell(iCell).gt.210.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
enddo
! Nino 3.4
write(stderrUnit,*), 'blah5'
do iCell=1,nCellsSolve
if(latCell(iCell).gt. 5.0_RKIND*dtr) workMask(iCell,6,:) = 0.0_RKIND
if(latCell(iCell).lt. -5.0_RKIND*dtr) workMask(iCell,6,:) = 0.0_RKIND
Expand Down Expand Up @@ -409,12 +401,8 @@ subroutine ocn_compute_layer_volume_weighted_averages(domain, timeLevel, err)!{{
! loop over the vertical
do iLevel=1,nVertLevels

! compute mask
! call compute_mask(iLevel, maxLevelCell, nCells, nCellsSolve, iRegion, lonCell, latCell, workMask)

! copy data into work array
workArray( :,:) = 0.0_RKIND
! workArray( 1,:) = workMask(:)
workArray( 2,:) = areaCell(:)
workArray( 3,:) = layerThickness(iLevel,:)
workArray( 4,:) = density(iLevel,:)
Expand Down Expand Up @@ -530,66 +518,6 @@ subroutine ocn_compute_layer_volume_weighted_averages(domain, timeLevel, err)!{{

contains

subroutine compute_mask(nVertLevels, maxLevelCell, nCells, nCellsSolve, nOceanRegionsTmp, &
lonCell, latCell, workMask)
! this subroutines produces a 0/1 mask that is multiplied with workArray to
! allow for min/max/avg to represent specific regions of the ocean domain
!
! NOTE: computes_mask is temporary. workMask should be intent(in) to this entire module !
!
integer, intent(in) :: nVertLevels, nCells, nCellsSolve, nOceanRegionsTmp
integer, intent(in), dimension(:) :: maxLevelCell
real(kind=RKIND), dimension(:), intent(in) :: lonCell, latCell
real(kind=RKIND), dimension(:,:,:), intent(out) :: workMask
integer :: iCell, iLevel, iRegion
real(kind=RKIND) :: dtr

dtr = 4.0_RKIND*atan(1.0_RKIND) / 180.0_RKIND
workMask(:,:,:) = 0.0_RKIND
do iCell=1,nCellsSolve
do iLevel=1,nVertLevels
if(iLevel.le.maxLevelCell(iCell)) workMask(iCell,:,iLevel) = 1.0_RKIND
enddo
enddo

! Arctic
do iCell=1,nCellsSolve
if(latCell(iCell).lt. 60.0_RKIND*dtr) workMask(iCell,1,:) = 0.0_RKIND
enddo
! Equatorial
do iCell=1,nCellsSolve
if(latCell(iCell).gt. 15.0_RKIND*dtr) workMask(iCell,2,:) = 0.0_RKIND
if(latCell(iCell).lt.-15.0_RKIND*dtr) workMask(iCell,2,:) = 0.0_RKIND
enddo
! Southern Ocean
do iCell=1,nCellsSolve
if(latCell(iCell).gt.-50.0_RKIND*dtr) workMask(iCell,3,:) = 0.0_RKIND
enddo
! Nino 3
do iCell=1,nCellsSolve
if(latCell(iCell).gt. 5.0_RKIND*dtr) workMask(iCell,4,:) = 0.0_RKIND
if(latCell(iCell).lt. -5.0_RKIND*dtr) workMask(iCell,4,:) = 0.0_RKIND
if(lonCell(iCell).lt.210.0_RKIND*dtr) workMask(iCell,4,:) = 0.0_RKIND
if(lonCell(iCell).gt.270.0_RKIND*dtr) workMask(iCell,4,:) = 0.0_RKIND
enddo
! Nino 4
do iCell=1,nCellsSolve
if(latCell(iCell).gt. 5.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
if(latCell(iCell).lt. -5.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
if(lonCell(iCell).lt.160.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
if(lonCell(iCell).gt.210.0_RKIND*dtr) workMask(iCell,5,:) = 0.0_RKIND
enddo
! Nino 3.4
do iCell=1,nCellsSolve
if(latCell(iCell).gt. 5.0_RKIND*dtr) workMask(iCell,6,:) = 0.0_RKIND
if(latCell(iCell).lt. -5.0_RKIND*dtr) workMask(iCell,6,:) = 0.0_RKIND
if(lonCell(iCell).lt.190.0_RKIND*dtr) workMask(iCell,6,:) = 0.0_RKIND
if(lonCell(iCell).gt.240.0_RKIND*dtr) workMask(iCell,6,:) = 0.0_RKIND
enddo

end subroutine compute_mask


subroutine compute_statistics(nDefinedDataFields, nOceanRegionsTmp, nCellsSolve, workArray, workMask, workMin, workMax, workSum)
! this subroutines does the actual summing, min, max, masking ect
! this hides the messy code from the high-level subroutine
Expand Down

0 comments on commit 74f8f66

Please sign in to comment.