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

add the output of density class thickness to the DMOC diagnostic for… #372

Merged
merged 3 commits into from
Jan 23, 2023
Merged

add the output of density class thickness to the DMOC diagnostic for… #372

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b21825
add the output of density class thickness to the DMOC diagnostic for…
patrickscholz Oct 18, 2022
8f88449
Merge branch 'refactoring' into refactoring_improveDMOC
patrickscholz Jan 18, 2023
636cd6b
Merge branch 'refactoring' into refactoring_improveDMOC
dsidoren Jan 23, 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
37 changes: 26 additions & 11 deletions src/gen_modules_diag.F90
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ module diagnostics
u_x_u, u_x_v, v_x_v, v_x_w, u_x_w, dudx, dudy, dvdx, dvdy, dudz, dvdz, &
utau_surf, utau_bott, av_dudz_sq, av_dudz, av_dvdz, stress_bott, u_surf, &
v_surf, u_bott, v_bott, std_dens_min, std_dens_max, std_dens_N, std_dens, &
std_dens_UVDZ, std_dens_DIV, std_dens_Z, std_dens_dVdT, std_dens_flux, &
dens_flux_e, vorticity, zisotherm, compute_diag_dvd_2ndmoment_klingbeil_etal_2014, &
std_dens_UVDZ, std_dens_DIV, std_dens_Z, std_dens_H, std_dens_dVdT, std_dens_flux, &
dens_flux_e, vorticity, zisotherm, compute_diag_dvd_2ndmoment_klingbeil_etal_2014, &
compute_diag_dvd_2ndmoment_burchard_etal_2008, compute_diag_dvd
! Arrays used for diagnostics, some shall be accessible to the I/O
! 1. solver diagnostics: A*x=rhs?
Expand Down Expand Up @@ -56,7 +56,7 @@ module diagnostics
37.11979, 37.13630, 37.15257, 37.16861, 37.18441, 37.50000, 37.75000, 40.00000/)
real(kind=WP), save, target :: std_dd(std_dens_N-1)
real(kind=WP), save, target :: std_dens_min=1030., std_dens_max=1040.
real(kind=WP), save, allocatable, target :: std_dens_UVDZ(:,:,:), std_dens_flux(:,:,:), std_dens_dVdT(:,:), std_dens_DIV(:,:), std_dens_Z(:,:)
real(kind=WP), save, allocatable, target :: std_dens_UVDZ(:,:,:), std_dens_flux(:,:,:), std_dens_dVdT(:,:), std_dens_DIV(:,:), std_dens_Z(:,:), std_dens_H(:,:)
real(kind=WP), save, allocatable, target :: dens_flux_e(:)

