hs-uii: Merge in latest b4b-dev #6
Merged
Conversation
This file contains 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
…MIS_DRV_FLDS is FALSE
…elist to use to determine dust_emis settings, still check that they aren't set in the user_nl_clm file
…elds that weren't being set in CLM
…7.FHIST.derecho_intel.cam-outfrq9s test
…ppression. - Previously, neither lightning nor human ignitions (other than deforestation fire) were allowed there. - Landscape fragmentation suppression effect has to do with lfwt.
Same as li2024gswpfrc except rh_hgh now 85 (was 80).
…ns allowed are much more complex now, this resolves ESCOMP#2709
Value above which 30-day running relative humidity has no effect on fuel combustibility.
"PFT-dependent thresholds of P60d and P10d" in Li et al. (2013, doi:10.5194/bg-10-2293-2013): - defo_fire_precip_thresh_bet: Value (mm/d) above which running mean daily precipitation (10 or 60 days) does not allow deforestation fire for a column with broadleaf evergreen tropical trees but no broadleaf deciduous tropical trees. - defo_fire_precip_thresh_bdt: Vice versa
- nonborpeat_fire_precip_denom: Denominator of precipitation in equation relating that to non-boreal peat fire (unitless). Eq. 9 in Li et al. (2013, doi:10.5194/bg-10-2293-2013). - borpeat_fire_soilmoist_denom: Denominator of exponential in soil moisture term of equation relating that and temperature to boreal peat fire (unitless). Eq. 10 in Li et al. (2013, doi:10.5194/bg-10-2293-2013).
Get it working with bringing in the CAM drv_flds_in file. And make it not matter on the --megan --drydep --fire_emis options. Also do dust_emis before the other drv_flds_in namelists, so the CAM namelist is loaded.
[Fang summer '24 PR 2.1] More improvements to fire model
… issue regarding it
…r clm6_0_cam6.0, that came about due to XML code duplication
…ons that they add testing namelists, but you can always add the fields to user_nl_clm even when they are turned off
…-no-megan build-namelist options
…mand line options to build-namelist -drydep, -fire_emis and -no-megan
Fix cam dust emiss control
Turn on explicit AC, Leung_2023, and excess ice for clm6 Namelist defaults now turn on excess ice, explicit AC, Leung_2023 in clm6; they also pick up new finidat files for clm6. We use a f09 1850 finidat for all clm6 cases because that's all that we have generated for now.
…ng to be run on derecho
Merge b4bdev 20240827
Bring b4b-dev branch to main CTSM development. - PLUMBER2 for ctsm5.2 datasets - Last bit of PPE changes for namelist and parameter file settings - Update run_sys_tests on Derecho for compiler jobs to run using 16 tasks - Bring in a fix for dust emissions for coupling with CAM Update cs.status parsing script to make expected BASELINE fails more obvious Fix some issues with finding IC files for certain lnd_tuning_modes: all for cam7, clm5_0_cam6.0, and clm6_0_cam6.0
Merge master 20240828
|
Actually seeing an issue now... |
|
Okay, now ready. |
ekluzek
pushed a commit
that referenced
this pull request
Oct 1, 2024
Fix regridding of glacier region
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As required by b4b-dev procedure. I've tested this and it looks good.
Needed for ESCOMP#2703.