Sync with ESCOMP/CDEPS (2025-03-23)#71
Merged
NickSzapiro-NOAA merged 95 commits intoMar 27, 2025
Merged
Conversation
* Adapt docn_datamode_cplhist for dice_datamode_cplhist * Fix .or. and local variables have different names in docn and dice * Add Si_imask. Decide whether to have flds_i2o_per_cat for cplhist method. * Copy sea ice stream fields to export state fields via dshr_dfield_add * Switches So_t from C to K. Decide on which/add switch * Overwrite missing value of 0 K in Si_t * Handle So_t in C and K in docn_datamode_cplhist_mod.F90 Need model SST to be in K if (minval(So_t) .LT. 100.0_r8), convert C-->K * Only fill docn_datamode_cplhist export variables if associated. Handle units of So_t based on namelist input * Default convert SST C to K (as currently). Then switch based on optional sst_constant_value * Allow null return for taux too in dice/dice_datamode_cplhist_mod.F90 * Add doc for dice cplhist mode to dice.rst
…c.F90 errors are handled internally in that subroutine and do not return
…or_shr_abort replace calls to esmf_logmsg_error with shr_abort
Unify cfsr and gefs datm datamodes
Add CRUJRA2024 as an option to DATM_MODE
…sions desginations.
update 1850 and HIST compset names
Additional minor revisions to ESCOMP#322
cmip5 and cmip6 anomalies were generated only with GSWP3, so buildnml now errors if DATM_MODE isn't CLMGSWP3v1. However, the user can override this by setting the XML variable DATM_MODE_ANOMALY_FORCING_MISMATCH to TRUE.
cdeps1.0.61
Fix and improve anomaly forcings for ISSP cases
…o_share_bld needed to be added to CMakeLists.txt
14 tasks
DeniseWorthen
approved these changes
Mar 24, 2025
|
Testing for #2664 is complete, please continue with the merge process, thank you. |
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
6 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 authoritative ESCOMP into EMC fork
Specific notes
Contributors other than yourself, if any: N/A
CDEPS Issues Fixed (include github issue #): Closes #70
Are there dependencies on other component PRs (if so list): Coordinated with NOAA-EMC/CMEPS#135
Are changes expected to change answers (bfb, different to roundoff, more substantial): bfb
Any User Interface Changes (namelist or namelist defaults changes): More CIME options
Testing performed (e.g. aux_cdeps, CESM prealpha, etc): UFS RT suite + preceding ESCOMP/CDEPS tests
Hashes used for testing: See ufs-community/ufs-weather-model#2664