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
In FATES branch runs, prevents attempts to re-allocate arrays that already are allocated (in the restart file).
This prevents run failures. However, it exposes a failure in the
COMPARE_base_hybrid
step of ERI tests, due to a badhist_mfilt
. This PR will also fix that.Remaining tasks:
COMPARE_base_hybrid
failure.ERI
tests toaux_clm
andfates
test suites.Notes for testing
Baseline comparisons may fail for the following testmods:
Fates
FatesColdAllVars
FatesColdDryDepSatPhen
FatesColdHydro
FatesColdMeganSatPhen
FatesColdSatPhen
fire_emis
glcMEC_long
However, this is only because I have changed
hist_mfilt
for those to 1. (From 365 for theFates
testmods; from 30 forfire_emis
; from 12 forglcMEC_long
). This ensures that the dates in the history filenames are the same for both parts of the ERI test.When this is next in the merge queue:
mfilt
. Runaux_clm
andfates
suites, comparing to the latest baseline, expecting no diffs.aux_clm
andfates
suites, comparing to the latest baseline, expecting baseline comparison failures (a) only for those tests and (b) only because of missing baseline files.Specific notes
Contributors other than yourself, if any: @ckoven
CTSM Issues Fixed:
Are answers expected to change (and if so in what way)? No, although see "Notes for testing" above.
Any User Interface Changes (namelist or namelist defaults changes)? No
Does this create a need to change or add documentation? Did you do so? No
Testing performed, if any:
From
/glade/derecho/scratch/samrabin/tests_0206-090735de/ERI_Ld60.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-Fates.0206-090735de/TestStatus.log
: