Repository navigation
Merge master to b4b-dev (2024-10-21) - #2842
Merged
Merged
Conversation
Avoids requiring new fsurdat.
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
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
wwieder
approved these changes
Oct 21, 2024
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
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.
Merging master (ctsm5.3.009) back into b4b-dev.