Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vertical indices of c1h and c2h in ideal case init of ph_1 #1280

Merged
merged 3 commits into from
Oct 9, 2020
Merged

Fix vertical indices of c1h and c2h in ideal case init of ph_1 #1280

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6619586
Fix vertical indices in ideal case initialization calculation of ph_1.
Sep 8, 2020
16817f5
trigger jenkins
davegill Sep 25, 2020
17f29b2
trigger jenkins
davegill Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions dyn_em/module_initialize_ideal.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,8 +1122,8 @@ SUBROUTINE init_domain_rk ( grid &

DO k = 2,kte
grid%ph_1(i,k,j) = grid%ph_1(i,k-1,j) - (grid%dnw(k-1))*( &
((grid%c1h(k)*grid%mub(i,j)+grid%c2h(k))+(grid%c1h(k)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )
((grid%c1h(k-1)*grid%mub(i,j)+grid%c2h(k-1))+(grid%c1h(k-1)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k-1)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )

grid%ph_2(i,k,j) = grid%ph_1(i,k,j)
grid%ph0(i,k,j) = grid%ph_1(i,k,j) + grid%phb(i,k,j)
Expand Down Expand Up @@ -1167,8 +1167,8 @@ SUBROUTINE init_domain_rk ( grid &

DO k = 2,kte
grid%ph_1(i,k,j) = grid%ph_1(i,k-1,j) - (grid%dnw(k-1))*( &
((grid%c1h(k)*grid%mub(i,j)+grid%c2h(k))+(grid%c1h(k)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )
((grid%c1h(k-1)*grid%mub(i,j)+grid%c2h(k-1))+(grid%c1h(k-1)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k-1)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )

grid%ph_2(i,k,j) = grid%ph_1(i,k,j)
grid%ph0(i,k,j) = grid%ph_1(i,k,j) + grid%phb(i,k,j)
Expand Down Expand Up @@ -1212,8 +1212,8 @@ SUBROUTINE init_domain_rk ( grid &

DO k = 2,kte
grid%ph_1(i,k,j) = grid%ph_1(i,k-1,j) - (grid%dnw(k-1))*( &
((grid%c1h(k)*grid%mub(i,j)+grid%c2h(k))+(grid%c1h(k)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )
((grid%c1h(k-1)*grid%mub(i,j)+grid%c2h(k-1))+(grid%c1h(k-1)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k-1)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )

grid%ph_2(i,k,j) = grid%ph_1(i,k,j)
grid%ph0(i,k,j) = grid%ph_1(i,k,j) + grid%phb(i,k,j)
Expand Down Expand Up @@ -1245,8 +1245,8 @@ SUBROUTINE init_domain_rk ( grid &

DO k = 2,kte
grid%ph_1(i,k,j) = grid%ph_1(i,k-1,j) - (grid%dnw(k-1))*( &
((grid%c1h(k)*grid%mub(i,j)+grid%c2h(k))+(grid%c1h(k)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )
((grid%c1h(k-1)*grid%mub(i,j)+grid%c2h(k-1))+(grid%c1h(k-1)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k-1)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )
grid%ph_2(i,k,j) = grid%ph_1(i,k,j)
grid%ph0(i,k,j) = grid%ph_1(i,k,j) + grid%phb(i,k,j)
ENDDO
Expand Down Expand Up @@ -1306,8 +1306,8 @@ SUBROUTINE init_domain_rk ( grid &

DO k = 2,kte
grid%ph_1(i,k,j) = grid%ph_1(i,k-1,j) - (grid%dnw(k-1))*( &
((grid%c1h(k)*grid%mub(i,j)+grid%c2h(k))+(grid%c1h(k)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )
((grid%c1h(k-1)*grid%mub(i,j)+grid%c2h(k-1))+(grid%c1h(k-1)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k-1)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )

grid%ph_2(i,k,j) = grid%ph_1(i,k,j)
grid%ph0(i,k,j) = grid%ph_1(i,k,j) + grid%phb(i,k,j)
Expand Down Expand Up @@ -1355,8 +1355,8 @@ SUBROUTINE init_domain_rk ( grid &

DO k = 2,kte
grid%ph_1(i,k,j) = grid%ph_1(i,k-1,j) - (grid%dnw(k-1))*( &
((grid%c1h(k)*grid%mub(i,j)+grid%c2h(k))+(grid%c1h(k)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )
((grid%c1h(k-1)*grid%mub(i,j)+grid%c2h(k-1))+(grid%c1h(k-1)*grid%mu_1(i,j)))*grid%al(i,k-1,j)+ &
(grid%c1h(k-1)*grid%mu_1(i,j))*grid%alb(i,k-1,j) )

grid%ph_2(i,k,j) = grid%ph_1(i,k,j)
grid%ph0(i,k,j) = grid%ph_1(i,k,j) + grid%phb(i,k,j)
Expand Down