merge fates hooks for biomass heat storage #3
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
…PI update, so only placeholders now.
swensosc
pushed a commit
that referenced
this pull request
Mar 9, 2021
Dynlakes: fix some subtle issues ### Description of changes Fix a variety of subtle issues with dynamic lakes - particularly the accounting of total water and energy. ### Specific notes This branch contains the following commits: - a9fa875: This is needed to avoid counting lake water in the begwb and endwb terms, which is needed because these are used to calculate gridcell total water store (TWS), which in turn influences the methane code. Because the methane code was tuned around old values of TWS, changing TWS would lead to unintentional – and potentially large – changes in methane terms. Eventually we'd like to remove methane's dependence on TWS, but for now this workaround is needed to avoid changing behavior too much. See ESCOMP#659 (comment) for more details. - 52105c4: This minor fix is needed for the sake of water tracers / water isotopes. It shouldn't have any impact outside of that (because the tracer_ratio of bulk water is 1) - de3e12c and acf0984: This one is especially subtle; it is needed for backwards compatibility with old restart files. The main changes are in de3e12c; acf0984 is just a minor tweak on top of that. The problem is that, on existing initial conditions files, there can be already-existing DYNBAL_BASELINE variables (for LIQUID, ICE & HEAT). But these pre-existing variables will have baseline values of 0 for lake. Before this commit, when you started up from an old initial conditions file, the code would use these 0 values for lake baselines (because baselines are only reset if the user explicitly asks them to be reset with a namelist flag). This commit adds some code to detect if the initial conditions file is old, and if so, recomputes dynbal baselines for lake using the new definition. Note that some even older initial conditions files didn't have the DYNBAL_BASELINE variables at all; those would have been okay before this change: the problem is with initial conditions files that are somewhat but not very old - so have DYNBAL_BASELINE variables on them that use the old definition (where lake baseline values were 0). - 8088c3c: Minor fix for a pre-existing issue - a31875d: I'm not sure if this is actually needed, but I thought it would be good to group together the lake water content and the roughly equal-but-opposite baselines, so that these can cancel to near zero before adding the smaller terms. In principle, this should help maintain precision in these smaller terms. I thought this might help resolve some of the larger-than-expected answer changes I was seeing in testing, but I don't think it actually does... but I still thought this would be good to keep in place. **I have double and triple checked these changes, but it would be good to have an extra set of eyes on them to make sure I did this reordering correctly. In particular, I think there were some subtleties about when a term should accumulate on top of an existing value vs. setting the initial value of a variable.**
swensosc
pushed a commit
that referenced
this pull request
Jul 21, 2021
Snow occlusion updates fates
swensosc
pushed a commit
that referenced
this pull request
Feb 8, 2022
Run fsurdat_modifier via an appropriate python version on cheyenne
ekluzek
pushed a commit
to RonnyMeier/ctsm
that referenced
this pull request
Feb 23, 2022
Updating flags wording to avoid confusions
swensosc
pushed a commit
that referenced
this pull request
Apr 15, 2022
Ideally we would do year-2000 tests to have more crop cover and thus potentially be more useful tests. However, there are problems running a year-2000 ciso test with crop. These problems exist even with an SMS test on master: I tried tests like SMS_Ly1_P72x1.f10_f10_mg37.I2000Clm45BgcCrop.cheyenne_gnu.clm-ciso--clm-cropMonthOutput, but both debug & non-debug, intel & gnu versions. Debug tests fail like this (from SMS_D_Ly1_P72x1.f10_f10_mg37.I2000Clm45BgcCrop.cheyenne_gnu.clm-ciso--clm-cropMonthOutput): 30:Program received signal SIGFPE: Floating-point exception - erroneous arithmetic operation. 30: 30:Backtrace for this error: 13: 13:Program received signal SIGFPE: Floating-point exception - erroneous arithmetic operation. 13: 13:Backtrace for this error: 13:#0 0x2b9d1acc4aff in ??? 30:#0 0x2b9d1acc4aff in ??? 13:#1 0xf63fff in cisofluxcalc 13: at /glade/work/sacks/ctsm_code/ctsm/src/biogeochem/CNCIsoFluxMod.F90:1555 30:#1 0xf63fff in cisofluxcalc 30: at /glade/work/sacks/ctsm_code/ctsm/src/biogeochem/CNCIsoFluxMod.F90:1555 30:#2 0xf6b489 in __cncisofluxmod_MOD_cisoflux1 30: at /glade/work/sacks/ctsm_code/ctsm/src/biogeochem/CNCIsoFluxMod.F90:153 13:#2 0xf6b489 in __cncisofluxmod_MOD_cisoflux1 13: at /glade/work/sacks/ctsm_code/ctsm/src/biogeochem/CNCIsoFluxMod.F90:153 13:#3 0xe45657 in __cndrivermod_MOD_cndrivernoleaching 13: at /glade/work/sacks/ctsm_code/ctsm/src/biogeochem/CNDriverMod.F90:559 30:#3 0xe45657 in __cndrivermod_MOD_cndrivernoleaching 30: at /glade/work/sacks/ctsm_code/ctsm/src/biogeochem/CNDriverMod.F90:559 An intel test dies in the same place. Non-debug versions die like this (both for gnu and intel): 30: set_curr_delta ERROR: found unexpected non-zero delta mid-year 30: Dribbler name: hrv_xsmrpool_to_atm_c_13 30: i, delta = 2 NaN 30: Start of time step date (yr, mon, day, tod) = 2000 1 15 57600 30: This indicates that some non-zero flux was generated at a time step 30: other than the first time step of the year, which this dribbler was told not to expect. 30: If this non-zero mid-year delta is expected, then you can suppress this error 30: by setting allows_non_annual_delta to .true. when constructing this dribbler. 30:iam = 30: local gridcell index = 2 30:iam = 30: global gridcell index = 103 30:iam = 30: gridcell longitude = 285.0000000 30:iam = 30: gridcell latitude = -10.0000000 30: ENDRUN: 30: ERROR: set_curr_delta: found unexpected non-zero delta mid-year: ERROR in /glade/work/sacks/ctsm_code/ctsm/src/utils/AnnualFluxDr ibbler.F90 at line 276 So there is some issue with year-2000 ciso tests with crop. This issue exists on master, for clm45 and clm50 tests. (e.g., for clm50, I tried SMS_D_Ly1_P72x1.f10_f10_mg37.I2000Clm50BgcCrop.cheyenne_gnu.clm-ciso--clm-cropMonthOutput.)
swensosc
pushed a commit
that referenced
this pull request
Dec 29, 2023
Excess ice docs review changes
swensosc
pushed a commit
that referenced
this pull request
Jun 5, 2024
updating input data file paths
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.
No description provided.