Merge master 20261002 - #4242
Closed
slevis-lmwg wants to merge 102 commits into
Closed
slevis-lmwg wants to merge 102 commits into
slevis-lmwg wants to merge 102 commits into
Conversation
Define, initialize, create history field, and create restart variable for `q_building`, internal building air specific humidity. Add argument "is_prog_buildtemp" to various subroutines to only initialize/create restart file for `q_building` if using prognostic temperature method.
1. define `q_building_max` as a constant in clm_varcon.F90 2. add latent heat component to `eflx_ventilation` and `eflx_building`
1. update `q_building` for the current time step assuming perfect mixing; 2. implement dehumidification process under explicit-AC-adoption scheme: introduce local variable `eflx_urban_ac_sat_lat` to represent latent heat load being removed. Dehumidification under original scheme is not implemented. Humidification for heating is also not implemented. 3. reset `q_building` based on `eflx_urban_ac_sat_lat`.
add one line to account for when there is no sensible heat load and only latent heat load.
Revoke some changes from before b/c they may not be necessary.
Change all waterdiagnostic_type into waterdiagnosticbulk_type to try to fix the error of no "water_inst%waterdiagnostic_inst" defined when trying to call it in clm_driver.F90.
1. Define RH_building, add hist field 2. Convert RH_building_max (RH setpoint) to q_building_max (spec hum setpoint) 3. Calculate RH_building from q_building
Change density and specific heat capacity from dry air to humid air. NOT DONE IN THIS COMMIT but may need to change pressure from forc_pbot to pstd in some QSat() calls to maintain consistency with original code.
change all pressure in QSat() calls to pstd for consistency with original code (i.e., in calculation of rho_dair).
This reverts commit 5f39e20. Changing back to using bottom layer of atmos. pressure to calculate rh_building, based on email discussion with Keith. Need another commit to update the use of pressure in density of humid air calculation.
Change all pressure from pstd (standard pressure) to forc_pbot (bottom layer atmos. forcing pressure).
1. Add variable 'eflx_urban_ac_sen_lun` and hist field `URBAN_AC_SEN` 2. Output `URBAN_AC_SEN` before latent heat is calculated
1. Calculate total condensed water, and convert it to water flux per impervious surface area in UrbBuildTempOlesonMod.F90 (incl. a write statement); 2. Add new variable `qflx_condensate_from_ac_col` in WaterFluxType.F90; 3. Update BuildingTemperature() calls
1. calculate condensate flux w.r.t. urban land unit area in BuildingTemperature subroutine; 2. add condensate flux to surface runoff in TotalSurfaceRunoff subroutine.
`qflx_condensate_from_ac_col` is added to column-level water balance check, and `qflx_condensate_from_ac_grc` is calculated & added to grid-cell-level water balance check. Note these two terms have not been added to the error messages.
Co-authored-by: Samuel Levis <slevis@ucar.edu>
… repro_sums_cdeps_cmeps Conflicts: doc/ChangeSum
ctsm5.4.060: Reproduable sums in CDEPS and CMEPS so that longer threaded tests will PASS
…M changes for cime
…ing if CIME is updated
ctsm5.4.061: Update submodules as for final cesm3_0_beta10, cime and ccs_config to latest including more t233 grid aliases
slevis resolved conflicts: cime_config/testdefs/ExpectedTestFails.xml
ctsm5.4.062: Merge b4bdev 20261001
Merge b4bdev 20261001 PR ESCOMP#4241 for details
Contributor
Author
|
looks messed up |
Contributor
Author
|
Seems like it was fine in the end. The PR that replaces this one looks the same. Foggy brain on my part... |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Merge ctsm5.4.062 into b4b-dev.