Skip to content

Commit

Permalink
Updating austausch_atm references to new function names.
Browse files Browse the repository at this point in the history
  • Loading branch information
mwaxmonsky committed Jan 28, 2025
1 parent c551de7 commit 445bcbe
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[submodule "atmos_phys"]
path = src/atmos_phys
url = https://github.com/mwaxmonsky/atmospheric_physics
fxtag = bcc145ad9cc06185e58054ec01b008c2d9b9fa67
fxtag = 330262591a964d09e4d22bad462e767f0950b2dc
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/mwaxmonsky/atmospheric_physics

Expand Down
4 changes: 2 additions & 2 deletions src/physics/cam/eddy_diff_cam.F90
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ subroutine compute_eddy_diff( pbuf, lchnk ,
use cam_history, only: outfld
use phys_debug_util, only: phys_debug_col
use air_composition, only: cpairv
use atmos_phys_pbl_utils, only: austausch_atm, calc_rrho, calc_friction_velocity
use atmos_phys_pbl_utils, only: calc_eddy_flux_coefficient, calc_rrho, calc_friction_velocity
use error_messages, only: handle_errmsg
use coords_1d, only: Coords1D
use wv_saturation, only: qsat
Expand Down Expand Up @@ -698,7 +698,7 @@ subroutine compute_eddy_diff( pbuf, lchnk ,
kvf(:ncol,:) = 0.0_r8
do k = ntop_eddy, nbot_eddy-1
do i = 1, ncol
kvf(i,k+1) = austausch_atm(ml2(k), ri(i, k), s2(i, k))
kvf(i,k+1) = calc_eddy_flux_coefficient(ml2(k), ri(i, k), s2(i, k))
end do
end do
else
Expand Down
9 changes: 4 additions & 5 deletions src/physics/cam/hb_diff.F90
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module hb_diff
! Private methods:
! trbintd initializes time dependent variables
! pblintd initializes time dependent variables that depend pbl depth
! austausch_atm computes free atmosphere exchange coefficients
! austausch_pbl computes pbl exchange coefficients
!
!---------------------------Code history--------------------------------
Expand Down Expand Up @@ -151,7 +150,7 @@ subroutine compute_hb_diff(ncol , &
!-----------------------------------------------------------------------

use atmos_phys_pbl_utils, only: calc_virtual_temperature, calc_friction_velocity, calc_obukhov_length, &
austausch_atm, calc_rrho, calc_kinematic_heat_flux, calc_kinematic_water_vapor_flux, &
calc_eddy_flux_coefficient, calc_rrho, calc_kinematic_heat_flux, calc_kinematic_water_vapor_flux, &
calc_kinematic_buoyancy_flux
use physconst, only: zvir, rair, gravit, karman

Expand Down Expand Up @@ -239,7 +238,7 @@ subroutine compute_hb_diff(ncol , &
kvf(:ncol,:) = 0.0_r8
do k = ntop_turb, nbot_turb-1
do i = 1, ncol
kvf(i,k+1) = austausch_atm(ml2(k), ri(i, k), s2(i, k))
kvf(i,k+1) = calc_eddy_flux_coefficient(ml2(k), ri(i, k), s2(i, k))
end do
end do

Expand Down Expand Up @@ -273,7 +272,7 @@ subroutine compute_hb_free_atm_diff(ncol, &
!-----------------------------------------------------------------------

use atmos_phys_pbl_utils, only: calc_virtual_temperature, calc_friction_velocity, calc_obukhov_length, &
austausch_atm_free, calc_rrho, calc_kinematic_heat_flux, calc_kinematic_water_vapor_flux, &
calc_free_atm_eddy_flux_coefficient, calc_rrho, calc_kinematic_heat_flux, calc_kinematic_water_vapor_flux, &
calc_kinematic_buoyancy_flux
use physconst, only: zvir, rair, gravit, karman

Expand Down Expand Up @@ -338,7 +337,7 @@ subroutine compute_hb_free_atm_diff(ncol, &
kvf(:ncol,:) = 0.0_r8
do k = ntop_turb, nbot_turb - 1
do i = 1, ncol
kvf(i,k+1) = austausch_atm_free(ml2(k), ri(i, k), s2(i, k))
kvf(i,k+1) = calc_free_atm_eddy_flux_coefficient(ml2(k), ri(i, k), s2(i, k))
end do
end do

Expand Down

0 comments on commit 445bcbe

Please sign in to comment.