A few fixes and extend mksurfdata to set PFT/CFT fractions but use veg-cover from dataset #814
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
…quires other subroutines to the list as well as some additional functons to mkncdio.F90
… also add the unit test build to the git ignore
…umpft outside of if, and handle case when all PFTs are set
…arlier mkpftMod.F90 version
…ero-out and pft unit tests, also zero-out doesn't need to read in datasets in mkpft and tgridmap doesn't need to be cleaned at the end of mkpft for these two cases
… oldformat is flagged
…rom both zeroout and index provided methods
…for the zero out option
… start using stored indices for some values
…special case of use_input_pft, make all_veg a local input to mkpftInit and create a global one that is set in mkpftInit, also add it to the namelist
Remove global all_veg and add in presc_cover in it's place. all_veg now comes as input to mkpftInit and helps set presc_cover. Unit tests updated and working.
…ll be set for prescribed PFT cases that use dataset PCT_NAT_VEG and PCT_CROP
Add new namelist item soilm_ignore_data_if_missing and react to it. Also use old way for the indexing in an attempt to reproduce the previous results. If soilm_ignore_data_if_missing is true and find a missing point expected continue calculation as before. If not abort when that point is found. Also comment out the section where values greater than 10 were set to spval as that changes answers.
OK, this is a version that is identical to release-clm5.0.27. Found out the issue was that lai_interp can't be moved the way I did. It needs to be divided into the streams part and non-streams part like is being done in SoilMoistureStreams. So this replicates answers for SMS_P720x1_D_Ld3.f09_g17.I2000Clm50SpGs.cheyenne_intel.clm-prescribed
… level and SoilMoistureInterp to the OMP clump level
…nd lai_interp called from within an OpenMP threading loop
ekluzek
added
PR status: ready
Add tintalgo settings for most of the streams. Also change the buildnml fatal-error for soilm_tintalgo='linear' for transient to a warning that can be overridden if desired. Also fix the build-namelist unit test for warnings, so it verifies that warnings die, but will run if -ignore_warnings is set. Also get maxpatch_pft to normally die if the two valid settings are used (79 or 17).
…or soil moisture streams)
…me that gets them to work)
AGonzalezNicolas
pushed a commit
to HPSCTerrSys/clm5_0
that referenced
this pull request
Jun 27, 2024
A few fixes and extend mksurfdata to set PFT/CFT fractions but use veg-cover from dataset
AGonzalezNicolas
pushed a commit
to HPSCTerrSys/clm5_0
that referenced
this pull request
Jul 5, 2024
A few fixes and extend mksurfdata to set PFT/CFT fractions but use veg-cover from dataset
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.
Description of changes
Include missing prescribed testmods directory
allow branches with use_init_interp=T with a log message about it. Allow prescribed PFT/CFT's to not assume 100% veg coverage (but use PCT_NATVEG and PCT_CROP from the dataset).
Specific notes
Contributors other than yourself, if any: none
CTSM Issues Fixed (include github issue #): #150, #175, #786, #791, #804, #809
Fix #809
Fix #804
Fix #175
Fix #786
Fix #791
Fix #150
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? Yes
stream_*urbantv settings for clm4_5
Testing performed, if any: limited so far
ERP_P72x2_D_Ld3.f09_g17.I2000Clm50SpGs.cheyenne_intel
and mksurfdata_map testing to ensure previous files are the same
new prescribed PFT/CFT dataset also created and verified