Skip to content

Merge master to b4b-dev (2024-10-21) - #2842

Merged
samsrabin merged 87 commits into
ESCOMP:b4b-devfrom
samsrabin:merge-master-20241021
Oct 21, 2024
Merged

samsrabin merged 87 commits into
ESCOMP:b4b-devfrom
samsrabin:merge-master-20241021

Conversation

@samsrabin

Copy link
Copy Markdown
Member

Merging master (ctsm5.3.009) back into b4b-dev.

rgknox and others added 30 commits August 15, 2024 08:28
Update surface datasets: double tag of ctsm5.3.0

New surface datasets because of updates in PFT/LAI/soil-color datasets, as well as two fire datasets (AG fire, pearland and the glacier behavior dataset. Also bring in an updated "PPE informed, hand-tuned" parameter file. And turn on Li2024 fire method. Also updates to allow creating transient landuse timeseries files going back to 1700. Fix an important bug on soil fields that was there since ctsm5.2.0. This results in mkaurfdata_esmf giving identical answers with a change in number of processors. Add in creation of ne0np4.POLARCAP.ne30x4 surface datasets.

Asides: Remove VIC fields from surface datasets and testing. Add version to the surface datasets. Update the fire emissions factor dataset for the fire emissions testing in CTSM. Remove the --hires_pft option from mksurfdata_esmf as we don't have the datasets for it. Also delete mkprocdata_map.
Resolves nag error in hillslope call of check_domain_attributes()---somehow, surfdata_domain was marked as "set" but was uninitialized, causing error in domain_init().
More general to reflect that it's not necessarily the surface dataset's domain.
…uning factor for vegetation drag partition effect. Also a first attempt to modify the code for soil moisture effect on dust to avoid having a factor that changes the answer of Zender's dust emissions.
This is a temporary update to avoid NGEET/fates#1254 and should be
removed once a fix comes in on the fates-side.
…tion factor to dust_veg_drag_fact from dust_veg_part_fact. 1 Oct 2024
ekluzek and others added 26 commits October 10, 2024 03:24
Tuning Leung_2023 dust emissions for clm6_0_cam7.0
Hardcoded tuning adjustments for Leung_2024 dust emissions

Changes to dust emissions when Leung_2024 method is being used.

Tuning was needed since we saw some high biases in dust over semiarid
regions given all the updates in CTSM and CAM. The biggest
changes in CTSM that affects dust is an increase in friction velocity
(ustar; fv in CTSM) over vegetated, semiarid regions, mainly
due to a switch in the roughness scheme from 'ZengWang2007' to
'Meier2022'. Since dust emission is very sensitive to ustar, the dust
emission scheme magnifies this increase and caused strong high biases
over semiarid regions, including Australia and Patagonia (see
plots in issue ESCOMP#2732). To enhance the robustness of Leung_2023 and
reduce the likelihood to see huge changes in answers in the
future, we tried to limit the sensitivity of dust emissions to ustar. We
also tried different methods (see specific notes below) to
reduce dust emissions from semiarid regions given the high biases over
there.
Merge b4b-dev:
- Fix clm-basic tests
- Change testlist_clm ne30pg3_t061 tests to ne30pg3_t232
- Remove unused variable elevclass_o in mkglcmecMod.F90
- Add a check in failtest, warntest, finidat_files, so when a new test or finidat file are added and one of the subkeys is misspelled you will get an error and tester will die
- Move from deprecated shr_file to shr_log
- Set eflx_building_lun to spval properly
slevis resolved conflicts:
doc/ChangeLog
doc/ChangeSum
…, handle 1979 finidat settings consistently for f09, f19, and ne30pg3
Clm60 finidat updates for ne30, f09, f19 grids
PPE change to sa_leaf in CanopyFluxesMod.F90
PPE change to sa_leaf in CanopyFluxesMod.F90

Add change to sa_leaf that was in PPE branch but did not get on master.

Larger than roundoff changes in answers are explained in this post
ESCOMP#2777 (comment)
and the diagnostics are here
https://webext.cgd.ucar.edu/I2000/ctsm53n04ctsm52028_f09_saleaf/lnd/ctsm53n04ctsm52028_f09_saleaf_2000_2001_2004-ctsm53n04ctsm52028_f09_2000_2001_2004/setsIndex.html
Remove include_user_mods from matrixcnOn testmod
Reduce outputs from matrixcnOn tests
@samsrabin samsrabin changed the title Merge master 20241021 Merge master to b4b-dev (2024-10-21) Oct 21, 2024
@samsrabin
samsrabin merged commit 9f44365 into ESCOMP:b4b-dev Oct 21, 2024
@samsrabin
samsrabin deleted the merge-master-20241021 branch November 11, 2026 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants