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

Jump to bottom

Call monin_obukhov_stable_mix from stable_mix_1d #1268

Merged
merged 2 commits into from
Jul 13, 2023
Merged

Call monin_obukhov_stable_mix from stable_mix_1d #1268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9cb487
Call monin_obukhov_stable_mix from stable_mix_1d
Jun 29, 2023
5cd0307
Add comments for new variables
Jul 12, 2023
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
53 changes: 26 additions & 27 deletions monin_obukhov/monin_obukhov.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,18 @@ subroutine stable_mix_3d(rich, mix)

real, intent(in) , dimension(:,:,:) :: rich
real, intent(out), dimension(:,:,:) :: mix
integer :: n2 !< Size of dimension 2 of mix and rich
integer :: n3 !< Size of dimension 3 of mix and rich
integer :: i, j !< Loop indices

integer :: n, ier

if(.not.module_is_initialized) call error_mesg('stable_mix_3d in monin_obukhov_mod', &
'monin_obukhov_init has not been called', FATAL)

n = size(rich,1)*size(rich,2)*size(rich,3)
call monin_obukhov_stable_mix(stable_option, rich_crit, zeta_trans, &
& n, rich, mix, ier)
n2 = size(mix, 2)
n3 = size(mix, 3)

do j=1, n3
do i=1, n2
call stable_mix(rich(:, i, j), mix(:, i, j))
enddo
enddo

end subroutine stable_mix_3d

Expand Down Expand Up @@ -943,16 +945,15 @@ subroutine stable_mix_2d(rich, mix)

real, intent(in) , dimension(:,:) :: rich
real, intent(out), dimension(:,:) :: mix
integer :: n2 !< Size of dimension 2 of mix and rich
integer :: i !< Loop index

real, dimension(size(rich,1),size(rich,2),1) :: rich_3d, mix_3d

rich_3d(:,:,1) = rich
n2 = size(mix, 2)

call stable_mix_3d(rich_3d, mix_3d)

mix = mix_3d(:,:,1)
do i=1, n2
call stable_mix(rich(:, i), mix(:, i))
enddo

return
end subroutine stable_mix_2d


Expand All @@ -962,16 +963,17 @@ subroutine stable_mix_1d(rich, mix)

real, intent(in) , dimension(:) :: rich
real, intent(out), dimension(:) :: mix
integer :: n !< Size of mix and rich
integer :: ierr !< Error code set by monin_obukhov_stable_mix

real, dimension(size(rich),1,1) :: rich_3d, mix_3d

rich_3d(:,1,1) = rich
if (.not.module_is_initialized) call error_mesg('stable_mix in monin_obukhov_mod', &
'monin_obukhov_init has not been called', FATAL)

call stable_mix_3d(rich_3d, mix_3d)
n = size(mix)

mix = mix_3d(:,1,1)
call monin_obukhov_stable_mix(stable_option, rich_crit, zeta_trans, &
& n, rich, mix, ierr)

return
end subroutine stable_mix_1d

!=======================================================================
Expand All @@ -981,15 +983,12 @@ subroutine stable_mix_0d(rich, mix)
real, intent(in) :: rich
real, intent(out) :: mix

real, dimension(1,1,1) :: rich_3d, mix_3d

rich_3d(1,1,1) = rich
real, dimension(1) :: mix_1d !< Representation of mix as a dimension(1) array

call stable_mix_3d(rich_3d, mix_3d)
call stable_mix([rich], mix_1d)

mix = mix_3d(1,1,1)
mix = mix_1d(1)

return
end subroutine stable_mix_0d
!=======================================================================

Expand Down
Loading