logical :: ldiag_solver =.false.
Expand Down Expand Up @@ -459,6 +459,7 @@ subroutine diag_densMOC(mode, dynamics, tracers, partit, mesh)
allocate(std_dens_VOL2( std_dens_N, myDim_elem2D))
allocate(std_dens_flux(3,std_dens_N, myDim_elem2D))
allocate(std_dens_Z ( std_dens_N, myDim_elem2D))
allocate(std_dens_H ( std_dens_N, myDim_elem2D))
allocate(dens_flux_e(elem2D))
allocate(aux (nl-1))
allocate(dens (nl))
Expand All @@ -480,6 +481,7 @@ subroutine diag_densMOC(mode, dynamics, tracers, partit, mesh)
std_dens_VOL2=0.
std_dens_flux=0. !bouyancy flux for computation of surface bouyancy transformations
std_dens_Z =0. !will be the vertical position of the density class (for convertion between dAMOC <-> zMOC)
std_dens_H =0. !will be the vertical layerthickness of the density class (for convertion between dAMOC <-> zMOC)
depth =0.
el_depth =0.
firstcall_s=.false.
Expand All @@ -493,6 +495,7 @@ subroutine diag_densMOC(mode, dynamics, tracers, partit, mesh)
std_dens_VOL2=0.
std_dens_DIV =0.
std_dens_Z =0.
std_dens_H =0.
! proceed with fields at elements...
do elem=1, myDim_elem2D
elnodes=elem2D_nodes(:,elem)
Expand Down Expand Up @@ -570,22 +573,22 @@ subroutine diag_densMOC(mode, dynamics, tracers, partit, mesh)
std_dens_VOL2( is, elem)=std_dens_VOL2( is, elem)+weight*vol_el
locz=el_depth(nz+1)+weight*helem(nz,elem)
std_dens_Z ( is, elem)=std_dens_Z ( is, elem)+locz*weight
std_dens_w( is, elem) =std_dens_w( is, elem)+weight
std_dens_w( is, elem)=std_dens_w ( is, elem)+weight
do snz=is+1, ie-1
weight=(sum(std_dd(snz-1:snz))/2.)/ddiff
std_dens_UVDZ(:, snz, elem)=std_dens_UVDZ(:, snz, elem)+weight*uvdz_el
std_dens_VOL2( snz, elem)=std_dens_VOL2( snz, elem)+weight*vol_el
locz=locz+weight*helem(nz,elem)
std_dens_Z ( snz, elem) =std_dens_Z ( snz, elem)+locz*weight
std_dens_w ( snz, elem) =std_dens_w ( snz, elem)+weight
std_dens_Z ( snz, elem)=std_dens_Z ( snz, elem)+locz*weight
std_dens_w ( snz, elem)=std_dens_w ( snz, elem)+weight
end do
weight=(dmax-std_dens(ie))+std_dd(ie-1)/2.
weight=max(weight, 0.)/ddiff
std_dens_UVDZ(:, ie, elem)=std_dens_UVDZ(:, ie, elem)+weight*uvdz_el
std_dens_VOL2( ie, elem)=std_dens_VOL2( ie, elem)+weight*vol_el
locz=locz+weight*helem(nz,elem)
std_dens_Z ( ie, elem) =std_dens_Z ( ie, elem)+locz*weight
std_dens_w ( ie, elem) =std_dens_w ( ie, elem)+weight
std_dens_Z ( ie, elem)=std_dens_Z ( ie, elem)+locz*weight
std_dens_w ( ie, elem)=std_dens_w ( ie, elem)+weight
else
std_dens_UVDZ(:, is, elem)=std_dens_UVDZ(:, is, elem)+uvdz_el
std_dens_VOL2( is, elem)=std_dens_VOL2( is, elem)+vol_el
Expand Down Expand Up @@ -672,15 +675,27 @@ subroutine diag_densMOC(mode, dynamics, tracers, partit, mesh)
end do
end do
end do


!_____________________________________________________________________________
where (std_dens_w > 0.)
std_dens_Z =std_dens_Z /std_dens_w
std_dens_Z =std_dens_Z / std_dens_w
end where


!_____________________________________________________________________________
! compute density class volume change over time
if (.not. firstcall_e) then
std_dens_dVdT=(std_dens_VOL2-std_dens_VOL1)/dt
end if
std_dens_VOL1=std_dens_VOL2

!_____________________________________________________________________________
! compute mean thickness of density class, try to extract better vertical position
! when do projection into zcoord.
std_dens_H = std_dens_VOL2
do jj = 1, std_dens_N
std_dens_H(jj,1:myDim_elem2D) = std_dens_H(jj,1:myDim_elem2D)/elem_area(1:myDim_elem2D)
end do

firstcall_e=.false.
end subroutine diag_densMOC
!
Expand Down
1 change: 1 addition & 0 deletions src/io_meandata.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ subroutine ini_mean_io(ice, dynamics, tracers, partit, mesh)
call def_stream((/std_dens_N, elem2D/), (/std_dens_N, myDim_elem2D/), 'std_dens_dVdT', 'dV/dT', 'm3/s' ,std_dens_dVdT(:,:), 1, 'y', i_real4, partit, mesh)
call def_stream((/std_dens_N, nod2D /), (/std_dens_N, myDim_nod2D/), 'std_dens_DIV', 'm3/s', 'm3/s' ,std_dens_DIV(:,:), 1, 'y', i_real4, partit, mesh)
call def_stream((/std_dens_N, elem2D/), (/std_dens_N, myDim_elem2D/), 'std_dens_Z', 'm', 'm' ,std_dens_Z(:,:), 1, 'y', i_real4, partit, mesh)
call def_stream((/std_dens_N, elem2D/), (/std_dens_N, myDim_elem2D/), 'std_dens_H' , 'density thickness' , 'm' , std_dens_H(:,:), 1, 'y', i_real4, partit, mesh)
call def_stream((/nl-1, nod2D /), (/nl-1, myDim_nod2D /), 'density_dMOC', 'density' , 'm', density_dmoc(:,:), 1, 'y', i_real4, partit, mesh)
call def_stream(elem2D, myDim_elem2D , 'density_flux_e', 'density flux at elems ', 'm', dens_flux_e(:), 1, 'y', i_real4, partit, mesh)
end if
Expand Down