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

added heat content computation as required by destinE GSV. Shall be a… #660

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

added heat content computation as required by destinE GSV. Shall be a… #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9f8d0f
added heat content computation as required by destinE GSV. Shall be a…
dsidoren Dec 19, 2024
fe9a2dd
Merge branch 'main' into fesom2_addIO
dsidoren Dec 19, 2024
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
1 change: 1 addition & 0 deletions config/namelist.io
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ldiag_dMOC =.false.
ldiag_DVD =.false.
ldiag_forc =.false.
ldiag_extflds =.false.
ldiag_destinE =.false.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be great to use a name that tells the user what diagnostic will be created.

ldiag_trflx =.false.
ldiag_uvw_sqr =.false.
ldiag_trgrd_xyz =.false.
Expand Down
56 changes: 53 additions & 3 deletions src/gen_modules_diag.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ module diagnostics
public :: ldiag_solver, lcurt_stress_surf, ldiag_Ri, ldiag_TurbFlux, ldiag_dMOC, &
ldiag_forc, ldiag_salt3D, ldiag_curl_vel3, diag_list, ldiag_vorticity, ldiag_extflds, ldiag_ice, &
compute_diagnostics, rhs_diag, curl_stress_surf, curl_vel3, shear, Ri, KvdTdZ, KvdSdZ, &
std_dens_min, std_dens_max, std_dens_N, std_dens, ldiag_trflx, &
std_dens_min, std_dens_max, std_dens_N, std_dens, ldiag_trflx, ldiag_destinE, &
std_dens_UVDZ, std_dens_DIV, std_dens_DIV_fer, std_dens_Z, std_dens_H, std_dens_dVdT, std_dens_flux, &
dens_flux_e, vorticity, zisotherm, tempzavg, saltzavg, vol_ice, vol_snow, compute_ice_diag, thetao, &
dens_flux_e, vorticity, zisotherm, tempzavg, saltzavg, heatcontent, vol_ice, vol_snow, compute_ice_diag, thetao, &
tuv, suv, &
ldiag_DVD, compute_dvd, dvd_KK_tot, dvd_SD_tot, dvd_SD_chi_adv_h, dvd_SD_chi_adv_v, dvd_SD_chi_dif_he,&
dvd_SD_chi_dif_heR, dvd_SD_chi_dif_hbh, dvd_SD_chi_dif_veR, dvd_SD_chi_dif_viR, dvd_SD_chi_dif_vi, &
Expand All @@ -45,6 +45,7 @@ module diagnostics
real(kind=WP), save, allocatable, target :: vorticity(:,:)
real(kind=WP), save, allocatable, target :: zisotherm(:) !target temperature is specified as whichtemp in compute_extflds
real(kind=WP), save, allocatable, target :: tempzavg(:), saltzavg(:) !target depth for averaging is specified as whichdepth in compute_extflds
real(kind=WP), save, allocatable, target :: heatcontent(:,:)
real(kind=WP), save, allocatable, target :: vol_ice(:), vol_snow(:)
! defining a set of standard density bins which will be used for computing densMOC
! integer, parameter :: std_dens_N = 100
Expand Down Expand Up @@ -99,14 +100,15 @@ module diagnostics

logical :: ldiag_vorticity =.false.
logical :: ldiag_extflds =.false.
logical :: ldiag_destinE =.false.
logical :: ldiag_ice =.false.
logical :: ldiag_trflx =.false.
logical :: ldiag_uvw_sqr =.false.
logical :: ldiag_trgrd_xyz =.false.

namelist /diag_list/ ldiag_solver, lcurt_stress_surf, ldiag_curl_vel3, ldiag_Ri, &
ldiag_TurbFlux, ldiag_dMOC, ldiag_DVD, ldiag_salt3D, ldiag_forc, &
ldiag_vorticity, ldiag_extflds, ldiag_trflx, ldiag_ice, ldiag_uvw_sqr, ldiag_trgrd_xyz
ldiag_vorticity, ldiag_extflds, ldiag_destinE, ldiag_trflx, ldiag_ice, ldiag_uvw_sqr, ldiag_trgrd_xyz

contains

Expand Down Expand Up @@ -921,6 +923,52 @@ subroutine compute_extflds(mode, dynamics, tracers, partit, mesh)
call exchange_nod(saltzavg, partit)
end subroutine compute_extflds
!_______________________________________________________________________________
subroutine compute_destinE(mode, dynamics, tracers, partit, mesh)
IMPLICIT NONE
integer, intent(in) :: mode
logical, save :: firstcall=.true.
type(t_dyn) , intent(in), target :: dynamics
type(t_tracer), intent(in) , target :: tracers
type(t_partit), intent(inout), target :: partit
type(t_mesh) , intent(in) , target :: mesh
real(kind=WP), dimension(:,:), pointer :: temp, salt
real(kind=WP) :: zn, zint, tup, tlo
integer :: n, nz, nzmin, nzmax
integer :: ndepths=3
real(kind=WP), dimension(3) :: whichdepth = (/ 300.0_WP, 700.0_WP, 100000._WP /)


#include "associate_part_def.h"
#include "associate_mesh_def.h"
#include "associate_part_ass.h"
#include "associate_mesh_ass.h"
if (firstcall) then !allocate the stuff at the first call
allocate(heatcontent(ndepths, myDim_nod2D+eDim_nod2D))
heatcontent =0.0_WP
firstcall=.false.
if (mode==0) return
end if
temp => tracers%data(1)%values(:,:)

!$OMP PARALLEL DO DEFAULT(SHARED) PRIVATE(n, nz, nzmin, nzmax, zint)
DO n=1, myDim_nod2D
heatcontent(:, n) =0.0_WP
nzmax=nlevels_nod2D(n)
nzmin=ulevels_nod2D(n)
zint=0.0_WP
do nz=nzmin, nzmax-1
zint=zint+hnode(nz, n)
where (whichdepth>zint)
heatcontent(:,n)=heatcontent(:,n)+temp(nz,n)*hnode(nz,n)
end where
end do
heatcontent(:,n)=1025.*3990.*heatcontent(:,n)
END DO
!$OMP END PARALLEL DO

call exchange_nod(heatcontent, partit)
end subroutine compute_destinE
!_______________________________________________________________________________
subroutine compute_ice_diag(mode, ice, partit, mesh)
IMPLICIT NONE
integer, intent(in) :: mode
Expand Down Expand Up @@ -1181,6 +1229,8 @@ subroutine compute_diagnostics(mode, dynamics, tracers, ice, partit, mesh)
! 14. compute fields required for for destinE
if (ldiag_ice) call compute_ice_diag(mode, ice, partit, mesh)

if (ldiag_destinE) call compute_destinE(mode, dynamics, tracers, partit, mesh)

call compute_thetao(mode, tracers, partit, mesh)

end subroutine compute_diagnostics
Expand Down
2 changes: 1 addition & 1 deletion src/io_meandata.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ module io_MEANDATA
!
integer, save :: io_listsize =0
logical, save :: vec_autorotate=.FALSE.
logical, save :: lnextGEMS=.FALSE.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for this one.

logical, save :: lnextGEMS =.FALSE.
integer, save :: nlev_upper=1
character(len=1), save :: filesplit_freq='y'
integer, save :: compression_level=0
Expand Down
Loading