From 445bcbe5edf54a0e28b2b1417c6dbbef6c950d0f Mon Sep 17 00:00:00 2001 From: Michael Waxmonsky Date: Tue, 28 Jan 2025 14:39:57 -0700 Subject: [PATCH] Updating austausch_atm references to new function names. --- .gitmodules | 2 +- src/atmos_phys | 2 +- src/physics/cam/eddy_diff_cam.F90 | 4 ++-- src/physics/cam/hb_diff.F90 | 9 ++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index a3e22f352a..a7135f27b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/src/atmos_phys b/src/atmos_phys index c3de8468f7..330262591a 160000 --- a/src/atmos_phys +++ b/src/atmos_phys @@ -1 +1 @@ -Subproject commit c3de8468f7b245a939448f4ca6d3ef386584e92d +Subproject commit 330262591a964d09e4d22bad462e767f0950b2dc diff --git a/src/physics/cam/eddy_diff_cam.F90 b/src/physics/cam/eddy_diff_cam.F90 index cd6b9fb959..c3ab0653ba 100644 --- a/src/physics/cam/eddy_diff_cam.F90 +++ b/src/physics/cam/eddy_diff_cam.F90 @@ -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 @@ -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 diff --git a/src/physics/cam/hb_diff.F90 b/src/physics/cam/hb_diff.F90 index 20658de54b..300cc873a1 100644 --- a/src/physics/cam/hb_diff.F90 +++ b/src/physics/cam/hb_diff.F90 @@ -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-------------------------------- @@ -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 @@ -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 @@ -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 @@ -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