Skip to content
Snippets Groups Projects
Commit 58720ee4 authored by Dave Whipp's avatar Dave Whipp
Browse files

Fixed typos

parent 5d7828fe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 15 additions and 16 deletions
src/create_surfaces.f90
+ 15
− 16
View file @ 58720ee4
...@@ -739,7 +739,7 @@ select case(surface_type) ...@@ -739,7 +739,7 @@ select case(surface_type)
if (y(i).ge.-y0s*x(i)+(y0+(x0-y0w)) .and. y(i).ge.y0s*x(i)+(y0-(x0+y0w))) then if (y(i).ge.-y0s*x(i)+(y0+(x0-y0w)) .and. y(i).ge.y0s*x(i)+(y0-(x0+y0w))) then
if (y(i).ge.y0a) then if (y(i).ge.y0a) then
if (y(i).ge.y0a+(dz2/psi2s)) then if (y(i).ge.y0a+(dz2/psi2s)) then
if (abs(dz4.gt.eps)) then if (abs(dz4).gt.eps) then
if (dz4.gt.eps) then if (dz4.gt.eps) then
z(i)=max(sp01-dz2-psi3s*(y(i)-(y0a+(dz2/psi2s))),sp13) z(i)=max(sp01-dz2-psi3s*(y(i)-(y0a+(dz2/psi2s))),sp13)
else else
...@@ -764,11 +764,11 @@ select case(surface_type) ...@@ -764,11 +764,11 @@ select case(surface_type)
elseif (y(i).ge.-y1s*x(i)+(y1s*(x0-y0w)+y1) .and. y(i).ge.y1s*x(i)+(-y1s*(x0+y0w)+y1)) then elseif (y(i).ge.-y1s*x(i)+(y1s*(x0-y0w)+y1) .and. y(i).ge.y1s*x(i)+(-y1s*(x0+y0w)+y1)) then
if (x(i).lt.((x0-y0w)-(dz1/(2.d0*psis)))) then if (x(i).lt.((x0-y0w)-(dz1/(2.d0*psis)))) then
if (x(i).lt.((x0-y0w)-(dz1/(2.d0*psis)))-(dz2/psi2s)) then if (x(i).lt.((x0-y0w)-(dz1/(2.d0*psis)))-(dz2/psi2s)) then
if (abs(dz4.gt.eps)) then if (abs(dz4).gt.eps) then
if (dz4.gt.eps) then if (dz4.gt.eps) then
z(i)=max(sp01-dz2-psi3s*(((x0-y0w)-(dz1/(2.d0*psis))-(dz2/psi2s))-x(i)),sp13) z(i)=max(sp01-dz2-psi3s*(((x0-y0w)-(dz2/psi2s))-x(i)),sp13)
else else
z(i)=min(sp01-dz2-psi3s*(((x0-y0w)-(dz1/(2.d0*psis))-(dz2/psi2s))-x(i)),sp13) z(i)=min(sp01-dz2-psi3s*(((x0-y0w)-(dz2/psi2s))-x(i)),sp13)
endif endif
else else
z(i)=sp13 z(i)=sp13
...@@ -791,11 +791,11 @@ select case(surface_type) ...@@ -791,11 +791,11 @@ select case(surface_type)
if (x(i).lt.((x0+y0w)+(dz1/(2.d0*psis)))+(dz2/psi2s)) then if (x(i).lt.((x0+y0w)+(dz1/(2.d0*psis)))+(dz2/psi2s)) then
z(i)=sp01-psi2s*(x(i)-((x0+y0w)+(dz1/(2.d0*psis)))) z(i)=sp01-psi2s*(x(i)-((x0+y0w)+(dz1/(2.d0*psis))))
else else
if (abs(dz4.gt.eps)) then if (abs(dz4).gt.eps) then
if (dz4.gt.eps) then if (dz4.gt.eps) then
z(i)=max(sp01-dz2-psi3s*(x(i)-((x0+y0w)+(dz1/(2.d0*psis))+(dz2/psi2s))),sp13) z(i)=max(sp01-dz2-psi3s*(x(i)-((x0+y0w)+(dz2/psi2s))),sp13)
else else
z(i)=min(sp01-dz2-psi3s*(x(i)-((x0+y0w)+(dz1/(2.d0*psis))+(dz2/psi2s))),sp13) z(i)=min(sp01-dz2-psi3s*(x(i)-((x0+y0w)+(dz2/psi2s))),sp13)
endif endif
else else
z(i)=sp13 z(i)=sp13
...@@ -813,7 +813,7 @@ select case(surface_type) ...@@ -813,7 +813,7 @@ select case(surface_type)
if (dist.lt.(dz2/psi2s)) then if (dist.lt.(dz2/psi2s)) then
z(i)=sp01-psi2s*dist z(i)=sp01-psi2s*dist
else else
if (abs(dz4.gt.eps)) then if (abs(dz4).gt.eps) then
if (dz4.gt.eps) then if (dz4.gt.eps) then
z(i)=max(sp01-dz2-psi3s*(dist-(dz2/psi2s)),sp13) z(i)=max(sp01-dz2-psi3s*(dist-(dz2/psi2s)),sp13)
else else
...@@ -841,7 +841,7 @@ select case(surface_type) ...@@ -841,7 +841,7 @@ select case(surface_type)
if (dist.lt.(dz2/psi2s)) then if (dist.lt.(dz2/psi2s)) then
z(i)=sp01-psi2s*dist z(i)=sp01-psi2s*dist
else else
if (abs(dz4.gt.eps)) then if (abs(dz4).gt.eps) then
if (dz4.gt.eps) then if (dz4.gt.eps) then
z(i)=max(sp01-dz2-psi3s*(dist-(dz2/psi2s)),sp13) z(i)=max(sp01-dz2-psi3s*(dist-(dz2/psi2s)),sp13)
else else
...@@ -859,13 +859,12 @@ select case(surface_type) ...@@ -859,13 +859,12 @@ select case(surface_type)
endif endif
elseif (x(i).lt.x0-y0w-(y1-y2)*theta1s-dz1/(2.d0*psis)) then elseif (x(i).lt.x0-y0w-(y1-y2)*theta1s-dz1/(2.d0*psis)) then
if (x(i).lt.x0-y0w-(y1-y2)*theta1s-dz1/(2.d0*psis)-(dz2/psi2s)) then if (x(i).lt.x0-y0w-(y1-y2)*theta1s-dz1/(2.d0*psis)-(dz2/psi2s)) then
if (abs(dz4.gt.eps)) then if (abs(dz4).gt.eps) then
if (dz4.gt.eps) then if (dz4.gt.eps) then
z(i)=min((sp01-dz2-psi3s*(x0-y0w-(y1-y2)*theta1s-dz1/(2.d0*psis)-(dz2/psi2s)))-x(i),sp13) z(i)=max(sp01-dz2-psi3s*(((x0-y0w)-(y1-y2)*theta1s-(dz2/psi2s))-x(i)),sp13)
!z(i)=sp13 !z(i)=sp13
else else
!z(i)=min(sp01-dz2-psi3s*(((x0+y0w)+(y1-y2)*theta1s+(dz1/(2.d0*psis))+(dz2/psi2s))-x(i)),sp13) z(i)=min(sp01-dz2-psi3s*(((x0-y0w)-(y1-y2)*theta1s-(dz2/psi2s))-x(i)),sp13)
z(i)=max((sp01-dz2-psi3s*(x0-y0w-(y1-y2)*theta1s-dz1/(2.d0*psis)-(dz2/psi2s)))-x(i),sp13)
!z(i)=sp13 !z(i)=sp13
endif endif
else else
...@@ -888,11 +887,11 @@ select case(surface_type) ...@@ -888,11 +887,11 @@ select case(surface_type)
z(i)=sp01+psis*(x(i)-((x0+y0w+(y1-y2)*theta1s)+(dz1/(2.d0*psis)))) z(i)=sp01+psis*(x(i)-((x0+y0w+(y1-y2)*theta1s)+(dz1/(2.d0*psis))))
else else
if (x(i).gt.x0+y0w+(y1-y2)*theta1s-dz1/(2.d0*psis)+(dz2/psi2s)) then if (x(i).gt.x0+y0w+(y1-y2)*theta1s-dz1/(2.d0*psis)+(dz2/psi2s)) then
if (abs(dz4.gt.eps)) then if (abs(dz4).gt.eps) then
if (dz4.gt.eps) then if (dz4.gt.eps) then
z(i)=max(sp01-dz2-psi3s*(x(i)-((x0+y0w)+(y1-y2)*theta1s+(dz1/(2.d0*psis))+(dz2/psi2s))),sp13) z(i)=max(sp01-dz2-psi3s*(x(i)-(x0+y0w+(y1-y2)*theta1s+(dz2/psi2s))),sp13)
else else
z(i)=min(sp01-dz2-psi3s*(x(i)-((x0+y0w)+(y1-y2)*theta1s+(dz1/(2.d0*psis))+(dz2/psi2s))),sp13) z(i)=min(sp01-dz2-psi3s*(x(i)-(x0+y0w+(y1-y2)*theta1s+(dz2/psi2s))),sp13)
endif endif
else else
z(i)=sp13 z(i)=sp13
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment