Skip to content

Feature/modify physics #561

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

Merged
ywkawai merged 6 commits into from
Aug 5, 2026
Merged

Feature/modify physics #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
038621b
Fix bugs
ywkawai Aug 5, 2026
a3f1067
Add water vapor flux variable to ocean component
ywkawai Aug 5, 2026
f6a34ae
Consider CP component when precipitation fluxes is output
ywkawai Aug 5, 2026
5bf0a86
Improve the treatmensts of no energy root issues in the MCA scheme wi…
ywkawai Aug 5, 2026
9a3fe8f
Update auxiliary variable management and fix array dimensions
ywkawai Aug 5, 2026
1fdb342
Fix OpenACC directives
ywkawai Aug 5, 2026
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
30 changes: 15 additions & 15 deletions FElib/src/bl_turbulence/scale_atm_phy_bl_dgm_common.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ module scale_atm_phy_bl_dgm_common
!OCL SERIAL
subroutine atm_phy_bl_dgm_common_calc_tendency( &
RHOU_tp, RHOV_tp, DRHOT_tp, RHOQ_tp_list, & ! (out)
DDENS_, MOMX_, MOMY_, DRHOT_, RHOQ_list, & ! (in)
PT_, DENS_hyd, PRES_hyd, NU, KH, & ! (in)
element3D_operation, C_IP, dtsec, & ! (in)
lmesh, elem, elem1D, is_bound, & ! (in)
use_delta_form ) ! (in)
DDENS_, MOMX_, MOMY_, DRHOT_, QTRC_list, & ! (in)
PT_, DENS_hyd, PRES_hyd, NU, KH, & ! (in)
element3D_operation, C_IP, dtsec, & ! (in)
lmesh, elem, elem1D, is_bound, & ! (in)
use_delta_form ) ! (in)
use scale_atm_dyn_dgm_hevi_common_linalgebra, only: &
atm_dyn_dgm_hevi_common_linalgebra_get_param
implicit none
Expand All @@ -74,7 +74,7 @@ subroutine atm_phy_bl_dgm_common_calc_tendency( &
real(RP), intent(in) :: MOMX_(elem%Np,lmesh%NeA)
real(RP), intent(in) :: MOMY_(elem%Np,lmesh%NeA)
real(RP), intent(in) :: DRHOT_(elem%Np,lmesh%NeA)
type(LocalMeshFieldBaseList), intent(in) :: RHOQ_list(QA)
type(LocalMeshFieldBaseList), intent(in) :: QTRC_list(QA)
real(RP), intent(in) :: PT_(elem%Np,lmesh%NeA)
real(RP), intent(in) :: DENS_hyd(elem%Np,lmesh%NeA)
real(RP), intent(in) :: PRES_hyd(elem%Np,lmesh%NeA)
Expand All @@ -90,7 +90,7 @@ subroutine atm_phy_bl_dgm_common_calc_tendency( &
class(ElementBase2D), pointer :: elem2D

integer :: iq
real(RP) :: RHOQ00_(elem%Np,QA,lmesh%Ne)
real(RP) :: QTRC00_(elem%Np,QA,lmesh%Ne)

real(RP) :: PROG_VARS (elem%Np,lmesh%NeX*lmesh%NeY,lmesh%NeZ,3+QA)
real(RP) :: alph_M(elem%NfpTot,lmesh%Ne)
Expand Down Expand Up @@ -130,7 +130,7 @@ subroutine atm_phy_bl_dgm_common_calc_tendency( &
!$omp do collapse(2)
do iq = 1, QA
do ke=lmesh%NeS, lmesh%NeE
RHOQ00_(:,iq,ke) = RHOQ_list(iq)%ptr%val(:,ke)
QTRC00_(:,iq,ke) = QTRC_list(iq)%ptr%val(:,ke)
end do
end do
!$omp end do
Expand All @@ -147,7 +147,7 @@ subroutine atm_phy_bl_dgm_common_calc_tendency( &
PROG_VARS(:,ke_xy,ke_z,2) = MOMY_ (:,ke)
PROG_VARS(:,ke_xy,ke_z,3) = DENS(:,ke) * PT_(:,ke)
do iq = 1, QA
PROG_VARS(:,ke_xy,ke_z,3+iq) = RHOQ00_(:,iq,ke)
PROG_VARS(:,ke_xy,ke_z,3+iq) = DENS(:,ke) * QTRC00_(:,iq,ke)
end do

do p=1, elem%Np
Expand All @@ -159,7 +159,7 @@ subroutine atm_phy_bl_dgm_common_calc_tendency( &
!$omp end parallel

call eval_Ax( RHOU_tp, RHOV_tp, DRHOT_tp, RHOQ_tp_list, alph_M, alph_H, & !(out)
PROG_VARS, MOMX_, MOMY_, PT_, RHOQ00_, NU, KH, DENS, GsqrtV, & !(in)
PROG_VARS, MOMX_, MOMY_, PT_, QTRC00_, NU, KH, DENS, GsqrtV, & !(in)
impl_fac, dtsec, lmesh, elem, vmapM, vmapP, is_bound, & !(in)
element3D_operation, C_IP, im, jm, b1D_ij, use_delta_form ) !(in)

Expand All @@ -180,7 +180,7 @@ subroutine atm_phy_bl_dgm_common_calc_tendency( &
DRHOT_tp(:,ke) = ( PROG_VARS(:,ke_xy,ke_z,3) - DENS(:,ke) * PT_(:,ke) ) * r_impl_fac

do iq=1, QA
RHOQ_tp_list(iq)%ptr%val(:,ke) = ( PROG_VARS(:,ke_xy,ke_z,3+iq) - RHOQ00_(:,iq,ke) ) * r_impl_fac
RHOQ_tp_list(iq)%ptr%val(:,ke) = ( PROG_VARS(:,ke_xy,ke_z,3+iq) - DENS(:,ke) * QTRC00_(:,iq,ke) ) * r_impl_fac
end do
end do
end do
Expand Down Expand Up @@ -788,7 +788,7 @@ end subroutine construct_sip_face_blocks_lgl

!OCL SERIAL
subroutine eval_Ax( MOMX_t, MOMY_t, DRHOT_t, RHOQ_t_list, alph_M, alph_H, &
PROG_VARS, MOMX00, MOMY00, PT00, RHOQ00, NU, KH, DENS, GsqrtV, impl_fac, dt, &
PROG_VARS, MOMX00, MOMY00, PT00, QTRC00, NU, KH, DENS, GsqrtV, impl_fac, dt, &
lmesh, elem, vmapM, vmapP, is_bound, element3D_operation, C_IP, &
im, jm, b, use_delta_form )
implicit none
Expand All @@ -804,7 +804,7 @@ subroutine eval_Ax( MOMX_t, MOMY_t, DRHOT_t, RHOQ_t_list, alph_M, alph_H, &
real(RP), intent(in) :: MOMX00(elem%Np,lmesh%NeA)
real(RP), intent(in) :: MOMY00(elem%Np,lmesh%NeA)
real(RP), intent(in) :: PT00(elem%Np,lmesh%NeA)
real(RP), intent(in) :: RHOQ00(elem%Np,QA,lmesh%Ne)
real(RP), intent(in) :: QTRC00(elem%Np,QA,lmesh%Ne)
real(RP), intent(in) :: NU(elem%Np,lmesh%NeA)
real(RP), intent(in) :: KH(elem%Np,lmesh%NeA)
real(RP), intent(in) :: DENS(elem%Np,lmesh%Ne)
Expand Down Expand Up @@ -964,7 +964,7 @@ subroutine eval_Ax( MOMX_t, MOMY_t, DRHOT_t, RHOQ_t_list, alph_M, alph_H, &
p = i + (j-1)*im + (pv-1)*im*jm
b(i,pv,iv,j,ke) = impl_fac * RHOQ_t_list(iq)%ptr%val(p,ke) &
- PROG_VARS (p,ke,iv) &
+ RHOQ00(p,iq,ke)
+ DENS(p,ke) * QTRC00(p,iq,ke)
end do
end do
end do
Expand All @@ -990,7 +990,7 @@ subroutine eval_Ax( MOMX_t, MOMY_t, DRHOT_t, RHOQ_t_list, alph_M, alph_H, &
do j=1, jm
do i=1, im
p = i + (j-1)*im + (pv-1)*im*jm
b(i,pv,iv,j,ke) = RHOQ00(p,iq,ke)
b(i,pv,iv,j,ke) = DENS(p,ke) * QTRC00(p,iq,ke)
end do
end do
end do
Expand Down
4 changes: 2 additions & 2 deletions FElib/src/bl_turbulence/scale_atm_phy_bl_dgm_mynn_lv2.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ subroutine atm_phy_bl_dgm_mynn_lv2_cal_VViscDiffCoef( &
lmesh, elem, is_bound ) ! (in)

!$omp parallel &
!$omp private( Fz, LiftDelFlx, DENS, RDENS, RHOT, Q, DdensDz, DVelDz, DptDz, DrtotDz, &
!$omp N2, S2, Ri, Rf, discriminant, denom_m, denom_h, S_M, S_H, mixlen, kz )
!$omp private( ke2D, Fz, LiftDelFlx, DENS, RDENS, RHOT, Q, DdensDz, DVelDz, DptDz, DrtotDz, &
!$omp N2, S2, Ri, Rf, discriminant, denom_m, denom_h, S_M, S_H, mixlen, kz )

!$omp do
do ke2D=lmesh2D%NeS, lmesh2D%NeE
Expand Down
Loading