Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Writes/reads C budget related variables in history file #6273

Merged
merged 6 commits into from
Mar 4, 2024

Conversation

bishtgautam
Copy link
Contributor

@bishtgautam bishtgautam commented Mar 1, 2024

The TCS_MONTH_BEGIN and TCS_MONTH_END variables are written and read from the ELM restart file.

[non-BFB] just for those variables. No change in answers otherwise.

The `TCS_MONTH_BEGIN` variable is written and read from the ELM
restart file.

[BFB]
Copy link

github-actions bot commented Mar 1, 2024

PR Preview Action v1.4.7
🚀 Deployed preview to https://E3SM-Project.github.io/E3SM/pr-preview/pr-6273/
on branch gh-pages at 2024-03-01 21:46 UTC

rljacob added a commit that referenced this pull request Mar 1, 2024
The TCS_MONTH_BEGIN variable is written and read from the ELM restart file.

[BFB]
rljacob added a commit that referenced this pull request Mar 1, 2024
The TCS_MONTH_BEGIN variable is written and read from the ELM restart file.

[BFB]
@rljacob rljacob added this to the v3.0.0 milestone Mar 1, 2024
@rljacob rljacob assigned rljacob and unassigned peterdschwartz Mar 1, 2024
@peterdschwartz
Copy link
Contributor

This typo wasn't fixed completely. As I mentioned in the slack discussion, this will cause FILLDIFFs with TCS_MONTH_END instead, and so it also needs to be added to the restart file the same as Gautam did for TCS_MONTH_BEG. I have a commit with this that I pushed.

In addition, the time check for the end of the month is not correct:
if (get_nstep() > 1 .and. day_prev == 1 .and. sec_prev == 0) then
This is just the same check used for the beginning of the month. I changed this to use the current time information instead, which makes it consistent with how the water budget is handled.

I assume (not been tested yet) that this PR will cause DIFFs for any tests that compare elm history files as TCS_MONTH_END is going to be calculated differently. But it's past 1am here so I'll run comparions tomorrow

rljacob added a commit that referenced this pull request Mar 1, 2024
Second merge of this branch with more complete fix.
@peterdschwartz
Copy link
Contributor

peterdschwartz commented Mar 1, 2024

From the e3sm_integration_next_intel suite on chrysalis, I expect diffs for:

  SMS_Ln9.ne4pg2_oQU480.F2010.chrysalis_intel.eam-outfrq9s (Overall: DIFF) details:
  SMS_Ly2_P1x1.1x1_smallvilleIA.IELMCNCROP.chrysalis_intel.elm-force_netcdf_pio (Overall: DIFF) details:
  SMS_Ly2_P1x1_D.1x1_smallvilleIA.IELMCNCROP.chrysalis_intel.elm-lulcc_sville (Overall: DIFF) details:

Edit: I expect any tests that compare elm.h0 files to also diff -- depending on finidat and such (FATES doesn't diff)

The subroutines for water and carbon are made consistent.
@peterdschwartz
Copy link
Contributor

peterdschwartz commented Mar 1, 2024

For the record, tests that run for a at least one month will compare elm.h0 files by default.

@rljacob rljacob assigned peterdschwartz and unassigned rljacob Mar 1, 2024
rljacob added a commit that referenced this pull request Mar 1, 2024
@rljacob rljacob merged commit a64e71b into master Mar 4, 2024
11 checks passed
@rljacob rljacob deleted the bishtgautam/lnd/tcs-fix branch March 4, 2024 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants