Skip to content

Commit

Permalink
Merge branch 'refs/heads/Develop'
Browse files Browse the repository at this point in the history
guifranz committed Jun 7, 2017
2 parents 8342b96 + a61adf7 commit 83a938b
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions Software/MOHIDWater/ModuleSediment.F90
Original file line number Diff line number Diff line change
@@ -5335,31 +5335,27 @@ subroutine ComputeBedSlopeEffects
dhdy = 0.

if (SandClass%FluxU(i, j) < 0.) then
!if (Me%ExternalVar%ComputeFacesU2D(i, j) == Covered ) then
if (Me%ExternalVar%WaterPoints2D(i, j-1) == WaterPoint) then
if (Me%ExternalVar%ComputeFacesU2D(i, j) == Covered ) then

dhdx = (Me%ExternalVar%Bathymetry(i, j) - Me%ExternalVar%Bathymetry(i, j-1)) / &
Me%ExternalVar%DZX(i,j-1)
endif
else
!if (Me%ExternalVar%ComputeFacesU2D(i,j+1) == Covered) then
if (Me%ExternalVar%WaterPoints2D(i, j+1) == WaterPoint) then
if (Me%ExternalVar%ComputeFacesU2D(i,j+1) == Covered) then

dhdx = (Me%ExternalVar%Bathymetry(i, j+1) - Me%ExternalVar%Bathymetry(i, j)) / &
Me%ExternalVar%DZX(i,j)
endif
endif

if (SandClass%FluxV(i, j) < 0.) then
!if (Me%ExternalVar%ComputeFacesV2D(i, j) == Covered) then
if (Me%ExternalVar%WaterPoints2D(i-1, j) == WaterPoint) then
if (Me%ExternalVar%ComputeFacesV2D(i, j) == Covered) then

dhdy = (Me%ExternalVar%Bathymetry(i, j) - Me%ExternalVar%Bathymetry(i-1, j)) / &
Me%ExternalVar%DZY(i-1,j)
endif
else
!if (Me%ExternalVar%ComputeFacesV2D(i+1, j) == Covered) then
if (Me%ExternalVar%WaterPoints2D(i+1, j) == WaterPoint) then
if (Me%ExternalVar%ComputeFacesV2D(i+1, j) == Covered) then

dhdy = (Me%ExternalVar%Bathymetry(i+1, j) - Me%ExternalVar%Bathymetry(i, j)) / &
Me%ExternalVar%DZY(i,j)
@@ -5708,8 +5704,7 @@ subroutine ComputeEvolution
do i=WILB, WIUB

if (SandClass%FluxU(i, j) < 0.) then
!if (Me%ExternalVar%ComputeFacesU2D(i, j) == Covered ) then
if (Me%ExternalVar%WaterPoints2D(i, j-1) == WaterPoint) then
if (Me%ExternalVar%ComputeFacesU2D(i, j) == Covered ) then

SandClass%DM(i, j-1) = SandClass%DM(i, j-1) - Me%Evolution%SedimentDT * SandClass%FluxU(i, j)
SandClass%DM(i, j ) = SandClass%DM(i, j ) + Me%Evolution%SedimentDT * SandClass%FluxU(i, j)
@@ -5721,8 +5716,7 @@ subroutine ComputeEvolution
endif
elseif (SandClass%FluxU(i, j) > 0.) then

!if (Me%ExternalVar%ComputeFacesU2D(i,j+1) == Covered) then
if (Me%ExternalVar%WaterPoints2D(i, j+1) == WaterPoint) then
if (Me%ExternalVar%ComputeFacesU2D(i,j+1) == Covered) then

SandClass%DM(i, j+1) = SandClass%DM(i, j+1) + Me%Evolution%SedimentDT * SandClass%FluxU(i, j)
SandClass%DM(i, j ) = SandClass%DM(i, j ) - Me%Evolution%SedimentDT * SandClass%FluxU(i, j)
@@ -8113,7 +8107,7 @@ subroutine ReadLockExternalVar
call GetComputeFaces2D(Me%ObjHorizontalMap, &
ComputeFaces2DU = Me%ExternalVar%ComputeFacesU2D, &
ComputeFaces2DV = Me%ExternalVar%ComputeFacesV2D, &
ActualTime = Me%ExternalVar%Now, &
!ActualTime = Me%ExternalVar%Now, &
STAT = STAT_CALL)
if (STAT_CALL /= SUCCESS_) stop 'ReadLockExternalVar - ModuleSediment - ERR06'

0 comments on commit 83a938b

Please sign in to comment.